xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
202 commits 31 branches 40 tags 3.8 GiB
Commit graph

202 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bryan Kowal
5874255a05 Issue #817 - fix ncep/gov.noaa.nws.ncep.metParameters and a few merge issues 
Change-Id: I54dc0ee5e4f9a6592bb0a3281a2bc6d806abff55

Former-commit-id: f7d19019a9 [formerly b6990b5dc58e07fe7d5c85f8fa322723391193a4]
Former-commit-id: 98fdfa6f37
 2012-06-27 16:22:53 -05:00
Bryan Kowal
62c7de6d3b 12.6.1-10 baseline 
Conflicts:
	cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000-500_thkn.attr
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/ext/IImagingExtension.java
	cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNSharpDescriptor.java
	cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/rsc/D2DNSharpResource.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPTableCellData.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPColorUtils.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.uf.viz.npp.feature/com.raytheon.uf.viz.npp.feature.ecl
	cave/com.raytheon.uf.viz.npp.viirs/.classpath
	cave/com.raytheon.uf.viz.npp.viirs/.project
	cave/com.raytheon.uf.viz.npp.viirs/.settings/org.eclipse.jdt.core.prefs
	cave/com.raytheon.uf.viz.npp.viirs/com.raytheon.uf.viz.npp.viirs.ecl
	cave/com.raytheon.uf.viz.python.swt/src/com/raytheon/uf/viz/python/swt/widgets/ScaleWidget.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/msgs/IGridHistoryUpdatedListener.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smartscript/FieldDefinition.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridVectorResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGribGridResource.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDataManager.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/AbstractRadarResource.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/WarningTextHandler.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWarningResource.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java
	cots/org.jboss.cache/.project
	deltaScripts/12.5.1/drop_gfe_tables.sh
	edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactSevereWeatherStatement.vm
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscSendQueue.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscSendRecord.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/SendIscTransactions.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/ClimoDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/HLSTopoDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/TopoDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/lock/LockManager.java
	edexOsgi/com.raytheon.edex.plugin.redbook/utility/edex_static/base/redbook/redbookFcstMap.xml
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDB.java
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.viirs/.classpath
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.viirs/.project
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.viirs/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.viirs/build.properties
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.viirs/com.raytheon.uf.common.dataplugin.npp.viirs.ecl
	edexOsgi/com.raytheon.uf.common.tafqueue/.classpath
	edexOsgi/com.raytheon.uf.common.tafqueue/.project
	edexOsgi/com.raytheon.uf.common.tafqueue/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/.classpath
	edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/.project
	edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/build.properties
	edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/src/com/raytheon/uf/edex/plugin/npp/viirs/VIIRSSpatialMessageData.java
	edexOsgi/com.raytheon.uf.edex.tafqueue/.classpath
	edexOsgi/com.raytheon.uf.edex.tafqueue/.project
	edexOsgi/com.raytheon.uf.edex.tafqueue/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.edex.tafqueue/build.properties
	edexOsgi/com.raytheon.uf.edex.tafqueue/component-deploy.xml
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/gov.noaa.nws.ost.edex.plugin.regionalsat.ecl
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/utility/cave_static/site/AFC/menus/satellite/regionalsat/baseRegionalComposite.xml
	ncep/gov.noaa.nws.ncep.common.staticdata/.classpath
	ncep/gov.noaa.nws.ncep.common.staticdata/.project
	ncep/gov.noaa.nws.ncep.common.staticdata/.settings/org.eclipse.jdt.core.prefs
	ncep/gov.noaa.nws.ncep.common.staticdata/build.properties
	ncep/gov.noaa.nws.ncep.common.staticdata/gov.noaa.nws.ncep.common.staticdata.ecl
	ncep/gov.noaa.nws.ncep.gempak.parameters.core/.project
	ncep/gov.noaa.nws.ncep.gempak.parameters.core/.settings/org.eclipse.jdt.core.prefs
	ncep/gov.noaa.nws.ncep.gempak.parameters.core/build.properties
	ncep/gov.noaa.nws.ncep.gempak.parameters.core/gov.noaa.nws.ncep.gempak.parameters.core.ecl
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metParameters/UncondProbOfTstorms2hr.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/ClimDayTemp.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/DayTempAnomaly.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/HeightAboveSeaLevel.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/NightTempAnomaly.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/POP12HrsAnomaly.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/UncondProbOfTstorms12hr.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/UncondProbOfTstorms24hr.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/UncondProbOfTstorms2hr.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/UncondProbOfTstorms6hr.java
	ncep/gov.noaa.nws.ncep.staticdataprovider/.classpath
	ncep/gov.noaa.nws.ncep.staticdataprovider/.project
	ncep/gov.noaa.nws.ncep.staticdataprovider/.settings/org.eclipse.jdt.core.prefs
	ncep/gov.noaa.nws.ncep.staticdataprovider/gov.noaa.nws.ncep.staticdataprovider.ecl
	ncep/gov.noaa.nws.ncep.viz.customProjection/.classpath
	ncep/gov.noaa.nws.ncep.viz.customProjection/.project
	ncep/gov.noaa.nws.ncep.viz.customProjection/gov.noaa.nws.ncep.viz.customProjection.ecl
	rpms/awips2.core/Installer.ldm/component.spec

