Commit graph

203 commits

Author SHA1 Message Date
Steve Harris
9454393d13 Issue #817 - replacing files that were somehow lost between 12.6.1-9 and 12.6.1-10
These files have existing camel-cased equivalents and may not be needed.


Former-commit-id: b8e0e8d751a961c5ef25ab346be4b443aadf1291
2012-07-10 09:29:33 -05:00
Steve Harris
27afa60345 12.6.1-9 baseline
Former-commit-id: 8f93efb93ec2d244fe599c16b3af5b33784c0232
2012-07-10 07:53:49 -05:00
Max Schenkelberg
98c2ec7dc5 Issue #626 Moved code from NPP branch in old repo to new common/core setup. Involved adding multichannel imagery code into new baseline. Cleaning up derived parameters to support more than just FloatDataRecords as well as search the full localization hierarchy contributing derived paramters and not just base/site/user files (NPP Derived parameters are in NPP plugin, not cave etc directory where all others reside). Also removed calls to deprecated useBuiltInColorBar function
Amend: Fixed Richard's comments

Change-Id: Ie406098bbc73fe6bf53bfb9bb103d7422c6c57d3

Former-commit-id: 9d3fd9e078c9c1a2995d2f8ebe4eca757b480050
2012-07-06 16:01:47 -05:00
Ron Anderson
59a3ebe8ba Issue #851 Cleaned up dead code and unused dependencies in GFE.
Amend: Issue #851 resubmitting after accepting ticket

Change-Id: I8bef2701a845275bba148e9777f3cb161b056d6e

Former-commit-id: af1332170e28aed53ff91997ce089b20423203d5
2012-07-05 15:39:05 -05:00
Bryan Kowal
5fe8bd69f8 Issue #813 - fix merge issues; update the edex features; corrected a problem in edexOsgi/com.raytheon.uf.edex.tafqueue/build.properties
Former-commit-id: 403599d216e643dba2fcae0883f32987c7bade3f
2012-06-27 18:38:19 -05:00
Bryan Kowal
b87b66abc5 Merge branch 'ss_sync' (OB12.6.1-10) into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	edexOsgi/build.edex/deploy-install.xml
	edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
	edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
	edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
	rpms/awips2-rpm.db
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: af5a90e383c1c115b363a33d9e72f957ada697a4
2012-06-27 17:21:48 -05:00
Bryan Kowal
53e5b7c491 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: 9597fdac96022c94dad425367de23eafedad06bc
2012-06-27 15:04:34 -05:00
David Gillingham
672d7a2c31 Issue #766: Merge VCModule refactor and Python globals memory leak fix to common baseline.
Former-commit-id: 48c3d7d8c7cec6c7366705c9318ce35a46bd8b3d
2012-06-26 17:49:06 -05:00
Max Schenkelberg
130692aefd Issue #590 fixed context activation for GFE when non GFE views/editors are active. Generalized so any perspective can take advantage of it.
Change-Id: I98fa8bd80d2235d605f94f227490e4438ef70ca5

Former-commit-id: 75fb17528d393b767df8d8a34abd5e41f007b771
2012-06-21 16:07:20 -05:00
Steve Harris
3cd0902b49 12.6.1-10 baseline
Former-commit-id: dd65e6d99709e0117519a1f2a2f02a41c8938d0e
2012-06-21 08:58:00 -05:00
Steve Harris
25198a5cd6 Revert "12.6.1-10 baseline"
This reverts commit a2c0893d1a [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1].


Former-commit-id: 8cdb21fda317373a0dc95e5048716d0e31412ab4
2012-06-21 08:51:08 -05:00
Steve Harris
a2c0893d1a 12.6.1-10 baseline
Former-commit-id: 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1
2012-06-21 08:38:48 -05:00
Max Schenkelberg
61e0ea0516 Issue #590 Fixed GFE colorbar when changing parms after setting up collaboration session. Needed to move adding of listeners to initInternal and not the constructor so recycling readds them after dispose removes them
Change-Id: Ieb5fc7786682b5b442deccf4a5292374a4a7de47

