Steve Harris
c6071e24c5
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 5cdda77afb
[formerly d3ad6095b7
[formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]]]
Former-commit-id: 5cdda77afb
Former-commit-id: a5d7cad4cf9dcde7d77f5ce8ca8a3ccca2fdde58 [formerly 6aa18f74f6
]
Former-commit-id: 9845ef53f9
2012-03-30 09:50:48 -05:00
Steve Harris
11e448aa39
12.3.1-10 baseline
...
Former-commit-id: 760ead2047
[formerly 0e4128712b
] [formerly 4068f5295f
] [formerly 22bd792cd9
[formerly 4068f5295f
[formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]]
Former-commit-id: 22bd792cd9
Former-commit-id: b700b47e15bf8e3b38455fe3bf3c827edd272477 [formerly ce3b74c605
]
Former-commit-id: 8bc60b1e32
2012-03-30 08:38:33 -05:00
Steve Harris
239813406d
Merge branch 'sync_test' (VCModules) into ss_sync
...
Former-commit-id: b05701d2d7
[formerly 0665862abe
] [formerly 70357d90bc
] [formerly a0abcf8120
[formerly 70357d90bc
[formerly e68338cecbe85a62835633e9aba0925344fb80f1]]]
Former-commit-id: a0abcf8120
Former-commit-id: 7c1f75dd0fbc3e3a61f9128ed10a9a9c268a43da [formerly 6884520750
]
Former-commit-id: 65aa72fee7
2012-03-29 10:03:05 -05:00
Steve Harris
1bc33e26e6
Merge branch '104-integration' into ss_sync; 4-Thin_Client and 10-Tech_Blocked (tear-off menus) -> ss_sync
...
Former-commit-id: 770ccb1520
[formerly 94e6323c0a
] [formerly 132d68acc6
] [formerly 54a1d9cdbc
[formerly 132d68acc6
[formerly 296cc5a5a6bcc45cd92198a045a88620d7d18653]]]
Former-commit-id: 54a1d9cdbc
Former-commit-id: 304f45749b88cc183853e0c60cef2ea2e8139d31 [formerly 4b853c56c6
]
Former-commit-id: 2c3f9271bf
2012-03-29 10:01:55 -05:00
Max Schenkelberg
5fc757226e
Issue #358 Made wireframe shapes rely more on the grid geoemtry of the
...
descriptor than the actual descriptor as the descriptor is used purely
for convenience
Former-commit-id: 86d3763df0
[formerly 66eaffb9ee
] [formerly 15a9245592
] [formerly f10f1a5319
[formerly 15a9245592
[formerly 265ccb3e22aa0122dbd74e83d0af202596c1941c]]]
Former-commit-id: f10f1a5319
Former-commit-id: 6d1ea66ba9a1390c296443e20785aa9ef4a890fa [formerly ac11dd0c18
]
Former-commit-id: bbab188fb9
2012-03-28 13:32:04 -05:00
Max Schenkelberg
13f08a98a9
Issue #422 Set "numericValue" to null in RadarDefaultInterrogator in
...
case of "NO DATA"
Former-commit-id: a0663a2791
[formerly 468c812dde
] [formerly cd6ebd80d4
] [formerly b9085db25d
[formerly cd6ebd80d4
[formerly 89521a4df36d18ecb64b4cce248f150f0a0e4957]]]
Former-commit-id: b9085db25d
Former-commit-id: 46b9ad1c87f0e0eaf7fe167226e5b9dfa00844ed [formerly 954073b38c
]
Former-commit-id: 81bc45f071
2012-03-16 10:13:31 -05:00
Max Schenkelberg
712815ee18
Issue #358 Fixed sampling issue with mosaic resource with best
...
res resources
Former-commit-id: 1b8beb3f8d
[formerly 97edff9f7c
] [formerly cc111ab9ac
] [formerly 258d57e825
[formerly cc111ab9ac
[formerly 8aaf5e65d7c8ecbced6252d4a98af6223c77d5a0]]]
Former-commit-id: 258d57e825
Former-commit-id: 6ca4a7d453c44b2e3a855ba1e88fd28485927549 [formerly 1e5c074e3b
]
Former-commit-id: 4e81d2432c
2012-03-16 09:03:50 -05:00
Max Schenkelberg
f51a9e5571
Issue #358 Fixed painting and sampling regression in radar mosaic due to
...
core improvements from NPP in GL mosaic imaging extension and discovered
while testing IMesh improvements
Former-commit-id: 732c2ddb5c
[formerly 10b720381b
] [formerly 719f87c261
] [formerly 556a270a09
[formerly 719f87c261
[formerly f739d79bfd547adc295c716a1804f55f09b1bde1]]]
Former-commit-id: 556a270a09
Former-commit-id: c943e46db5cb54b3fb026d1fe63057721df3c99d [formerly ba8af4dcc1
]
Former-commit-id: a4b859ae54
2012-03-14 18:03:44 -05:00
Max Schenkelberg
458f5970aa
Issue #358 Cleaned up mesh extension and API to use geotools for
...
defining a mesh. This is better practice than using arbitrary
MathTransform objects as it is well defined and allows for serialization
of the mesh to occur.
Former-commit-id: 5a61f3ae23
[formerly 8fb7eccb73
] [formerly 6e5964df9d
] [formerly 50765e8a34
[formerly 6e5964df9d
[formerly 7e4abe637edacca71e1e1c98d99521cd33415fb0]]]
Former-commit-id: 50765e8a34
Former-commit-id: 87c83af55da8aec24c975aa2f80b06b4449fa969 [formerly cf440b3884
]
Former-commit-id: 8f08fab0a7
2012-03-14 09:49:32 -05:00
David Gillingham
9cc2c09ae5
Issue #417 : Refactor HPEDhrSrv to work from a 2-stage queueing process.
...
Former-commit-id: edde99f0b8
[formerly 7e5ec12276
] [formerly e13850a2b6
] [formerly d433b7d4d6
[formerly e13850a2b6
[formerly 727e2b19688397ea4608a2b6ca3fda3222b6ad36]]]
Former-commit-id: d433b7d4d6
Former-commit-id: 0328fbf92c7293da9871a341342665168164a9a2 [formerly 2b5588bd1e
]
Former-commit-id: 3c4e90e0bf
2012-03-13 12:31:38 -05:00
Bryan Kowal
474e2fae6d
Issue #419 - a -Dgit={true|false} switch will be used to determine if deploy-install will deploy from a single directory source tree or a multiple directory source tree. Removed tmp files that should not be baselined.
...
Former-commit-id: 08451e8a63
[formerly eab9c845bb
] [formerly 58bfa62981
] [formerly 66e05f4c96
[formerly 58bfa62981
[formerly eaa45d7123c43590be3d58fdf845708ade2dbb51]]]
Former-commit-id: 66e05f4c96
Former-commit-id: 94a80f914d91af133eceacc5f6694a2db505051c [formerly 3b97383354
]
Former-commit-id: 64a7f1db84
2012-03-12 11:43:34 -05:00
Max Schenkelberg
8b6aa63464
Issue #358 Merging core drawing API improvements from Collaboration
...
Former-commit-id: 3beecc1cdf
[formerly 18805c68f7
] [formerly d43b0456d8
] [formerly 89f603f448
[formerly d43b0456d8
[formerly a266a93ec2dca3ffbd7d2fd1f9dc47d7e18e6904]]]
Former-commit-id: 89f603f448
Former-commit-id: 69a2b029e678fdd8a18305144330e4c95774ec78 [formerly 4662ece060
]
Former-commit-id: f78b932abb
2012-03-09 12:31:50 -06:00
Bryan Kowal
3e1e672233
Issue #202 - increment the awips2-qpid release so yum will update the qpid installation.
...
Former-commit-id: 6322415535
[formerly 5838ff71f1
] [formerly fc1ca4efcc
] [formerly b871752e3a
[formerly fc1ca4efcc
[formerly ff79422d30a93ca71fc83e38e0368e499a34dd59]]]
Former-commit-id: b871752e3a
Former-commit-id: 3df9a673b587901bb723b61fae9fe68a607983cf [formerly 638d2c964b
]
Former-commit-id: d04bc82c9a
2012-03-08 09:00:55 -06:00
David Gillingham
038b850981
Issue #361 : Use queueCreator.sh to build the new ISC data receive QPID
...
queue.
Former-commit-id: d3fcc3bc54
[formerly 15a9e7cdae
] [formerly 90a745a037
] [formerly 78c7f29096
[formerly 90a745a037
[formerly cc6bca06f0fdb5919fe9ea9dc46eafd3d2d41a08]]]
Former-commit-id: 78c7f29096
Former-commit-id: f703d811132f818c9f224c92beac74aea6d8f0ec [formerly 8a86e910aa
]
Former-commit-id: 5e2b3c3955
2012-03-07 16:05:54 -06:00
Bryan Kowal
6a3ecc4a79
Issue #202 - Removed questionable 12.2.1 changes to the soon-to-be deprecated rpm core build.sh script; the gfesuite rpms will now manually created needed directories. At one time the directories were probably baselined until we switched to git.
...
Former-commit-id: bdb4777017
[formerly d4142689c9
] [formerly 4d8d3d4d00
] [formerly c803afd454
[formerly 4d8d3d4d00
[formerly 75cac6f9bf1dc237c4131e47912c595adb6aa0d7]]]
Former-commit-id: c803afd454
Former-commit-id: c9f4c7e859d1fac6dc6d9e694a3d0b274cf87b59 [formerly 033a4e237b
]
Former-commit-id: f046b941ba
2012-03-07 10:22:40 -06:00
David Gillingham
ad170c7b51
Issue #361 : Fine tune synchronization in GfeScriptExecutor to prevent
...
massive backups in access to GfeScript instance map.
Issue #361 : Further modifications to GfeScriptExecutor and GfeScript to improve synchronization-caused back-logs.
Change-Id: Ic33ef5e62d2bd1e19dd2cfedcfefe050cf7efe9e
Former-commit-id: d3d2046df0
[formerly efc9e9000b
] [formerly 9a75c87829
] [formerly 3cfa029f4b
[formerly 9a75c87829
[formerly 679996850315f699d47633da5baf593c72ba7927]]]
Former-commit-id: 3cfa029f4b
Former-commit-id: 40b8cde016ba8c02a3df6cf49704fcd4f543df58 [formerly 1818e488c5
]
Former-commit-id: 882544b165
2012-03-06 16:24:58 -06:00
David Gillingham
8bf167bc15
Issue #361 : Refactor IscDataRecRequest handler to execute iscDataRec
...
asynchronously.
Former-commit-id: b8acb1912c
[formerly 8d2ea4cfba
] [formerly ff231f33f4
] [formerly 1d69867594
[formerly ff231f33f4
[formerly 26161f9fd457f02b4df8780750064aeb27fc7ba1]]]
Former-commit-id: 1d69867594
Former-commit-id: 2c7dd92ec610e80343c37fb794682b682556ef19 [formerly 8c0b121cbc
]
Former-commit-id: 000ca27db9
2012-03-05 16:49:23 -06:00
Bryan Kowal
5385cfa2bf
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
...
Former-commit-id: 3341371f4b
[formerly 6e8b4a188f
] [formerly 5228de77e2
] [formerly 793dad5711
[formerly 5228de77e2
[formerly a5229ac02bb3c7e177b26dae68902321c9de986c]]]
Former-commit-id: 793dad5711
Former-commit-id: f6188b475a4ee0356d290aacf6a0bbdd5148fa7d [formerly 81f778e43a
]
Former-commit-id: 1585b4b827
2012-03-05 13:46:10 -06:00
David Gillingham
e0987cc993
Issue #354 : Refactor AbstractParmManager to better handle ISC parm
...
pre-loading.
Former-commit-id: 364b9e19b3
[formerly 1908212c27
] [formerly d68e3a7eea
] [formerly 494fbe93db
[formerly d68e3a7eea
[formerly e2c66b33fd8c71b0da6518c419296ab8141a07e3]]]
Former-commit-id: 494fbe93db
Former-commit-id: 22e522451d0eb5f0c7b3b2a357bfc73d015795c9 [formerly bc61eb1e43
]
Former-commit-id: 29f03b0d2a
2012-03-05 11:23:11 -06:00
Max Schenkelberg
2300065c15
Issue #358 merged esb.camel project for plot update compatibility
...
Former-commit-id: 8438bc54db
[formerly 225dfd15be
] [formerly 0cf00cb7f4
] [formerly 76e7a02f76
[formerly 0cf00cb7f4
[formerly ba90282320443c6c41c3188db9f43ffb11399bdd]]]
Former-commit-id: 76e7a02f76
Former-commit-id: 7e077fb0a73db21250703b0387c3382298480c99 [formerly e27d36432a
]
Former-commit-id: b23dc95d40
2012-03-02 13:26:44 -06:00
David Gillingham
f670f3c950
Issue #346 : Convert GFE to use identity-based ListenerLists, increase
...
synchronization in Parm/VCParm to prevent leaking of VCParms through
ListenerLists.
Former-commit-id: 87de9d067b
[formerly bd01975367
] [formerly f6f0ca24df
] [formerly 0c0f659896
[formerly f6f0ca24df
[formerly 5fc74409511903afa97949bc3cd1b3acf91c35e0]]]
Former-commit-id: 0c0f659896
Former-commit-id: de321dd91cb8346ac092574ed9b7c81299c63edf [formerly b3df043f97
]
Former-commit-id: bce9ad39ae
2012-03-02 13:22:46 -06:00
Max Schenkelberg
236c8f4ba3
Issue #358 merged dataURI changes from thinclient in for plot
...
compatibility
Former-commit-id: 7337ff7ed6
[formerly 4d91a4fd74
] [formerly f96ff96259
] [formerly 1f714b1a5b
[formerly f96ff96259
[formerly 14d0dc1cd0e5eb0b48de89f5c73f30152d4789de]]]
Former-commit-id: 1f714b1a5b
Former-commit-id: c406d73453a39a7f5f13343ad3eebf5e47637d1a [formerly e4914cbe89
]
Former-commit-id: 79365f1f62
2012-03-02 12:24:19 -06:00
Max Schenkelberg
52c7dec2e8
Issue #358 Committing NPP core rendering improvements merged with Thin
...
Client core improvements
Former-commit-id: fe1811c167
[formerly e2cd95d3f4
] [formerly ae47d9683e
] [formerly 48b6d45f00
[formerly ae47d9683e
[formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]]]
Former-commit-id: 48b6d45f00
Former-commit-id: 22d12e35f7b0f5789a9dd62c8684fad371d63859 [formerly 3212cc6ebb
]
Former-commit-id: 0554abdde0
2012-03-01 16:59:40 -06:00
Steve Harris
6fdae68267
Merge branch 'ss_sync' into sync_test
...
Former-commit-id: 994e79cfb3
[formerly 3b9c3e3474
] [formerly 951ecfe3dd
] [formerly 787aed90f8
[formerly 951ecfe3dd
[formerly 7ebcf63686d75d58f8bfea92e825edaf49a30df1]]]
Former-commit-id: 787aed90f8
Former-commit-id: 64c60f8d4b42c0f811914474c3baf46e1940786e [formerly db45babec8
]
Former-commit-id: b3f831a7b4
2012-03-01 14:01:16 -06:00
Steve Harris
13597e2d3d
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 5bf956755a
[formerly 8794c4bcf6
] [formerly c21bd2719c
] [formerly 9bdea0399f
[formerly c21bd2719c
[formerly c6eacfe2d5898deacf756f059a71b1c9f41500bb]]]
Former-commit-id: 9bdea0399f
Former-commit-id: 79ca895e04be795aebb8555aa0b0ba51850c543e [formerly 6f5c182af0
]
Former-commit-id: fe0b1eed94
2012-03-01 13:19:04 -06:00
Ben Steffensmeier
6ec01d1d19
Issue #353 apply the server time offset before requesting updates instead of after so that way there is no time gap for the first request
...
Change-Id: I3ceb8cefbedc3b64ca207c559e8cd381f6f184fd
Former-commit-id: 5395e71757
[formerly aa90109f45
] [formerly 49cce84edf
] [formerly 7c2409eab0
[formerly 49cce84edf
[formerly 059b4fcb3224b37b4a235f57e2065b9506f29d46]]]
Former-commit-id: 7c2409eab0
Former-commit-id: 691ebf923ce51c7c2978a0c30511852ac7042b3c [formerly 3220ee4745
]
Former-commit-id: f8c2ad7136
2012-03-01 12:44:43 -06:00
Steve Harris
f5db44b7aa
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 27fb50d455
[formerly 98d1fbeb0e
] [formerly 703cb6e748
] [formerly dd52eb4d40
[formerly 703cb6e748
[formerly 152f05b5ab3dc736f1d3d21dba09de79d98d4c9e]]]
Former-commit-id: dd52eb4d40
Former-commit-id: fe7d53e8a206e849dc25fe40d0bef8cfe7ab3606 [formerly 06baad5169
]
Former-commit-id: 3e4d618486
2012-02-29 16:08:39 -06:00
Ben Steffensmeier
cc8e7897cf
Issue #353 add logic to syncronize times for thin client data updates..
...
Change-Id: Id1f8e31bc95f0b0262821050be6660bfe66df9d1
Former-commit-id: 07d98eb7dc
[formerly 56d97c95d5
] [formerly 5c303ed189
] [formerly c61e40c426
[formerly 5c303ed189
[formerly f94248823eed52b2d9f8c56af3dc7607b323fc1e]]]
Former-commit-id: c61e40c426
Former-commit-id: bc3ac83b421a21ffdbc670c12096f7c96ca7c87f [formerly 84e6c9beb8
]
Former-commit-id: 390700efb0
2012-02-29 15:49:47 -06:00
Ben Steffensmeier
1ac84dc230
Issue #352 initialize ThinClientDataUpdateTree as soon as component starts to ensure that it correctly sets the last query time.
...
Change-Id: I13d4af0a1529e31f78e998db6bbdee228e749e1f
Former-commit-id: 7c3545170d
[formerly 3713d7a181
] [formerly 5dee50e7e9
] [formerly d7a63995f1
[formerly 5dee50e7e9
[formerly d05beaa84618bc01d8cb711298523dc358bb4938]]]
Former-commit-id: d7a63995f1
Former-commit-id: 17cbace4358ff60cc55095422d0870a3cb6e704b [formerly e52c2ffb20
]
Former-commit-id: dba810ddc4
2012-02-28 15:20:37 -06:00
Steve Harris
b65a901af6
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: e08a6e4b1c
[formerly c45e7b888c
] [formerly aa597242f9
] [formerly a4538f0a48
[formerly aa597242f9
[formerly 9864ba5dd0627dd8c68fae64aa7fad1916e40a0f]]]
Former-commit-id: a4538f0a48
Former-commit-id: 0f7bb182634a23c54efdab2309f3cd0d4a2a8f14 [formerly fdd6018d1a
]
Former-commit-id: 7c18ec7c7c
2012-02-27 11:32:49 -06:00
Ben Steffensmeier
d5118790dd
Issue #345 fix swapping of nsharp since nsharp insists on using a disposed target
...
Change-Id: I5a814be6590c2704dcd681bad7af34f0f9143ad2
Former-commit-id: 8fd9d92f0a
[formerly 20481daa1b
] [formerly 357dc4d88b
] [formerly 637c051a23
[formerly 357dc4d88b
[formerly acec1c2a23f4e27bfd0844171fdca77ff5473050]]]
Former-commit-id: 637c051a23
Former-commit-id: bc7a93cc6ff900a77e00a7eb9d6864845eda90c8 [formerly 62f1ea0aac
]
Former-commit-id: 88d2d2e4b6
2012-02-24 14:57:23 -06:00
Bryan Kowal
2fa51704a0
Issue #202 - remove obsolete edex prefix verifications.
...
Former-commit-id: 48d5fd8ee6
[formerly 475849bd91
] [formerly 1e3e31a657
] [formerly c2cd292c32
[formerly 1e3e31a657
[formerly 6984db8c852a552867b1b8159637d96dcd83ab5a]]]
Former-commit-id: c2cd292c32
Former-commit-id: e59528ebf20a3f9e9fafe944e7bf90cae2f7d19f [formerly 49a30a5b1a
]
Former-commit-id: d4367098a7
2012-02-23 16:46:48 -06:00
David Gillingham
d10c91b814
Issue #346 : Create a dispose method for Parm and use it like AWIPS1's C++ destructor.
...
Change-Id: I2e8a4e82d5efd210e546abbaf8c0aba960803a9d
Former-commit-id: 586f77e788
[formerly ef903bc728
] [formerly d79f7e9613
] [formerly 5aa5b51a55
[formerly d79f7e9613
[formerly b6d7661be725d8a37a8294b0eda982208c35ecbe]]]
Former-commit-id: 5aa5b51a55
Former-commit-id: 9d586efeed036f273d51786977174c550e093ace [formerly f9ed20bada
]
Former-commit-id: 6bca8d6353
2012-02-23 14:40:25 -06:00
Bryan Kowal
70afebc3a9
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
...
Former-commit-id: e723d50244
[formerly 4881def0e9
] [formerly 787a2bdbc4f7f2536dc9e89bd790b020c7dfbe6d [formerly bae0cb555e
]] [formerly e135f4508d
[formerly bae0cb555e
[formerly 10339dcba7c9ae535766e5c5dddac57ddb3f99c4]]]
Former-commit-id: e135f4508d
Former-commit-id: a9d31b1493dd373f2fd8124779bfc4579645858b [formerly 5c86773a77
]
Former-commit-id: fa23b673c4
2012-02-23 14:20:50 -06:00
Steve Harris
3df0fd8ff9
Merge branch 'ss_sync'
...
Former-commit-id: 5004037bda
[formerly 507374d31d
] [formerly 9ef773822f
] [formerly c81cfb72c6
[formerly 9ef773822f
[formerly 5ed747b42f001de0c6d08b5fb6f77a192f2e9a03]]]
Former-commit-id: c81cfb72c6
Former-commit-id: 535912a1a82ff301f9e8633ae937dc30a8404833 [formerly 546db2604a
]
Former-commit-id: a90ad88b3c
2012-02-23 13:32:19 -06:00
David Gillingham
d9def42052
Issue #346 : Fix disappearing ISC data from VCParms, fix threading issues in Scalar/Vector pickup value dialogs.
...
Change-Id: If465b8daf5ef04a76084500425ac3114a48ab908
Former-commit-id: adfd42b5ce
[formerly 5a8ba0f0fb
] [formerly 32b2c06988
] [formerly 85998bc654
[formerly 32b2c06988
[formerly 67aaf1c21e8372b4a84cb82cae62549502992651]]]
Former-commit-id: 85998bc654
Former-commit-id: fb4654a71df93b18d676c70825d89036de6bfcfe [formerly 88dcd4d09d
]
Former-commit-id: 9ff631305a
2012-02-23 13:23:59 -06:00
Steve Harris
42594c734b
Merge branch '10-Tech_Blocked' into 104-integration
...
Former-commit-id: 7174904570
[formerly 6cab5a6709
] [formerly eeddaa55f5
] [formerly e829aa1a8b
[formerly eeddaa55f5
[formerly 72fce6fda1b07320cc79fbf8f09cc47ffbe32e89]]]
Former-commit-id: e829aa1a8b
Former-commit-id: c0e93a29fcec7a2d69d301012349901b89a5de9c [formerly 48f081f798
]
Former-commit-id: 15facb4cf5
2012-02-23 13:18:50 -06:00
Steve Harris
3c7bf434ba
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: c4616866d0
[formerly db8491ee59
] [formerly d6b489e69e
] [formerly 3b16f37675
[formerly d6b489e69e
[formerly fee006734577fd51f05ca5e9ce211d36d2b9fe57]]]
Former-commit-id: 3b16f37675
Former-commit-id: a3fec26c8a86a1ded9e0ab2b00a9fa60cab06b8a [formerly 6f13b9c3b1
]
Former-commit-id: 4518d47393
2012-02-23 13:18:15 -06:00
Steve Harris
969bfd1146
Merge branch 'ss_sync' into 10-Tech_Blocked
...
Former-commit-id: 7c3760b319
[formerly d61c6bda96
] [formerly f081d1a6d4
] [formerly a0063d6cb1
[formerly f081d1a6d4
[formerly 5aa15dec35cf72a46288613e42e6cb02b94320a6]]]
Former-commit-id: a0063d6cb1
Former-commit-id: 9b7fd7be1274ee48006e725dcf3a6947cf15044f [formerly 4b1d072b46
]
Former-commit-id: 62be9edb93
2012-02-23 13:17:26 -06:00
Steve Harris
1fa3e31716
Merge branch 'ss_sync' into 4-Thin_Client
...
Former-commit-id: 55b44a00db
[formerly 608a0c17a0
] [formerly f9baa1c98c
] [formerly 46e1499e43
[formerly f9baa1c98c
[formerly 2059372e90437312cf12f06de6c84d0824fb586c]]]
Former-commit-id: 46e1499e43
Former-commit-id: 4963e367347650292e79807030506ea282547db3 [formerly 096ba6eb30
]
Former-commit-id: 63764220c4
2012-02-23 13:16:35 -06:00
Steve Harris
9397ca10a8
removed .gitignore.orig & cots/uframe-eclipse. Added *.orig files to .gitignore
...
Former-commit-id: 2f8260ccbc
[formerly 07ac42866c
] [formerly c502603907
] [formerly ecb38ba165
[formerly c502603907
[formerly cccea1aa13ad987a8c1f2b06c2dfcaa77967544d]]]
Former-commit-id: ecb38ba165
Former-commit-id: 7430208f5d1e69b088b0ad09205b10f1007182e4 [formerly a9b900821a
]
Former-commit-id: d83100c3df
2012-02-23 12:45:50 -06:00
Steve Harris
fbb5de922a
Merge branch '4-Thin_Client' (with OB12.2.1) into 104-integration
...
Conflicts:
edexOsgi/build.edex/deploy-install.xml
Seems to have solved itself or was not actually a conflict
Former-commit-id: 0be3703c7e
[formerly 4981170462
] [formerly dcadf7baa4
] [formerly 86e586befe
[formerly dcadf7baa4
[formerly 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637]]]
Former-commit-id: 86e586befe
Former-commit-id: 5a0e0d2312e9dc1ae83176f1127db903c68bc140 [formerly 938dc5b21c
]
Former-commit-id: 4eb1ef5b0f
2012-02-23 12:38:55 -06:00
Nate Jensen
2db5dbe305
Merge "Issue #185 handle CommunicationExceptions from the LevelFactory in remerged ncep grib decoder." into 4-Thin_Client
...
Former-commit-id: b07575c5b3
[formerly a914aa38c8
] [formerly e3e44707a4
] [formerly fef3fcb60c
[formerly e3e44707a4
[formerly fd448c2a996aef215802dc501b68d28747f66414]]]
Former-commit-id: fef3fcb60c
Former-commit-id: 834f82bd59e01c6c99532d9991840fdacffe244d [formerly d03ff9824e
]
Former-commit-id: e0e2a82d83
2012-02-23 11:50:39 -06:00
Ben Steffensmeier
d1b9b4bc84
Issue #176 update merged ncep plot classes to use new plot interface.
...
Change-Id: I345a970aa0d292fcd05ba4c19e77536e03057f72
Former-commit-id: 41ca3213a4
[formerly 0b0047e29d
] [formerly 703d59a968
] [formerly 03d9230879
[formerly 703d59a968
[formerly 2e22a794183e4be8758997b9e76f896917a761db]]]
Former-commit-id: 03d9230879
Former-commit-id: 892ee6361f74622da1f7045e0847bcce6026e627 [formerly 6db9a03560
]
Former-commit-id: f048713c31
2012-02-23 11:23:01 -06:00
Ben Steffensmeier
3f86d825d5
Issue #185 handle CommunicationExceptions from the LevelFactory in remerged ncep grib decoder.
...
Change-Id: I343e4e61d5f96938e84709392c32f6d94b244b17
Former-commit-id: 127dde9454
[formerly a2db6975c9
] [formerly 4dedc8b30d
] [formerly 73a08e9d4e
[formerly 4dedc8b30d
[formerly 951c8c2a77c8f58a04a576148ac583ccdcc21e02]]]
Former-commit-id: 73a08e9d4e
Former-commit-id: 57785c3dff7f653eb1377659f11622f20ae35a74 [formerly d5d8697d9f
]
Former-commit-id: d937284ab2
2012-02-23 10:49:56 -06:00
Steve Harris
91e382233d
Merge branch 'ss_sync' into 10-Tech_Blocked
...
Former-commit-id: 40fee93b99
[formerly 9588895c2d
] [formerly 2d25ee9414
] [formerly 19cf09274c
[formerly 2d25ee9414
[formerly a1b82aa2367ca506175ab0fec425c9e633ce949f]]]
Former-commit-id: 19cf09274c
Former-commit-id: 8fb7fd39b6a6c047b2867b19a4f0a225371f7b42 [formerly 8afdef6680
]
Former-commit-id: b297f21344
2012-02-23 10:28:19 -06:00
Steve Harris
d1589bf5e5
Merge (pull) branch '4-Thin_Client' of ssh://lightning.omaha.us.ray.com:29418/thunder into 4-Thin_Client
...
Former-commit-id: ed66d12d24
[formerly c0c0acfbe8
] [formerly 957d232286
] [formerly a82f2c5750
[formerly 957d232286
[formerly de97ce5f9b687f7404a34cac0b1fc34df5f854cb]]]
Former-commit-id: a82f2c5750
Former-commit-id: 252271566acafedef77dcd075974af95164c1987 [formerly e6c3afa7a2
]
Former-commit-id: 43b83ed8aa
2012-02-23 10:19:54 -06:00
Steve Harris
391451e14b
Revert PlotResource2.java to ss_sync version for merge into 4-Thin_Client
...
Former-commit-id: 909a19606c
[formerly a5f8708b6a
] [formerly db065fcd50
] [formerly e94b322dc3
[formerly db065fcd50
[formerly 8a1ef8c6f0e3cdd8b4eb581218d499bc8fc19aeb]]]
Former-commit-id: e94b322dc3
Former-commit-id: e5d89cf4f3149ec572a32c84f492bd3f9f2178c4 [formerly 78ea2de6d3
]
Former-commit-id: 97184f1dc4
2012-02-23 10:16:02 -06:00
Steve Harris
2d02f819be
Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client
...
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/H5UairPlotInfoRetriever.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
deleted 'H5U; PlotResource2.java was not edited
Former-commit-id: 5a96582f16
[formerly 92084b3f20
] [formerly d0bbbfefcc
] [formerly 7a10ca9766
[formerly d0bbbfefcc
[formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]]
Former-commit-id: 7a10ca9766
Former-commit-id: 6fb9d83319d58ea511061243437d2805a4c4ae7b [formerly 3d511fe719
]
Former-commit-id: 92b7072b82
2012-02-23 10:06:18 -06:00
Steve Harris
b3031c14d9
Merge branch 'OB12.2.1_test' into ss_sync
...
Former-commit-id: 5fcd6629dc
[formerly 7966ab9369
] [formerly 6f7f678590
] [formerly 830038b0c6
[formerly 6f7f678590
[formerly 76967f2151dcfb275be389c04060ff34be4a5018]]]
Former-commit-id: 830038b0c6
Former-commit-id: bde9de0656d064c2040558e807738aec3e5cb5a5 [formerly 5f6715ed05
]
Former-commit-id: 1954443885
2012-02-23 07:53:15 -06:00