Change-Id: Ib8015bb11aef0561ff3b3bc426b51b5c8ee8ef4a

Former-commit-id: 4a17650914 [formerly 9597fdac96022c94dad425367de23eafedad06bc]
Former-commit-id: 53e5b7c491
 2012-06-27 15:04:34 -05:00
Steve Harris
ed334fff87 Issue #708 - removed extraneous files from 12.6.1-10 
Former-commit-id: 9a330b2aff [formerly fdeb636cf84f50fb9c99502f4a7c2991bc48de55]
Former-commit-id: 577ebf6558
 2012-06-21 10:23:40 -05:00
Steve Harris
eacd5aeb7f 12.6.1-10 baseline 
Former-commit-id: 8dc4a774e2 [formerly dd65e6d99709e0117519a1f2a2f02a41c8938d0e]
Former-commit-id: 3cd0902b49
 2012-06-21 08:58:00 -05:00
Steve Harris
8367fb50f5 Revert "12.6.1-10 baseline" 
This reverts commit b33c5bdfcf [formerly a2c0893d1a] [formerly ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]].


Former-commit-id: b4b1f6975f [formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]
Former-commit-id: 25198a5cd6
 2012-06-21 08:51:08 -05:00
Steve Harris
b33c5bdfcf 12.6.1-10 baseline 
Former-commit-id: ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]
Former-commit-id: a2c0893d1a
 2012-06-21 08:38:48 -05:00
Steve Harris
7f3472b566 Issue #708 - Removed extraneous files from 12.5.1-15 
Former-commit-id: 4fb1c73492 [formerly bab92b963dca76671250f5e2e2bb462ad5a12a29]
Former-commit-id: 6c4e72a430
 2012-06-21 08:25:31 -05:00
Steve Harris
a945ed8e6d 12.6.1-5 baseline 
Former-commit-id: c99afab05f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]
Former-commit-id: 8947efbc7f
 2012-06-11 16:23:47 -05:00
Steve Harris
1fdc0aa237 12.6.1-3 baseline 
Former-commit-id: 42f3513175 [formerly 2f4e12140a9b026770563eee58577b8aa2c041e1]
Former-commit-id: d57eb02b9e
 2012-06-11 16:23:47 -05:00
Steve Harris
6db76e884c 12.5.1-15 baseline 
Former-commit-id: e8a0d40b73 [formerly a5f61b51742cf97f02253e5e6ca988e7ffa9b26d]
Former-commit-id: 8d5e739a61
 2012-06-11 16:23:11 -05:00
Steve Harris
76e3f566f4 Removed extra files from 12.5.1-15 
Former-commit-id: 288233a06c [formerly 3c367f4c3b2b2f5bc64b8eb43ed5eb66deda129f]
Former-commit-id: 9612d7e90c
 2012-06-11 16:18:26 -05:00
Steve Harris
7da9afe36a 12.5.1-15 baseline 
Former-commit-id: d5c238de07 [formerly 1c128372ef9f478f1b807e8d0f23207d095bfc65]
Former-commit-id: cee20d8656
 2012-06-11 16:02:30 -05:00
Steve Harris
676ea3192f 12.5.1-15 baseline 
Former-commit-id: b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]
Former-commit-id: 3904c4ccf5
 2012-06-08 13:39:48 -05:00
Steve Harris
ce0422a34a 12.5.1-9 baseline 
Former-commit-id: 8f3c9ebfb7 [formerly 25a4d3ed99c4be73a118b92c230c6365b65b56eb]
Former-commit-id: 1f542697cb
 2012-05-21 17:48:55 -05:00
Steve Harris
c452cce633 12.5.1-6 baseline 
Former-commit-id: 24474489f9 [formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]
Former-commit-id: fa87dc6cf1
 2012-05-16 16:41:22 -05:00
Steve Harris
a821111fbf 12.5.1-2 baseline 
Former-commit-id: 84d191e7b6 [formerly ff847bf86803a485212f08a098be13bc3d83b0b8]
Former-commit-id: b36c69cc67
 2012-05-03 19:17:13 -05:00
Max Schenkelberg
878de45ee6 Issue #358 Fixed merge errors when merging core_exp into ss_sync 
Former-commit-id: 3fe183277b [formerly e8846fa2b5aa1ef2972f134a683246bc275a8067]
Former-commit-id: e3d6962fe6
 2012-05-01 18:36:09 -05:00