Former-commit-id: c0d7f68bed2b141240d2e2a695c8439f7a4ffa67
2012-06-20 15:32:27 -05:00
Steve Harris
48860df690 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: 9e83341a16b6e68f9bfe579dff60271553c3db82
2012-06-12 14:37:12 -05:00
Steve Harris
8947efbc7f 12.6.1-5 baseline
Former-commit-id: 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb
2012-06-11 16:23:47 -05:00
Steve Harris
d57eb02b9e 12.6.1-3 baseline
Former-commit-id: 2f4e12140a9b026770563eee58577b8aa2c041e1
2012-06-11 16:23:47 -05:00
Steve Harris
3904c4ccf5 12.5.1-15 baseline
Former-commit-id: 4909e0dd166e43c22a34d96aa744f51db8a7d6c0
2012-06-08 13:39:48 -05:00
Max Schenkelberg
6a0ed72e5e Issue #697 Fixed session closing issues and null pointer in gfe
Change-Id: Id12a3a15616299aaff4bc6fec72b615f1d79ef10

Former-commit-id: 695134c3139868d6e9ace9dca7757368e0bfa5ec
2012-06-07 09:44:40 -05:00
Matt Nash
ed0b70501f Issue #659 fix GFE issue with mouse handlers
Former-commit-id: 43f277de57d148c2d742266d8346b9b93cbcb82f
2012-06-06 14:13:55 -05:00
Max Schenkelberg
fbd269f4c7 Issue #590 Fixed gfe edit area selection issue
Change-Id: I67029301f515583a7ca3eea408513d9310e3fd35

Former-commit-id: 6588f58c80782f793c3621a2fd7ec81be2d1ead2
2012-06-06 12:05:47 -05:00
Max Schenkelberg
8b87b6a0a1 Issue #590 fixed GFE session creation bugs. Added refresh to tool items
on undo/redo from keyboard

Former-commit-id: 5c3d4a7fffe3873afbe8db60310afae2b3f0738b
2012-06-05 16:43:27 -05:00
Max Schenkelberg
52a78af98c Issue #239 Moved initialization code in GFE resources so recycle() works properly
Change-Id: I3a4e1f18a7246af504a6d1ce791bd94ab1f721d5

Former-commit-id: 1f092691e6e43bd8f6d10c2b8fab0a68eca38992
2012-05-22 09:56:27 -05:00
Steve Harris
1f542697cb 12.5.1-9 baseline
Former-commit-id: 25a4d3ed99c4be73a118b92c230c6365b65b56eb
2012-05-21 17:48:55 -05:00
Steve Harris
fa87dc6cf1 12.5.1-6 baseline
Former-commit-id: a75af2f0de38d65dcbbd919e159c3b0a268fc245
2012-05-16 16:41:22 -05:00
Nate Jensen
78c1298085 Issue #590 Fix rsc so it can be recycled
Change-Id: I3cddf5d67c2e5dfb52380529f703a0d9558d8916

Former-commit-id: cd52bfbeb593a4b1891f4df7f7ae73c7193504d0
2012-05-11 10:04:36 -05:00
Steve Harris
58037cb5d1 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: 8f71c807be1d604cea51ab522f04f8bbf8c11f83
2012-05-09 13:14:00 -05:00
Steve Harris
b36c69cc67 12.5.1-2 baseline
Former-commit-id: ff847bf86803a485212f08a098be13bc3d83b0b8
2012-05-03 19:17:13 -05:00
Steve Harris
8485b90ff8 12.4.1-10 baseline
Former-commit-id: bf53d06834caa780226121334ac1bcf0534c3f16
2012-05-01 18:06:13 -05:00
Steve Harris
01457fbbde 12.4.1-10 baseline
Former-commit-id: 5bd6393d7577e5625c6c85b7fe5e7beb9f8c477a
2012-04-24 15:38:29 -05:00
Steve Harris
cca73b3c62 12.4.1-7 baseline
Former-commit-id: 3524730cc38b5420e7529b5a75d62313695e64d6
2012-04-24 15:24:39 -05:00
Steve Harris
2a216f333c 12.4.1-4 baseline
Former-commit-id: ad648deaf4d3edaabdda15184289b3a927308bd7
2012-04-18 15:18:16 -05:00
Max Schenkelberg
6812c1ba2b Issue #239 Fixed D2D context activation so as not to override important
keys when a unrelated view is active such as Product Browser or
Collaboration views.

