Commit graph

486 commits

Author SHA1 Message Date
Nate Jensen
24a4ef99a7 Merge "Issue #821 Fixed editor menu so plugin.xml action contribution items are created every time the menu is shown to make sure any submenus are recreated in the action." into development
Former-commit-id: 41f21e357b6aacc42ff01a93a85f50c68c2c890b
2012-06-28 14:16:28 -05:00
Ben Steffensmeier
6f2e2b2cea Issue #704 remove obsolete edex kml and add kml to develoepr feature
Former-commit-id: 067bfaab551c3c061ecfa8defba7d90c3e34b81a
2012-06-28 14:07:48 -05:00
Ben Steffensmeier
881896c21b Issue #704 introduce canvas based rendering for making KML screen overlays
Change-Id: I6fc7873d98fe140ebea84899b7e4732719866def

Former-commit-id: bb83a95f5f00cce75b47e7fab084cf3258f65aba
2012-06-28 13:58:29 -05:00
Max Schenkelberg
668838364d Issue #821 Fixed editor menu so plugin.xml action contribution items
are created every time the menu is shown to make sure any submenus are
recreated in the action.

Change-Id: I9f2103b1e8fcddc5bc790d74753733a42f9e6382

Former-commit-id: 537240ee2e9dfb7c110f8d3a63566932b599dfdf
2012-06-28 11:53:21 -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
98fdfa6f37 Issue #817 - fix ncep/gov.noaa.nws.ncep.metParameters and a few merge issues
Change-Id: I54dc0ee5e4f9a6592bb0a3281a2bc6d806abff55

Former-commit-id: b6990b5dc58e07fe7d5c85f8fa322723391193a4
2012-06-27 16:22:53 -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
Nate Jensen
ab86141e2f Merge "Issue #628 added PgenResourceGhost to track the gl ghost draw objects." into development
Former-commit-id: 00dfc8449b6d12b0a3ed52c3f60cc016eaa13af3
2012-06-26 13:21:49 -05:00
Ben Steffensmeier
603d48a017 Issue #704 modify grid reprojection/interpolation code to be more thread safe and dynamic.
Former-commit-id: 308f0e8c03ab4237830a91c96c500b6860c6fd36
2012-06-25 15:22:35 -05:00
Ben Steffensmeier
b01be5085f Issue #704 fixes to plots/MPE to work better in KML
Former-commit-id: f1d440729b4e436e879219abaaaf7fa0e04d4ef6
2012-06-22 17:54:31 -05:00
Brad Gonzales
bef2bfa7cc Issue #628 added PgenResourceGhost to track the gl ghost draw objects.
Former-commit-id: 237309aab32cdb36703dbe62d2cfe102b3197863
2012-06-22 15:08:40 -05:00
Max Schenkelberg
fce005b109 Issue #778 changed SPIResource to not dispose font when magnification changes but instead call setMagnification()
Change-Id: Ibc8aa9b69643d67a1203a560f3adbc3d870db2bf

Former-commit-id: 6ce5d188d0b27bf4cf07a8cd9b15fa9ad0bb16c2
2012-06-21 16:07:23 -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
Nate Jensen
22d4de96fd Merge "Issue #704 fixes to random resources and optimization of radar projection transforms" into development
Former-commit-id: 995d7e08ade1a3e10ac8ab51aa24f900091054de
2012-06-21 10:04:51 -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
Ben Steffensmeier
16e4fe8ce2 Issue #704 fixes to random resources and optimization of radar projection transforms
Former-commit-id: 7619165ce45efe9dbad045adfaaf978acee782be
2012-06-20 18:07:17 -05:00
Nate Jensen
133cd9994e Merge "Issue #704 add INCOMPLETE PaintStatus to indicate a frame will require more painting later" into development
Former-commit-id: 5e8d1cbc132dbd69b86342234631f3d11e3bdb3d
2012-06-20 17:56:50 -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
Ben Steffensmeier
0c69731e18 Issue #704 add INCOMPLETE PaintStatus to indicate a frame will require more painting later
Former-commit-id: 65e7e8b2c891d1938f0b98c3c8737f18517fe27f
2012-06-20 14:13:37 -05:00
Bryan Kowal
25addabe64 Issue #708 - fix cave dependency issue when building due to ecf. The baseline p2-build.xml script will no longer attempt to build the collaboration feature.
Former-commit-id: 048ea55e064e0581cf32ca286c67f611ee4e0c3b
2012-06-19 15:03:57 -05:00
Bryan Kowal
966c50ed06 Issue #762 - Remove all plugins specific to the 11-Collaboration Work Assignment.
Former-commit-id: 74c2228d9b0c924b83d99e92fb5da733ec6e8d28
2012-06-18 11:51:47 -05:00
Bryan Kowal
f0e3b957e3 Merge branch '11-Collaboration' into development
Conflicts:
	cave/com.raytheon.viz.alerts/src/com/raytheon/viz/alerts/jobs/AutoUpdater.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java

Former-commit-id: 9e117e495d669e310839bc9ff8e1e8207b03491b
2012-06-18 11:16:28 -05:00
Ben Steffensmeier
9068e049cb Issue #704 rewrite shared meshes and tilesets to be more efficient and less deprecated.
Change-Id: I9f6ebba1bd75682b56a1e8de5a8d0b8974153f97

Former-commit-id: 901f061f9e19f39cf5096a394cbd238c5562d733
2012-06-14 16:44:19 -05:00
Ben Steffensmeier
58356c49cb Issue #704 various core changes to make things work smoothly in kml
Change-Id: I048f9dfdb411a95765410f48fddb54aa8eefbd16