Steve Harris
6dd3ee8809 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: 2ed7249613 [formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]
Former-commit-id: 7b75b781ad
 2012-05-01 18:31:09 -05:00
Steve Harris
a28d70b5c5 12.4.1-10 baseline 
Former-commit-id: 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]
Former-commit-id: 8485b90ff8
 2012-05-01 18:06:13 -05:00
Steve Harris
aabc3842ac 12.4.1-10 baseline 
Former-commit-id: 704b75e1a1 [formerly 5bd6393d7577e5625c6c85b7fe5e7beb9f8c477a]
Former-commit-id: 01457fbbde
 2012-04-24 15:38:29 -05:00
Steve Harris
d9f966008c 12.4.1-7 baseline 
Former-commit-id: 90ae4bbb36 [formerly 3524730cc38b5420e7529b5a75d62313695e64d6]
Former-commit-id: cca73b3c62
 2012-04-24 15:24:39 -05:00
Max Schenkelberg
65c864aff2 Issue #358 Fixed merge errors when merging core_exp into ss_sync 
Former-commit-id: 1294fa0ca1 [formerly bd93246cccd1b123598006d7343eac265392695d]
Former-commit-id: 90a5c20b5a
 2012-04-19 11:11:34 -05:00
Steve Harris
def458753d 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: 4d7572a632 [formerly 5e1b9319941eed516a08a135a2049c14bad77863]
Former-commit-id: 625cd4262c
 2012-04-19 11:11:02 -05:00
Steve Harris
a4e519f3cd 12.4.1-4 baseline 
Former-commit-id: 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]
Former-commit-id: 2a216f333c
 2012-04-18 15:18:16 -05:00
Max Schenkelberg
993cac891e Issue #358 Fixed merge errors when merging core_exp into ss_sync 
Former-commit-id: 9b0d01f8b5 [formerly beb6a1d49fac8e3e7b2ba8cbc52a8980d06e9885]
Former-commit-id: 07cf5069ba
 2012-03-30 10:51:31 -05:00
Steve Harris
6aa18f74f6 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: d3ad6095b7 [formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]
Former-commit-id: 5cdda77afb
 2012-03-30 09:50:48 -05:00
Steve Harris
ce3b74c605 12.3.1-10 baseline 
Former-commit-id: 4068f5295f [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]
Former-commit-id: 22bd792cd9
 2012-03-30 08:38:33 -05:00
Steve Harris
6884520750 Merge branch 'sync_test' (VCModules) into ss_sync 
Former-commit-id: 70357d90bc [formerly e68338cecbe85a62835633e9aba0925344fb80f1]
Former-commit-id: a0abcf8120
 2012-03-29 10:03:05 -05:00
Steve Harris
4b853c56c6 Merge branch '104-integration' into ss_sync; 4-Thin_Client and 10-Tech_Blocked (tear-off menus) -> ss_sync 
Former-commit-id: 132d68acc6 [formerly 296cc5a5a6bcc45cd92198a045a88620d7d18653]
Former-commit-id: 54a1d9cdbc
 2012-03-29 10:01:55 -05:00
Max Schenkelberg
ac11dd0c18 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: 15a9245592 [formerly 265ccb3e22aa0122dbd74e83d0af202596c1941c]
Former-commit-id: f10f1a5319
 2012-03-28 13:32:04 -05:00
Max Schenkelberg
954073b38c Issue #422 Set "numericValue" to null in RadarDefaultInterrogator in 
case of "NO DATA"

Former-commit-id: cd6ebd80d4 [formerly 89521a4df36d18ecb64b4cce248f150f0a0e4957]
Former-commit-id: b9085db25d
 2012-03-16 10:13:31 -05:00
Max Schenkelberg
1e5c074e3b Issue #358 Fixed sampling issue with mosaic resource with best 
res resources

Former-commit-id: cc111ab9ac [formerly 8aaf5e65d7c8ecbced6252d4a98af6223c77d5a0]
Former-commit-id: 258d57e825
 2012-03-16 09:03:50 -05:00
Max Schenkelberg
ba8af4dcc1 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: 719f87c261 [formerly f739d79bfd547adc295c716a1804f55f09b1bde1]
Former-commit-id: 556a270a09
 2012-03-14 18:03:44 -05:00
Max Schenkelberg
cf440b3884 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: 6e5964df9d [formerly 7e4abe637edacca71e1e1c98d99521cd33415fb0]
Former-commit-id: 50765e8a34
 2012-03-14 09:49:32 -05:00