Former-commit-id: c7badfd1c2a77d410cd3b841fef967c07c9e6434
2012-04-06 10:23:24 -05:00
Max Schenkelberg
16056d53c5 Issue #239 Added remote capability injection code through factory
method. Cleaned up old/unmaintained 3D references

Former-commit-id: e3b171f34fb7610f4f5796d0dcdf32f7a298c8ca
2012-04-05 13:52:20 -05:00
Steve Harris
22bd792cd9 12.3.1-10 baseline
Former-commit-id: 7d62bca046401a670ef7bd917cbcbb073e061b60
2012-03-30 08:38:33 -05:00
Steve Harris
a0abcf8120 Merge branch 'sync_test' (VCModules) into ss_sync
Former-commit-id: e68338cecbe85a62835633e9aba0925344fb80f1
2012-03-29 10:03:05 -05:00
David Gillingham
494fbe93db Issue #354: Refactor AbstractParmManager to better handle ISC parm
pre-loading.

Former-commit-id: e2c66b33fd8c71b0da6518c419296ab8141a07e3
2012-03-05 11:23:11 -06:00
David Gillingham
0c0f659896 Issue #346: Convert GFE to use identity-based ListenerLists, increase
synchronization in Parm/VCParm to prevent leaking of VCParms through
ListenerLists.

Former-commit-id: 5fc74409511903afa97949bc3cd1b3acf91c35e0
2012-03-02 13:22:46 -06:00
Steve Harris
787aed90f8 Merge branch 'ss_sync' into sync_test
Former-commit-id: 7ebcf63686d75d58f8bfea92e825edaf49a30df1
2012-03-01 14:01:16 -06:00
David Gillingham
5aa5b51a55 Issue #346: Create a dispose method for Parm and use it like AWIPS1's C++ destructor.
Change-Id: I2e8a4e82d5efd210e546abbaf8c0aba960803a9d

Former-commit-id: b6d7661be725d8a37a8294b0eda982208c35ecbe
2012-02-23 14:40:25 -06:00
David Gillingham
85998bc654 Issue #346: Fix disappearing ISC data from VCParms, fix threading issues in Scalar/Vector pickup value dialogs.
Change-Id: If465b8daf5ef04a76084500425ac3114a48ab908

Former-commit-id: 67aaf1c21e8372b4a84cb82cae62549502992651
2012-02-23 13:23:59 -06:00
Steve Harris
86e586befe 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: 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637
2012-02-23 12:38:55 -06:00
Steve Harris
7a10ca9766 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: 5528a1374781f3a4d55702ae1f0c34efcf1e3865
2012-02-23 10:06:18 -06:00
Steve Harris
54be9660f1 Merging SS OB12.2.1 into ss_sync
Former-commit-id: 60f30af0c9e3203e2ff623d420165201dff41601
2012-02-22 11:14:43 -06:00
Steve Harris
5e9d2dd367 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: f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce
2012-02-20 13:03:39 -06:00
Steve Harris
d02529fef4 Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked
Former-commit-id: ad74b15c5cab1f5275521f18ee67d30f199a8f95
2012-02-20 12:54:25 -06:00
Steve Harris
cc66c8be24 Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
Former-commit-id: a998a29e2f756ffc583eac04a884dcf9aae585e8
2012-02-20 12:43:38 -06:00
Steve Harris
b137302802 Manual merge of SS OB12.1.2-4 changes into ss_sync
Former-commit-id: 0ccca40d35e50072218a1da1db474075f8ad0393
2012-02-17 10:55:02 -06:00
Steve Harris
f693b6d0a7 Merge branch '10-Tech_Blocked' into 104-integration
Former-commit-id: d31ccf5832bf2b2ccfe29126deb4da80806c6739
2012-02-09 08:54:18 -06:00
Max Schenkelberg
e422b13ded Issue #206 Made tear off menu dialog activate contexts for perspective
Former-commit-id: 56103eb133de5325d62bb3453b2353e5d5e23ddd
2012-02-01 17:03:20 -06:00
Ben Steffensmeier
9b78596436 Issue #227 enhanced caching of maps for thin client
Change-Id: Ib2c6665d1725bcfde70be6ed5a490e68115c6b94

Former-commit-id: 067ba5b7d28174d99119d5bf87a28334578f78dd
2012-01-31 10:53:10 -06:00