Former-commit-id: faec1cb4e4e0ef6444da31971b937ad3ee79160a
2012-06-14 16:41:05 -05:00
Max Schenkelberg
576dbcf340 Issue #697 fixed join issues with GFE
Change-Id: Idaaa9782865cd2299ba9fc8e18305df215f1d012

Former-commit-id: e648206c2e8129b2d63b9309f67e1ce46a1edbf0
2012-06-14 14:18:02 -05:00
Bryan Kowal
c0aaac4a07 Issue #708 - build and developer deployment changes required for transitioning to the AWIPS II Common Baseline Repository.
Former-commit-id: 3fb013680e1c49b1e0921ad57d59104c5ec2cbfc
2012-06-14 11:35:15 -05:00
Nate Jensen
475a9a76b5 Issue #716 better tooltip
Change-Id: I9db709540cb6ac25893756139b3269adf9d4551b

Former-commit-id: 4181cc97d769bfead6f5425ec4740ab90c8b57a5
2012-06-14 11:20:16 -05:00
Max Schenkelberg
4c8b468854 Issue #697 added drawing indicator for shared display for data provider, fixed shutdown issue
Change-Id: Iccfb92e3155e8be5c780e601fb8c31ef2c74f39f

Former-commit-id: c00c45f5ba1ae3bb0a0a246d1435bd10b3a8aa51
2012-06-14 11:16:11 -05:00
Max Schenkelberg
fceef3c5a1 Issue #697 added support for multiple editors
Change-Id: Ic3ac12bb9368f0ec54dd8151ba1876002ff44e82

Former-commit-id: 3afc7b49cb42c005a0e9cf5221e35fc3ab78007a
2012-06-13 17:52:11 -05:00
Matt Nash
032827aa1b Issue #711 add roles and site capability
Former-commit-id: a49eee36dac39f172d7c4fa723a297d7cf94d5db
2012-06-13 12:58:11 -05:00
Matt Nash
b65a0f124e Issue #659 fix floating view issue when minimize happened
Former-commit-id: 82f0b55ac176aad663d7febe94c64d2982bcc45c
2012-06-13 10:04:12 -05:00
Nate Jensen
47e8561dd0 Issue #716 fix lots of minor issues, fix merge problem
Change-Id: I5a43ad089766b5f2a9a3ea6901d8f6761983b575

Former-commit-id: ae131c0d05148e58ba445e5f144aa21c8c5c12c3
2012-06-13 09:39:19 -05:00
Steve Harris
308737bff8 Removed duplicate method created by merge
Former-commit-id: 90fc678948690cc74488e6e1fd18cf8c72c5c0c9
2012-06-13 08:41:24 -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
Nate Jensen
cd14177a84 Issue #716 removing unnecessary file
Change-Id: I439f95ab54eb6fa3765438dcb77a94445dc2ebba

Former-commit-id: 5ade0f2437308ab21429432746cf4e71afc33c93
2012-06-11 17:34:21 -05:00
Nate Jensen
0c869f599e Issue #716 fix disabled toolbar
Change-Id: I464d0560cf7462b37d324db368411f3867e53602

Former-commit-id: d32771cbbe72a32965c50aacd7ede3383a5fff23
2012-06-11 17:33:48 -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
cee20d8656 12.5.1-15 baseline
Former-commit-id: 1c128372ef9f478f1b807e8d0f23207d095bfc65
2012-06-11 16:02:30 -05:00
Matt Nash
b78d86bf04 issue #693 always allow to invite users after opening create session dialog
Former-commit-id: 204c35530bbe8c7e39749d70331ceb93c4d4a790
2012-06-11 15:34:49 -05:00
Steve Harris
d325d496f5 Merge branch 'ss_sync' (OB12.5.1-15) into 9-Wes2Bridge
Conflicts:
	cots/org.jboss.cache/.project
	edexOsgi/build.edex/esb/conf/spring/project.properties
	edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
	edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/bufr/BUFRSection1.java
	edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/time/TimeTools.java
	javaUtilities/com.raytheon.wes2bridge.utility.product/.project
	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
	ncep/gov.noaa.nws.ncep.common.dataplugin.ssha/src/gov/noaa/nws/ncep/common/dataplugin/ssha/SshaRecord.java
	ncep/gov.noaa.nws.ncep.common.staticdata/.project

Former-commit-id: a435e6464a78345b5036e3060430375dc53e4faf
2012-06-11 15:24:03 -05:00
Matt Nash
022e982aae Issue #693 add nws_collaborate view, and ability for default on startup or not
Former-commit-id: b50cfeb8633e2b9a0d2fc7bb848bbcf7d0404321
2012-06-11 10:24:35 -05:00
Matt Nash
4b72bb3d8e Issue #703 can change font size in sessions
Former-commit-id: 0e7af586cd96a21540263474f321bd224c45ad54
2012-06-11 10:23:45 -05:00
Matt Nash
1f54c2d09d Issue #659 make fixes to float/dock
Former-commit-id: 6ce7d566d2da59436b6d141ad96503873b11f1aa
2012-06-11 10:21:40 -05:00
Nate Jensen
14c2b1271e Issue #427 fixed issues
Change-Id: I984b6ccefd84e90d0296e1b38b8dd30b241546f8

Former-commit-id: 64e3f77ac8ebc03c0e15c3d4ac513df78f05b00a
2012-06-08 16:10:57 -05:00
Nate Jensen
28f779e7b9 Issue #427 remove login and event subscription code from CollaborationDataManager
Change-Id: I18a2c44a275f5180d828184001fd1c5173ea2f74

Former-commit-id: 2306edfd4e11b512a68320ae7dc4edbcfa474934
2012-06-08 15:15:03 -05:00