Nate Jensen
699e417731
Integrating Richard's changes with 12.2.1
...
Change-Id: I774e69f166dbc48c7cb31d066cb8bf5dd626520c
Former-commit-id: 2515d56c9fc5ba181cd8
2012-02-28 09:42:47 -06:00
Nate Jensen
74b6e7b389
Integrating Richard's changes with 12.2.1
...
Change-Id: I1831502d72bed7b804287bb7c3e4ea501514ada4
Former-commit-id: d18a15535aafe3c5db9c
2012-02-28 09:37:45 -06:00
Steve Harris
40d7357165
Merge branch 'ss_sync' into 9-Wes2Bridge
...
Conflicts:
.gitignore
ncep/gov.noaa.nws.ncep.common.dataplugin.h5scd/src/gov/noaa/nws/ncep/common/dataplugin/h5scd/H5ScdRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.h5uair/src/gov/noaa/nws/ncep/common/dataplugin/h5uair/H5UairRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
deleted h5 files
using ss_sync version of java files
Former-commit-id: 9b67525e95e5b56c99ab
2012-02-27 15:58:49 -06:00
Steve Harris
fdd6018d1a
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: aa597242f9a4538f0a48
2012-02-27 11:32:49 -06:00
Ben Steffensmeier
62f1ea0aac
Issue #345 fix swapping of nsharp since nsharp insists on using a disposed target
...
Change-Id: I5a814be6590c2704dcd681bad7af34f0f9143ad2
Former-commit-id: 357dc4d88b637c051a23
2012-02-24 14:57:23 -06:00
Bryan Kowal
49a30a5b1a
Issue #202 - remove obsolete edex prefix verifications.
...
Former-commit-id: 1e3e31a657c2cd292c32
2012-02-23 16:46:48 -06:00
David Gillingham
f9ed20bada
Issue #346 : Create a dispose method for Parm and use it like AWIPS1's C++ destructor.
...
Change-Id: I2e8a4e82d5efd210e546abbaf8c0aba960803a9d
Former-commit-id: d79f7e96135aa5b51a55
2012-02-23 14:40:25 -06:00
Bryan Kowal
5c86773a77
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
...
Former-commit-id: bae0cb555ee135f4508d
2012-02-23 14:20:50 -06:00
David Gillingham
88dcd4d09d
Issue #346 : Fix disappearing ISC data from VCParms, fix threading issues in Scalar/Vector pickup value dialogs.
...
Change-Id: If465b8daf5ef04a76084500425ac3114a48ab908
Former-commit-id: 32b2c0698885998bc654
2012-02-23 13:23:59 -06:00
Steve Harris
48f081f798
Merge branch '10-Tech_Blocked' into 104-integration
...
Former-commit-id: eeddaa55f5e829aa1a8b
2012-02-23 13:18:50 -06:00
Steve Harris
6f13b9c3b1
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: d6b489e69e3b16f37675
2012-02-23 13:18:15 -06:00
Steve Harris
4b1d072b46
Merge branch 'ss_sync' into 10-Tech_Blocked
...
Former-commit-id: f081d1a6d4a0063d6cb1
2012-02-23 13:17:26 -06:00
Steve Harris
096ba6eb30
Merge branch 'ss_sync' into 4-Thin_Client
...
Former-commit-id: f9baa1c98c46e1499e43
2012-02-23 13:16:35 -06:00
Steve Harris
a9b900821a
removed .gitignore.orig & cots/uframe-eclipse. Added *.orig files to .gitignore
...
Former-commit-id: c502603907ecb38ba165
2012-02-23 12:45:50 -06:00
Steve Harris
938dc5b21c
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: dcadf7baa486e586befe
2012-02-23 12:38:55 -06:00
Nate Jensen
d03ff9824e
Merge "Issue #185 handle CommunicationExceptions from the LevelFactory in remerged ncep grib decoder." into 4-Thin_Client
...
Former-commit-id: e3e44707a4fef3fcb60c
2012-02-23 11:50:39 -06:00
Ben Steffensmeier
6db9a03560
Issue #176 update merged ncep plot classes to use new plot interface.
...
Change-Id: I345a970aa0d292fcd05ba4c19e77536e03057f72
Former-commit-id: 703d59a96803d9230879
2012-02-23 11:23:01 -06:00
Ben Steffensmeier
d5d8697d9f
Issue #185 handle CommunicationExceptions from the LevelFactory in remerged ncep grib decoder.
...
Change-Id: I343e4e61d5f96938e84709392c32f6d94b244b17
Former-commit-id: 4dedc8b30d73a08e9d4e
2012-02-23 10:49:56 -06:00
Steve Harris
8afdef6680
Merge branch 'ss_sync' into 10-Tech_Blocked
...
Former-commit-id: 2d25ee941419cf09274c
2012-02-23 10:28:19 -06:00
Steve Harris
e6c3afa7a2
Merge (pull) branch '4-Thin_Client' of ssh://lightning.omaha.us.ray.com:29418/thunder into 4-Thin_Client
...
Former-commit-id: 957d232286a82f2c5750
2012-02-23 10:19:54 -06:00
Steve Harris
78ea2de6d3
Revert PlotResource2.java to ss_sync version for merge into 4-Thin_Client
...
Former-commit-id: db065fcd50e94b322dc3
2012-02-23 10:16:02 -06:00
Steve Harris
3d511fe719
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: d0bbbfefcc7a10ca9766
2012-02-23 10:06:18 -06:00
Steve Harris
5f6715ed05
Merge branch 'OB12.2.1_test' into ss_sync
...
Former-commit-id: 6f7f678590830038b0c6
2012-02-23 07:53:15 -06:00
Ben Steffensmeier
5d6b036ed7
Issue #345 allow double dispose of GLTarget
...
Change-Id: Ib433557f82bc0bc63fb537814bad47eab00be2be
Former-commit-id: 06c9d4cdcf55aa66a510
2012-02-22 17:40:48 -06:00
Bryan Kowal
5ca7ce8373
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
...
Former-commit-id: 9a63901c0ecd35220cf7
2012-02-22 17:07:15 -06:00
Steve Harris
aaf2fbd05b
creating OB12.2.1 from ss_sync for testing
...
Former-commit-id: a7b68a50be1fc25c6cb2
2012-02-22 13:06:47 -06:00
Steve Harris
4450cf8963
Merging SS OB12.2.1 into ss_sync
...
Former-commit-id: c8aae9874154be9660f1
2012-02-22 11:14:43 -06:00
Steve Harris
aaead73ec5
Merge branch 14-NCEP into 'ss_sync'
...
Former-commit-id: 94c2ea985b9995d22e25
2012-02-22 10:12:49 -06:00
Steve Harris
6d1b04e62c
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 84926c80bef3fe839c1c
2012-02-21 10:37:36 -06:00
Nate Jensen
13ea11ddfc
Merge "Issue #345 fix issues with gl contexts and creation and deletion of gl objects!" into 4-Thin_Client
...
Former-commit-id: b90611d995ec0cd8d086
2012-02-21 08:57:12 -06:00
Steve Harris
4a93298877
Merge branch 'ss_sync' (OB12.1.2) into 9-Wes2Bridge
...
Conflicts:
.gitignore
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/IVcModuleArgument.java
deltaScripts/.pydevproject
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/ServerSpecificPersistablePluginDataObject.java
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IDataArchiver.java
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java
Former-commit-id: b89ebc5e01496cc6a06b
2012-02-20 16:38:06 -06:00
Ben Steffensmeier
dcbe4fc7da
Issue #345 fix issues with gl contexts and creation and deletion of gl objects!
...
Change-Id: Ied6c7a814478e21f3cd0eccabfecb00a92e698db
Former-commit-id: 69e8cde11573d24fad2f
2012-02-20 15:28:20 -06:00
Steve Harris
5bc52de24a
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 07bf1f770debf5e8360e
2012-02-20 13:04:10 -06:00
Steve Harris
33483f3960
Merge branch '10-Tech_Blocked' into 104-integration
...
Conflicts:
edexOsgi/build.edex/deploy-install.xml
rpms/awips2.edex/Installer.edex-cots/component.spec
Former-commit-id: cabf9fd9565e9d2dd367
2012-02-20 13:03:39 -06:00
Steve Harris
d133454b27
Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked
...
Former-commit-id: 6a064cb78bd02529fef4
2012-02-20 12:54:25 -06:00
Steve Harris
54b5b6baef
Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
...
Former-commit-id: 4b76d22f77cc66c8be24
2012-02-20 12:43:38 -06:00
Steve Harris
0fab56e0f1
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 62c587b841c825bd03a2
2012-02-20 07:49:13 -06:00
Bryan Kowal
2ba23624b4
Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
...
Former-commit-id: 10a0ca252d682c10767d
2012-02-17 12:17:14 -06:00
Bryan Kowal
38ccaf882b
Issue #182 - the meteolib Activator will now return a properly formatted path to the meteolib dll when on a Windows workstation. The meteolib "cape function" will now acurrately report if it is out of memory.
...
Former-commit-id: 4276fc2fe89f1b7a613a
2012-02-17 11:09:13 -06:00
Steve Harris
65b22abd24
Manual merge of SS OB12.1.2-4 changes into ss_sync
...
Former-commit-id: 93f6535bd8b137302802
2012-02-17 10:55:02 -06:00
Ben Steffensmeier
d4e7df98a9
Issue #343 unpack thinclient cave plugin so that removed pluigns file can be easily mofified.
...
Change-Id: I50c56ca84cdd2f911dc03eb06bf68dfdc785dcf0
Former-commit-id: 26d82729c93e3e4bd4e3
2012-02-16 16:36:56 -06:00
Steve Harris
ff45f4eaab
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: e2989d1a9f64ddef69b6
2012-02-16 14:23:01 -06:00
Nate Jensen
051e8faf55
Merge "Issue #343 remove extra perspectives when in thinclient component" into 4-Thin_Client
...
Former-commit-id: bdb08a9f4c642ad4e9b0
2012-02-16 14:00:33 -06:00
Bryan Kowal
71fe94b322
Issue #34 - recompiled the nsharp dll with the latest ncep code.
...
Former-commit-id: c8dba08a9d4888756560
2012-02-16 12:51:24 -06:00
Ben Steffensmeier
b819bfa8e9
Issue #343 remove extra perspectives when in thinclient component
...
Change-Id: Ibb6cee8d10a541e2defac098e844c23798a1deee
Former-commit-id: 28c7e6bc228cf7360e3b
2012-02-15 17:10:34 -06:00
Steve Harris
17c9ad4c0c
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 64b3ba9d2b09c3e613e5
2012-02-15 15:09:30 -06:00
Steve Harris
ad402655f4
Merge branch '10-Tech_Blocked' into 104-integration
...
Former-commit-id: 272ba87883c1129dbd00
2012-02-15 15:08:58 -06:00
Steve Harris
a2e3aabc60
Merge commit 'awips2_OB12.1.1_Omaha' into 4-Thin_Client
...
Conflicts:
msi/AWIPSII.CAVE/AWIPSII.CAVE/ipr.gif
msi/AWIPSII.CAVE/AWIPSII.CAVE/obj/x86/Release/_DELETE_ME_
nativeLib/rary.cots.jepp/jepp-2.3/windows/Release/_DELETE_ME_
Chose to keep in 4-Thin_Client
Former-commit-id: b9f4780fcb23cc9689de
2012-02-15 14:39:43 -06:00
Steve Harris
db1e3b1215
Merge commit 'awips2_OB12.1.1_Omaha' into 14-NCEP
...
Former-commit-id: 7356d655da1707b98721
2012-02-15 14:34:47 -06:00
Steve Harris
72466ef0ca
Merge commit 'awips2_OB12.1.1_Omaha' into 10-Tech_Blocked
...
Former-commit-id: 05c0347d9086a0e3f5ee
2012-02-15 14:26:22 -06:00