David Gillingham
2b5588bd1e Issue #417: Refactor HPEDhrSrv to work from a 2-stage queueing process. 
Former-commit-id: e13850a2b6 [formerly 727e2b19688397ea4608a2b6ca3fda3222b6ad36]
Former-commit-id: d433b7d4d6
 2012-03-13 12:31:38 -05:00
Bryan Kowal
3b97383354 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: 58bfa62981 [formerly eaa45d7123c43590be3d58fdf845708ade2dbb51]
Former-commit-id: 66e05f4c96
 2012-03-12 11:43:34 -05:00
Max Schenkelberg
4662ece060 Issue #358 Merging core drawing API improvements from Collaboration 
Former-commit-id: d43b0456d8 [formerly a266a93ec2dca3ffbd7d2fd1f9dc47d7e18e6904]
Former-commit-id: 89f603f448
 2012-03-09 12:31:50 -06:00
Bryan Kowal
638d2c964b Issue #202 - increment the awips2-qpid release so yum will update the qpid installation. 
Former-commit-id: fc1ca4efcc [formerly ff79422d30a93ca71fc83e38e0368e499a34dd59]
Former-commit-id: b871752e3a
 2012-03-08 09:00:55 -06:00
David Gillingham
8a86e910aa Issue #361: Use queueCreator.sh to build the new ISC data receive QPID 
queue.

Former-commit-id: 90a745a037 [formerly cc6bca06f0fdb5919fe9ea9dc46eafd3d2d41a08]
Former-commit-id: 78c7f29096
 2012-03-07 16:05:54 -06:00
Bryan Kowal
033a4e237b 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: 4d8d3d4d00 [formerly 75cac6f9bf1dc237c4131e47912c595adb6aa0d7]
Former-commit-id: c803afd454
 2012-03-07 10:22:40 -06:00
David Gillingham
1818e488c5 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: 9a75c87829 [formerly 679996850315f699d47633da5baf593c72ba7927]
Former-commit-id: 3cfa029f4b
 2012-03-06 16:24:58 -06:00
David Gillingham
8c0b121cbc Issue #361: Refactor IscDataRecRequest handler to execute iscDataRec 
asynchronously.

Former-commit-id: ff231f33f4 [formerly 26161f9fd457f02b4df8780750064aeb27fc7ba1]
Former-commit-id: 1d69867594
 2012-03-05 16:49:23 -06:00
Bryan Kowal
81f778e43a Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp. 
Former-commit-id: 5228de77e2 [formerly a5229ac02bb3c7e177b26dae68902321c9de986c]
Former-commit-id: 793dad5711
 2012-03-05 13:46:10 -06:00
David Gillingham
bc61eb1e43 Issue #354: Refactor AbstractParmManager to better handle ISC parm 
pre-loading.

Former-commit-id: d68e3a7eea [formerly e2c66b33fd8c71b0da6518c419296ab8141a07e3]
Former-commit-id: 494fbe93db
 2012-03-05 11:23:11 -06:00
Max Schenkelberg
e27d36432a Issue #358 merged esb.camel project for plot update compatibility 
Former-commit-id: 0cf00cb7f4 [formerly ba90282320443c6c41c3188db9f43ffb11399bdd]
Former-commit-id: 76e7a02f76
 2012-03-02 13:26:44 -06:00
David Gillingham
b3df043f97 Issue #346: Convert GFE to use identity-based ListenerLists, increase 
synchronization in Parm/VCParm to prevent leaking of VCParms through
ListenerLists.

Former-commit-id: f6f0ca24df [formerly 5fc74409511903afa97949bc3cd1b3acf91c35e0]
Former-commit-id: 0c0f659896
 2012-03-02 13:22:46 -06:00
Max Schenkelberg
e4914cbe89 Issue #358 merged dataURI changes from thinclient in for plot 
compatibility

Former-commit-id: f96ff96259 [formerly 14d0dc1cd0e5eb0b48de89f5c73f30152d4789de]
Former-commit-id: 1f714b1a5b
 2012-03-02 12:24:19 -06:00
Max Schenkelberg
3212cc6ebb Issue #358 Committing NPP core rendering improvements merged with Thin 
Client core improvements

Former-commit-id: ae47d9683e [formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]
Former-commit-id: 48b6d45f00
 2012-03-01 16:59:40 -06:00
Steve Harris
db45babec8 Merge branch 'ss_sync' into sync_test 
Former-commit-id: 951ecfe3dd [formerly 7ebcf63686d75d58f8bfea92e825edaf49a30df1]
Former-commit-id: 787aed90f8
 2012-03-01 14:01:16 -06:00
Steve Harris
6f5c182af0 Merge branch '4-Thin_Client' into 104-integration 
Former-commit-id: c21bd2719c [formerly c6eacfe2d5898deacf756f059a71b1c9f41500bb]
Former-commit-id: 9bdea0399f
 2012-03-01 13:19:04 -06:00