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

489 commits

Author SHA1 Message Date
Nate Jensen
d261959c58 Issue #716 remove dead plugin from features 
Change-Id: I8fdce7496e3fc9123a48300f1c72c182eb811a0f

Former-commit-id: 7e34a3e6ab [formerly e58404bcb5] [formerly bcedcc51fa] [formerly 7e34a3e6ab [formerly e58404bcb5] [formerly bcedcc51fa] [formerly 7046ba996a [formerly bcedcc51fa [formerly f5784196a7d39d642357a3fb11ad34dc3fcd4b70]]]]
Former-commit-id: 7046ba996a
Former-commit-id: d91a0470ad [formerly 95bbc6a2d4] [formerly 0568bcdd3aeb09c62970a0d7fde73f55fd4d84b8 [formerly 63c5c4dc33]]
Former-commit-id: 39cc252f2828b2aca1e65da68a70de8fe6c5317b [formerly c558b07925]
Former-commit-id: 065bd9facf
 2012-06-29 13:19:47 -05:00
Nate Jensen
9d4acfd024 Issue #716 fix feature location of smack and remove dead dir 
Change-Id: I93ae13842f8e484f0d6243573f30d70b37a99702

Former-commit-id: 314910c88f [formerly eb2c21c15d] [formerly 315594cab4] [formerly 314910c88f [formerly eb2c21c15d] [formerly 315594cab4] [formerly 24b40c3392 [formerly 315594cab4 [formerly eabc44141aa681503d6076ebf779536ff27e62f2]]]]
Former-commit-id: 24b40c3392
Former-commit-id: b98cc05c01 [formerly 11f01325e5] [formerly d2911501fc67a32eb2a016f4d84e1503e130e670 [formerly d125185d28]]
Former-commit-id: eed240cb87b23fd0b2ceb0fb620c5c47647b08b7 [formerly bd58025a99]
Former-commit-id: c39f1c2a1d
 2012-06-28 17:57:17 -05:00
Max Schenkelberg
e0d375d2d0 Issue #763 Removed references to OBE cots org.apahce.tomcat.nativ to reduce size of collaboration standalone product. This project could now be removed from the baseline 
Change-Id: I9d8d0155afa5c01f3cc027a5f5adb0e2a9893e47

Former-commit-id: f0f4ad8039 [formerly e1d23a56a9] [formerly 62bd4a667a] [formerly f0f4ad8039 [formerly e1d23a56a9] [formerly 62bd4a667a] [formerly a3014f6ec3 [formerly 62bd4a667a [formerly 24423c6b03bffd01313a93b6c641b3d8fef35902]]]]
Former-commit-id: a3014f6ec3
Former-commit-id: 6ef03d0f02 [formerly 544ffdc4ca] [formerly 034844bd3b9932f93968553e4d47a01992315f8b [formerly 9328717a1a]]
Former-commit-id: 775b1e94e2260ad8ed9d98c7de081f1e312bc4c3 [formerly 57cc1a4830]
Former-commit-id: e1d946912c
 2012-06-28 15:29:05 -05:00
Nate Jensen
2134df5b91 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: d45000e600 [formerly 6dcea3d733] [formerly ed08428483] [formerly d45000e600 [formerly 6dcea3d733] [formerly ed08428483] [formerly 24a4ef99a7 [formerly ed08428483 [formerly 41f21e357b6aacc42ff01a93a85f50c68c2c890b]]]]
Former-commit-id: 24a4ef99a7
Former-commit-id: 94d49f9d61 [formerly b56d23d072] [formerly 85074a0067f786009e6363ac6c5af480fe9c6d6e [formerly afd37ef8b8]]
Former-commit-id: 4f42e0570e2363ecc5ca08b87c108ea26ad3d56c [formerly 0b604f9b5d]
Former-commit-id: c946b42d40
 2012-06-28 14:16:28 -05:00
Ben Steffensmeier
37a4b4cc86 Issue #704 remove obsolete edex kml and add kml to develoepr feature 
Former-commit-id: a93f42b3ec [formerly b7326d0979] [formerly 79ba6c2cd5] [formerly a93f42b3ec [formerly b7326d0979] [formerly 79ba6c2cd5] [formerly 6f2e2b2cea [formerly 79ba6c2cd5 [formerly 067bfaab551c3c061ecfa8defba7d90c3e34b81a]]]]
Former-commit-id: 6f2e2b2cea
Former-commit-id: 0e3a60ff34 [formerly 7238645490] [formerly e840f22756ff0b76e4cec15c0dc672b7efda26dc [formerly 1513500d7b]]
Former-commit-id: 57fbe2a27029d13fd085bbf8ba9067500c2cc925 [formerly 571fdce958]
Former-commit-id: fbc750bd7e
 2012-06-28 14:07:48 -05:00
Ben Steffensmeier
dc9dc339d2 Issue #704 introduce canvas based rendering for making KML screen overlays 
Change-Id: I6fc7873d98fe140ebea84899b7e4732719866def

Former-commit-id: f9e9d6d938 [formerly e3c0387f6e] [formerly 02e2c7b579] [formerly f9e9d6d938 [formerly e3c0387f6e] [formerly 02e2c7b579] [formerly 881896c21b [formerly 02e2c7b579 [formerly bb83a95f5f00cce75b47e7fab084cf3258f65aba]]]]
Former-commit-id: 881896c21b
Former-commit-id: 3fa351fb39 [formerly 8a86a66376] [formerly 6b4ac8ca33a3ba829b9cd0a5317eb13bdf0c6f14 [formerly b0f5013c7c]]
Former-commit-id: ac8d38c5918395f5ad4152b0b195a28e8d5fc3d4 [formerly bce842f480]
Former-commit-id: 44d3823a51
 2012-06-28 13:58:29 -05:00
Max Schenkelberg
edb5900530 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: 4b91c8e169 [formerly 53fd2ec047] [formerly 84ae717563] [formerly 4b91c8e169 [formerly 53fd2ec047] [formerly 84ae717563] [formerly 668838364d [formerly 84ae717563 [formerly 537240ee2e9dfb7c110f8d3a63566932b599dfdf]]]]
Former-commit-id: 668838364d
Former-commit-id: e0ab853ca7 [formerly f1eb4b4713] [formerly 42947fd159b2be8315aff7a6c8c72bf8a602e2ec [formerly e3524fd4df]]
Former-commit-id: fcd25cfb7ac43c46ba0ad4ba8b317fb3298eacff [formerly d12df1af56]
Former-commit-id: b378e3cdb4
 2012-06-28 11:53:21 -05:00
Bryan Kowal
57311c0029 Issue #813 - fix merge issues; update the edex features; corrected a problem in edexOsgi/com.raytheon.uf.edex.tafqueue/build.properties 
Former-commit-id: 4ce58fa303 [formerly 873ee341f5] [formerly 4acb1d8693] [formerly 4ce58fa303 [formerly 873ee341f5] [formerly 4acb1d8693] [formerly 5fe8bd69f8 [formerly 4acb1d8693 [formerly 403599d216e643dba2fcae0883f32987c7bade3f]]]]
Former-commit-id: 5fe8bd69f8
Former-commit-id: ae096aef72 [formerly 3010c15a2a] [formerly ecd3d8397c46ee4e729e87e7fd64f6413684adff [formerly 7d807fad71]]
Former-commit-id: 07f687a4c072b6aeddb13cb0971a782861e30540 [formerly f3409d507f]
Former-commit-id: 8da12f2c0d
 2012-06-27 18:38:19 -05:00
Bryan Kowal
e05b247e3b 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: 455d7b90a9 [formerly b1b294c401] [formerly a33740e915] [formerly 455d7b90a9 [formerly b1b294c401] [formerly a33740e915] [formerly b87b66abc5 [formerly a33740e915 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]]]
Former-commit-id: b87b66abc5
Former-commit-id: dfd75b4c72 [formerly b4917e6708] [formerly 351fe6f4caaff528740139f88451b1dae35f0c83 [formerly 9a7d0492fe]]
Former-commit-id: 0eec5560d9e68707684a8349e50debb048bda384 [formerly 611925412d]
Former-commit-id: 2e5a850d28
 2012-06-27 17:21:48 -05:00
Bryan Kowal
0a831eac6c Issue #817 - fix ncep/gov.noaa.nws.ncep.metParameters and a few merge issues 
Change-Id: I54dc0ee5e4f9a6592bb0a3281a2bc6d806abff55

Former-commit-id: 466046f605 [formerly 1e06e23eca] [formerly f7d19019a9] [formerly 466046f605 [formerly 1e06e23eca] [formerly f7d19019a9] [formerly 98fdfa6f37 [formerly f7d19019a9 [formerly b6990b5dc58e07fe7d5c85f8fa322723391193a4]]]]
Former-commit-id: 98fdfa6f37
Former-commit-id: 6d52b70048 [formerly fca7bf5b45] [formerly 14cc9da242f45d7762d577e57cd1819ba0d08184 [formerly 5874255a05]]
Former-commit-id: 650eaadb877692d07a1f2570ef156c89bb187e9d [formerly 2ea8bed91e]
Former-commit-id: 4fb7e68f4b
 2012-06-27 16:22:53 -05:00
Bryan Kowal
f21e18aaa1 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: 687c8e9968 [formerly 072c88b382] [formerly 4a17650914] [formerly 687c8e9968 [formerly 072c88b382] [formerly 4a17650914] [formerly 53e5b7c491 [formerly 4a17650914 [formerly 9597fdac96022c94dad425367de23eafedad06bc]]]]
Former-commit-id: 53e5b7c491
Former-commit-id: 84d7454642 [formerly 6d2ca51c52] [formerly cff125fdb6dd2f2050f98afac20ca59352640221 [formerly 62c7de6d3b]]
Former-commit-id: cb7d3ce5625e79bff6eb725517fbfb48c3c44620 [formerly 718062f386]
Former-commit-id: ee40decf54
 2012-06-27 15:04:34 -05:00
David Gillingham
e8a7f74a21 Issue #766: Merge VCModule refactor and Python globals memory leak fix to common baseline. 
Former-commit-id: 4a32c3b1f1 [formerly 768afb8423] [formerly 2a0ffc5311] [formerly 4a32c3b1f1 [formerly 768afb8423] [formerly 2a0ffc5311] [formerly 672d7a2c31 [formerly 2a0ffc5311 [formerly 48c3d7d8c7cec6c7366705c9318ce35a46bd8b3d]]]]
Former-commit-id: 672d7a2c31
Former-commit-id: 716ad16f90 [formerly ca54365f87] [formerly 75363efdd4a4ca39dfe3ce786fd71a0d72dd5a83 [formerly 235cf57de8]]
Former-commit-id: a4b8a9c76b51306e605da964edc10bd137926ce7 [formerly b2629a6f41]
Former-commit-id: 201e83898a
 2012-06-26 17:49:06 -05:00
Nate Jensen
b554fb3ba4 Merge "Issue #628 added PgenResourceGhost to track the gl ghost draw objects." into development 
Former-commit-id: d361775776 [formerly 4a389da950] [formerly cfc56f670a] [formerly d361775776 [formerly 4a389da950] [formerly cfc56f670a] [formerly ab86141e2f [formerly cfc56f670a [formerly 00dfc8449b6d12b0a3ed52c3f60cc016eaa13af3]]]]
Former-commit-id: ab86141e2f
Former-commit-id: 344e04b962 [formerly f90897dc5d] [formerly f6e9a24cf415a9e912b0a94cf737d57aaa5039cd [formerly 5ada671511]]
Former-commit-id: 0bdca8a98736e99702bb0e311c8e848f5aab65ee [formerly 3c7a10a698]
Former-commit-id: 06bb6ef640
 2012-06-26 13:21:49 -05:00
Ben Steffensmeier
b8aa7aade9 Issue #704 modify grid reprojection/interpolation code to be more thread safe and dynamic. 
Former-commit-id: 562f0c0dbe [formerly 0855e117cb] [formerly 682edec2cf] [formerly 562f0c0dbe [formerly 0855e117cb] [formerly 682edec2cf] [formerly 603d48a017 [formerly 682edec2cf [formerly 308f0e8c03ab4237830a91c96c500b6860c6fd36]]]]
Former-commit-id: 603d48a017
Former-commit-id: 5851764a0f [formerly 745b2cd722] [formerly 1cc4504c383651a63fdc712bd73f5f9ec0ce2e1a [formerly 7ea36122f2]]
Former-commit-id: c6923b397e04b921196c163c180052789fcb8e88 [formerly b2ce12e3a7]
Former-commit-id: 153a1d7c5e
 2012-06-25 15:22:35 -05:00
Ben Steffensmeier
6c0d2d393a Issue #704 fixes to plots/MPE to work better in KML 
Former-commit-id: 8111154819 [formerly 2b6e1fa5b6] [formerly 32627cf132] [formerly 8111154819 [formerly 2b6e1fa5b6] [formerly 32627cf132] [formerly b01be5085f [formerly 32627cf132 [formerly f1d440729b4e436e879219abaaaf7fa0e04d4ef6]]]]
Former-commit-id: b01be5085f
Former-commit-id: 91dce6f33f [formerly 8517eafdf4] [formerly 3073c0697a9f0f65fba46a4e3597e79d8029d881 [formerly 67ba3ee6f6]]
Former-commit-id: 927694363dcfe43bbcb23fc6b3f65cafca0928c4 [formerly 6a9c9a47e2]
Former-commit-id: 2c6b6269fd
 2012-06-22 17:54:31 -05:00
Brad Gonzales
72ecbdf701 Issue #628 added PgenResourceGhost to track the gl ghost draw objects. 
Former-commit-id: 8c008a7a2c [formerly b0c29466de] [formerly 3799026523] [formerly 8c008a7a2c [formerly b0c29466de] [formerly 3799026523] [formerly bef2bfa7cc [formerly 3799026523 [formerly 237309aab32cdb36703dbe62d2cfe102b3197863]]]]
Former-commit-id: bef2bfa7cc
Former-commit-id: f607efce25 [formerly be195ab805] [formerly b4f9d3dbf97343266eff5cc9488bbf4ee621cb1f [formerly 23ede5fa7b]]
Former-commit-id: eb6582678c91dbf7b3c2eec91e02dbee47158e20 [formerly 7f0f751018]
Former-commit-id: faa1ca2995
 2012-06-22 15:08:40 -05:00
Max Schenkelberg
073d6e0643 Issue #778 changed SPIResource to not dispose font when magnification changes but instead call setMagnification() 
Change-Id: Ibc8aa9b69643d67a1203a560f3adbc3d870db2bf

Former-commit-id: 8ae0f12232 [formerly 86e285c8e7] [formerly a8c958fcc8] [formerly 8ae0f12232 [formerly 86e285c8e7] [formerly a8c958fcc8] [formerly fce005b109 [formerly a8c958fcc8 [formerly 6ce5d188d0b27bf4cf07a8cd9b15fa9ad0bb16c2]]]]
Former-commit-id: fce005b109
Former-commit-id: 5a6656945c [formerly 896f128f19] [formerly d7508c2d43b40b5b042b467d93dc65192e1bec12 [formerly b4d28b22cd]]
Former-commit-id: e1d15319169c38999da9c77708df55ec2bee7c35 [formerly 911392f917]
Former-commit-id: 5ea6c7da61
 2012-06-21 16:07:23 -05:00
Max Schenkelberg
ac8314da2c 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: c1b95ef2c9 [formerly a691f425ea] [formerly d0b06374e9] [formerly c1b95ef2c9 [formerly a691f425ea] [formerly d0b06374e9] [formerly 130692aefd [formerly d0b06374e9 [formerly 75fb17528d393b767df8d8a34abd5e41f007b771]]]]
Former-commit-id: 130692aefd
Former-commit-id: 3caff8171f [formerly e8e159bed0] [formerly a277ad161643ccdccd8ce94496000eaa48028c29 [formerly 859e041e10]]
Former-commit-id: 45d916b2a8cce170d0a492d44295737178bab844 [formerly 34cb1fc585]
Former-commit-id: ecc5316b44
 2012-06-21 16:07:20 -05:00
Nate Jensen
5fc083084a Merge "Issue #704 fixes to random resources and optimization of radar projection transforms" into development 
Former-commit-id: ac131f24a7 [formerly 98fee4da65] [formerly 96c4d9301f] [formerly ac131f24a7 [formerly 98fee4da65] [formerly 96c4d9301f] [formerly 22d4de96fd [formerly 96c4d9301f [formerly 995d7e08ade1a3e10ac8ab51aa24f900091054de]]]]
Former-commit-id: 22d4de96fd
Former-commit-id: 1fce9da432 [formerly 00e6701ce9] [formerly 557b270d676bd6c4e359eed4f238f776eafeaf84 [formerly 71a1826611]]
Former-commit-id: 66faae95a99d648cebc2d3ff2a15be8392ffd9d5 [formerly e5b4a007e5]
Former-commit-id: 15690cd50d
 2012-06-21 10:04:51 -05:00
Steve Harris
8080ea523b 12.6.1-10 baseline 
Former-commit-id: a9742f306e [formerly edac4d827c] [formerly 8dc4a774e2] [formerly a9742f306e [formerly edac4d827c] [formerly 8dc4a774e2] [formerly 3cd0902b49 [formerly 8dc4a774e2 [formerly dd65e6d99709e0117519a1f2a2f02a41c8938d0e]]]]
Former-commit-id: 3cd0902b49
Former-commit-id: 7550311ef6 [formerly efe25edfad] [formerly 1a8021953ed3a77781e285be5837377b59afd5e3 [formerly eacd5aeb7f]]
Former-commit-id: 032c121c88e37cbeafabb63e30162517b2659626 [formerly df59dc7c44]
Former-commit-id: 56f8cf00a8
 2012-06-21 08:58:00 -05:00
Steve Harris
c7356570ae Revert "12.6.1-10 baseline" 
This reverts commit 8d09188a88 [formerly 95e7f4fc0c] [formerly 86d53e7788dde0abd1f819349208edb1cf7464ba [formerly aecc6a8474]] [formerly 530dfc0563 [formerly f8497470fc] [formerly c1748a5eb25e81f51401dbad2116292ba34e48b2 [formerly b33c5bdfcf]]] [formerly a2c0893d1a] [formerly 16fd236f2d [formerly 06f1c7b73c] [formerly ddde63eee0] [formerly 16fd236f2d [formerly 06f1c7b73c] [formerly ddde63eee0] [formerly a2c0893d1a [formerly ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]]].


Former-commit-id: 584f7eddf8 [formerly 62cf6a9f92] [formerly b4b1f6975f] [formerly 584f7eddf8 [formerly 62cf6a9f92] [formerly b4b1f6975f] [formerly 25198a5cd6 [formerly b4b1f6975f [formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]]]]
Former-commit-id: 25198a5cd6
Former-commit-id: 944e3148d4 [formerly 333fd9c64e] [formerly 52c1eb5688c898376b24c6add0a2d1a4c3ff2981 [formerly 8367fb50f5]]
Former-commit-id: 0bc0b7e1c450b6264ca8eb9457b80c79a047f13a [formerly 75f77df418]
Former-commit-id: e77a15c047
 2012-06-21 08:51:08 -05:00
Steve Harris
8d09188a88 12.6.1-10 baseline 
Former-commit-id: 16fd236f2d [formerly 06f1c7b73c] [formerly ddde63eee0] [formerly 16fd236f2d [formerly 06f1c7b73c] [formerly ddde63eee0] [formerly a2c0893d1a [formerly ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]]
Former-commit-id: a2c0893d1a
Former-commit-id: 530dfc0563 [formerly f8497470fc] [formerly c1748a5eb25e81f51401dbad2116292ba34e48b2 [formerly b33c5bdfcf]]
Former-commit-id: 86d53e7788dde0abd1f819349208edb1cf7464ba [formerly aecc6a8474]
Former-commit-id: 95e7f4fc0c
 2012-06-21 08:38:48 -05:00
Ben Steffensmeier
08b7873f92 Issue #704 fixes to random resources and optimization of radar projection transforms 
Former-commit-id: 27f0acb671 [formerly fd6a3d3b23] [formerly 601d46661c] [formerly 27f0acb671 [formerly fd6a3d3b23] [formerly 601d46661c] [formerly 16e4fe8ce2 [formerly 601d46661c [formerly 7619165ce45efe9dbad045adfaaf978acee782be]]]]
Former-commit-id: 16e4fe8ce2
Former-commit-id: ea1ea69133 [formerly 8111785587] [formerly a7266962af60ae418f0d7ea21b7003d4edfff1b4 [formerly cf35d99036]]
Former-commit-id: 7160645dc5efc9a8c36b33b0b3f7affd3c59242b [formerly 7e9eb91232]
Former-commit-id: e60add5122
 2012-06-20 18:07:17 -05:00
Nate Jensen
2108ceaf4f Merge "Issue #704 add INCOMPLETE PaintStatus to indicate a frame will require more painting later" into development 
Former-commit-id: c88aa39c6a [formerly c7de1d7896] [formerly 121d68b8c4] [formerly c88aa39c6a [formerly c7de1d7896] [formerly 121d68b8c4] [formerly 133cd9994e [formerly 121d68b8c4 [formerly 5e8d1cbc132dbd69b86342234631f3d11e3bdb3d]]]]
Former-commit-id: 133cd9994e
Former-commit-id: 0128834e48 [formerly 8c38ed612e] [formerly 325af1ac37d20525782a8e5606173c7a1f9790c2 [formerly f4db55cd46]]
Former-commit-id: 7b1b1b53328c693dcd6a64c79230b14251fbb2f9 [formerly 082fbf8f1a]
Former-commit-id: 9e69498620
 2012-06-20 17:56:50 -05:00
Max Schenkelberg
766144ed59 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: 509c5946d1 [formerly 81b6158c40] [formerly ab871d218b] [formerly 509c5946d1 [formerly 81b6158c40] [formerly ab871d218b] [formerly 61e0ea0516 [formerly ab871d218b [formerly c0d7f68bed2b141240d2e2a695c8439f7a4ffa67]]]]
Former-commit-id: 61e0ea0516
Former-commit-id: ffb4dc36e6 [formerly 460a1179af] [formerly 5a67be7c23dd5999c23928f27069f071fec4abbc [formerly 66a60a7b7b]]
Former-commit-id: fc99eff9cc2bcf562a0c5e7c523cabeb0d860993 [formerly 77aef2db41]
Former-commit-id: 379ca48057
 2012-06-20 15:32:27 -05:00
Ben Steffensmeier
b55bf099f1 Issue #704 add INCOMPLETE PaintStatus to indicate a frame will require more painting later 
Former-commit-id: 7bd0cce0a1 [formerly c2191c83dc] [formerly d317777ee6] [formerly 7bd0cce0a1 [formerly c2191c83dc] [formerly d317777ee6] [formerly 0c69731e18 [formerly d317777ee6 [formerly 65e7e8b2c891d1938f0b98c3c8737f18517fe27f]]]]
Former-commit-id: 0c69731e18
Former-commit-id: acbf7fd3b5 [formerly 8b107023d1] [formerly c5371f37fe36db2e2f33d1cc3ac56441d034b0d1 [formerly b55a4f026c]]
Former-commit-id: 5dc0b8c70d6e5a44a1db2255eb73085b81017657 [formerly 63b55f454f]
Former-commit-id: 19ce6f7e77
 2012-06-20 14:13:37 -05:00
Bryan Kowal
6706056477 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: a6814ec7fb [formerly fa84e5df3e] [formerly 207bbd3087] [formerly a6814ec7fb [formerly fa84e5df3e] [formerly 207bbd3087] [formerly 25addabe64 [formerly 207bbd3087 [formerly 048ea55e064e0581cf32ca286c67f611ee4e0c3b]]]]
Former-commit-id: 25addabe64
Former-commit-id: f064abd37a [formerly 21a02e1510] [formerly 17ed68aef27593eee306fe2fb3bb631e5e2624fc [formerly 94e4af6d47]]
Former-commit-id: 26b9b80270ee9967c245bdeb19a771d7cfaad8d6 [formerly 85507d67dd]
Former-commit-id: b69b1e9509
 2012-06-19 15:03:57 -05:00
Bryan Kowal
fff0ad3727 Issue #762 - Remove all plugins specific to the 11-Collaboration Work Assignment. 
Former-commit-id: 4d7c909f5d [formerly ec395ae134] [formerly 96f987631c] [formerly 4d7c909f5d [formerly ec395ae134] [formerly 96f987631c] [formerly 966c50ed06 [formerly 96f987631c [formerly 74c2228d9b0c924b83d99e92fb5da733ec6e8d28]]]]
Former-commit-id: 966c50ed06
Former-commit-id: 7ff1e3ec1e [formerly 07b8c70b1b] [formerly 9e66bcbf05fd841edc4760a6ff074c97a234fd5c [formerly ff0c86f857]]
Former-commit-id: 9eddd502462b27d3fe6c7131e4428d9987e86831 [formerly 6d4946e753]
Former-commit-id: 89ab662ecf
 2012-06-18 11:51:47 -05:00
Bryan Kowal
14f81556c3 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: 9e7907ecd7 [formerly 9361f3eb94] [formerly f528e10391] [formerly 9e7907ecd7 [formerly 9361f3eb94] [formerly f528e10391] [formerly f0e3b957e3 [formerly f528e10391 [formerly 9e117e495d669e310839bc9ff8e1e8207b03491b]]]]
Former-commit-id: f0e3b957e3
Former-commit-id: ac72941bf0 [formerly 21e8618852] [formerly a8e6aa8338ee37d89f37110fad7307c33a5ad620 [formerly 1ee59eac71]]
Former-commit-id: 48ce0712d4d33976ae0cc1184df65a9ee61a5ba8 [formerly cbc8964e5b]
Former-commit-id: a6d1f97dec
 2012-06-18 11:16:28 -05:00
Ben Steffensmeier
f80cab90bf Issue #704 rewrite shared meshes and tilesets to be more efficient and less deprecated. 
Change-Id: I9f6ebba1bd75682b56a1e8de5a8d0b8974153f97

Former-commit-id: d0354ad4e4 [formerly 2da8a0df2f] [formerly aad1eb18b0] [formerly d0354ad4e4 [formerly 2da8a0df2f] [formerly aad1eb18b0] [formerly 9068e049cb [formerly aad1eb18b0 [formerly 901f061f9e19f39cf5096a394cbd238c5562d733]]]]
Former-commit-id: 9068e049cb
Former-commit-id: e1139e8bcc [formerly bded5dde2b] [formerly b1a38642bb839232d00e6dd72ecd1785344a38a9 [formerly dd496b3d90]]
Former-commit-id: 7d72e749d750c93e98bf6d01ef30660c39424b1b [formerly 541f1b74f3]
Former-commit-id: 1a3e1ba291
 2012-06-14 16:44:19 -05:00
Ben Steffensmeier
533fc946f9 Issue #704 various core changes to make things work smoothly in kml 
Change-Id: I048f9dfdb411a95765410f48fddb54aa8eefbd16

Former-commit-id: 93fe267859 [formerly 2c27ec20b5] [formerly d187436589] [formerly 93fe267859 [formerly 2c27ec20b5] [formerly d187436589] [formerly 58356c49cb [formerly d187436589 [formerly faec1cb4e4e0ef6444da31971b937ad3ee79160a]]]]
Former-commit-id: 58356c49cb
Former-commit-id: a77d4b3564 [formerly 352648586a] [formerly 17d4d41f9a31f859cf44b9807748609d104b685d [formerly e604271c54]]
Former-commit-id: cd083b91aacf58b0d502f10fe82a3966ba4342cb [formerly 3e4b09847b]
Former-commit-id: 117c77bfe0
 2012-06-14 16:41:05 -05:00
Max Schenkelberg
e0afa21cd5 Issue #697 fixed join issues with GFE 
Change-Id: Idaaa9782865cd2299ba9fc8e18305df215f1d012

Former-commit-id: 7bf6b0bac0 [formerly 6b9d13211d] [formerly dac8374f52] [formerly 7bf6b0bac0 [formerly 6b9d13211d] [formerly dac8374f52] [formerly 576dbcf340 [formerly dac8374f52 [formerly e648206c2e8129b2d63b9309f67e1ce46a1edbf0]]]]
Former-commit-id: 576dbcf340
Former-commit-id: c6ff2d0c5e [formerly 86f4c94dc3] [formerly d8716c8f4c7b38d2bdbb1ad7ed4dcf4965bc6c61 [formerly 475623fe22]]
Former-commit-id: 540791039ae6f38e1fe37b9723b81caec412cdb6 [formerly 8a0626ec3f]
Former-commit-id: d915360713
 2012-06-14 14:18:02 -05:00
Bryan Kowal
3d94c3e332 Issue #708 - build and developer deployment changes required for transitioning to the AWIPS II Common Baseline Repository. 
Former-commit-id: 175cbf318d [formerly 5e80c45a03] [formerly dcc5675564] [formerly 175cbf318d [formerly 5e80c45a03] [formerly dcc5675564] [formerly c0aaac4a07 [formerly dcc5675564 [formerly 3fb013680e1c49b1e0921ad57d59104c5ec2cbfc]]]]
Former-commit-id: c0aaac4a07
Former-commit-id: 81fa46c01a [formerly a9c2cf4fae] [formerly 1adfac8f38f065227cc081b4143843fe19b3f856 [formerly c608fc959c]]
Former-commit-id: cd07c27f5f551d77046fbda54bdadaa0fe56e393 [formerly 720a152a45]
Former-commit-id: eca1d3d525
 2012-06-14 11:35:15 -05:00
Nate Jensen
3cec25f904 Issue #716 better tooltip 
Change-Id: I9db709540cb6ac25893756139b3269adf9d4551b

Former-commit-id: 9ecfadaf08 [formerly 00a23080d1] [formerly 6ecd868ddd] [formerly 9ecfadaf08 [formerly 00a23080d1] [formerly 6ecd868ddd] [formerly 475a9a76b5 [formerly 6ecd868ddd [formerly 4181cc97d769bfead6f5425ec4740ab90c8b57a5]]]]
Former-commit-id: 475a9a76b5
Former-commit-id: 5e307e8098 [formerly 432e384d48] [formerly 7f803973703943102ad3a3cb9638c47e5db55064 [formerly 161159172e]]
Former-commit-id: 8678427eca1d0c20ea0430afd74980fc65c52070 [formerly eadb96f7a6]
Former-commit-id: e3596980f5
 2012-06-14 11:20:16 -05:00
Max Schenkelberg
d3d126e7c3 Issue #697 added drawing indicator for shared display for data provider, fixed shutdown issue 
Change-Id: Iccfb92e3155e8be5c780e601fb8c31ef2c74f39f

Former-commit-id: e2ebf6d85e [formerly 4f391588ab] [formerly e92eb6366e] [formerly e2ebf6d85e [formerly 4f391588ab] [formerly e92eb6366e] [formerly 4c8b468854 [formerly e92eb6366e [formerly c00c45f5ba1ae3bb0a0a246d1435bd10b3a8aa51]]]]
Former-commit-id: 4c8b468854
Former-commit-id: 1cb7111c43 [formerly 01a075077f] [formerly 616a42f1ff97e99d9ace0ef92f663db0476f8010 [formerly c2d278d75b]]
Former-commit-id: c10f734687a27bfd52eb2e1a230f8d603ac8152b [formerly 35e332f89a]
Former-commit-id: a7a7819910
 2012-06-14 11:16:11 -05:00
Max Schenkelberg
e773643f7a Issue #697 added support for multiple editors 
Change-Id: Ic3ac12bb9368f0ec54dd8151ba1876002ff44e82

Former-commit-id: 816500d7c4 [formerly 51c2a41e68] [formerly dd99479eeb] [formerly 816500d7c4 [formerly 51c2a41e68] [formerly dd99479eeb] [formerly fceef3c5a1 [formerly dd99479eeb [formerly 3afc7b49cb42c005a0e9cf5221e35fc3ab78007a]]]]
Former-commit-id: fceef3c5a1
Former-commit-id: ea948bbb82 [formerly f0d2893e97] [formerly f94add25d0e7e6bf562b43f3ede6e45e7d953f95 [formerly e5e1a4de6a]]
Former-commit-id: 0763957c65637dd50362099f2ea1a0663adf6a1a [formerly f2e34fe03c]
Former-commit-id: 7bac48f643
 2012-06-13 17:52:11 -05:00
Matt Nash
8d4c56a8fe Issue #711 add roles and site capability 
Former-commit-id: e6d34de494 [formerly 48bf29974c] [formerly a9d225066a] [formerly e6d34de494 [formerly 48bf29974c] [formerly a9d225066a] [formerly 032827aa1b [formerly a9d225066a [formerly a49eee36dac39f172d7c4fa723a297d7cf94d5db]]]]
Former-commit-id: 032827aa1b
Former-commit-id: cd82be177f [formerly 4cd558c1ca] [formerly 088352035d7c18e15170c346ce036e12429d923d [formerly 13a1fa879e]]
Former-commit-id: 2517511e613bba992f8b86185817595698a5b0bb [formerly 34f57345ac]
Former-commit-id: 4e1074e262
 2012-06-13 12:58:11 -05:00
Matt Nash
3309b5109e Issue #659 fix floating view issue when minimize happened 
Former-commit-id: 7dc3044f26 [formerly 3689ed489e] [formerly 96bf8b356a] [formerly 7dc3044f26 [formerly 3689ed489e] [formerly 96bf8b356a] [formerly b65a0f124e [formerly 96bf8b356a [formerly 82f0b55ac176aad663d7febe94c64d2982bcc45c]]]]
Former-commit-id: b65a0f124e
Former-commit-id: 455ac1faf9 [formerly 9e81392638] [formerly d25734d06b93a1a330c627b9c997a28dbfb4665a [formerly 3bd1a43af2]]
Former-commit-id: 87796f659980b8c75e5089847bd5b3ce9c36af1d [formerly 8eac89d337]
Former-commit-id: 576e5c5310
 2012-06-13 10:04:12 -05:00
Nate Jensen
5bd5e7e8ab Issue #716 fix lots of minor issues, fix merge problem 
Change-Id: I5a43ad089766b5f2a9a3ea6901d8f6761983b575

Former-commit-id: 653dca2e66 [formerly eedc68c32c] [formerly 619d3062c2] [formerly 653dca2e66 [formerly eedc68c32c] [formerly 619d3062c2] [formerly 47e8561dd0 [formerly 619d3062c2 [formerly ae131c0d05148e58ba445e5f144aa21c8c5c12c3]]]]
Former-commit-id: 47e8561dd0
Former-commit-id: f6e823019d [formerly 3b8b89fc84] [formerly 2308c40a943076535f277701e53e28c076040f00 [formerly 2cf220ff0c]]
Former-commit-id: 60141babfba9cd1cc99bd9241af68ac6ae22cb36 [formerly 1a8935e86d]
Former-commit-id: da2ab4d95b
 2012-06-13 09:39:19 -05:00
Steve Harris
a45d1b99e1 Removed duplicate method created by merge 
Former-commit-id: 787b82079e [formerly 282682ccc1] [formerly 5f66b0995a] [formerly 787b82079e [formerly 282682ccc1] [formerly 5f66b0995a] [formerly 308737bff8 [formerly 5f66b0995a [formerly 90fc678948690cc74488e6e1fd18cf8c72c5c0c9]]]]
Former-commit-id: 308737bff8
Former-commit-id: 1dfba0c41c [formerly 383f9d2d56] [formerly 193d13e25a301eced23e253c03817720893c41dc [formerly 55b4d7c5da]]
Former-commit-id: 17fcfe21c5a7a6a71cb9d46ffde283702dcb2baf [formerly 0de9e03c5a]
Former-commit-id: b3c2646e5e
 2012-06-13 08:41:24 -05:00
Steve Harris
ec9204fa94 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: 03383359f3 [formerly af6c0529ad] [formerly 2f20a86a30] [formerly 03383359f3 [formerly af6c0529ad] [formerly 2f20a86a30] [formerly 48860df690 [formerly 2f20a86a30 [formerly 9e83341a16b6e68f9bfe579dff60271553c3db82]]]]
Former-commit-id: 48860df690
Former-commit-id: 6c0d8be39e [formerly d7a4853091] [formerly 2439ad1c1bff354f69594e31d7a2a27f4fc21bc4 [formerly 27b50c57bd]]
Former-commit-id: e4fb4019cc599080c632d3e4becfebc21fb21929 [formerly 2838ca117f]
Former-commit-id: 70a928d039
 2012-06-12 14:37:12 -05:00
Nate Jensen
4562192f22 Issue #716 removing unnecessary file 
Change-Id: I439f95ab54eb6fa3765438dcb77a94445dc2ebba

Former-commit-id: c33b8ac729 [formerly 4b54691479] [formerly 07d44ae528] [formerly c33b8ac729 [formerly 4b54691479] [formerly 07d44ae528] [formerly cd14177a84 [formerly 07d44ae528 [formerly 5ade0f2437308ab21429432746cf4e71afc33c93]]]]
Former-commit-id: cd14177a84
Former-commit-id: 0ea1d3d522 [formerly 37342dd500] [formerly 55fa3a0d6686e52246676ff642dd31616024215b [formerly 090bb2918b]]
Former-commit-id: ed74a356bf1ee9bbd35c69fc624517a8e3a2dbaf [formerly 38fcee07e8]
Former-commit-id: ed987231b5
 2012-06-11 17:34:21 -05:00
Nate Jensen
b9936a5352 Issue #716 fix disabled toolbar 
Change-Id: I464d0560cf7462b37d324db368411f3867e53602

Former-commit-id: 9df6b2b051 [formerly c3c4a8519a] [formerly d2bb1b6e0c] [formerly 9df6b2b051 [formerly c3c4a8519a] [formerly d2bb1b6e0c] [formerly 0c869f599e [formerly d2bb1b6e0c [formerly d32771cbbe72a32965c50aacd7ede3383a5fff23]]]]
Former-commit-id: 0c869f599e
Former-commit-id: df09de658a [formerly 38a3e93585] [formerly 4c1efdb14c6c9055c3df149ffd219afabd6b73a7 [formerly ea33fc82fe]]
Former-commit-id: 71537803326c931bf18fe6de065205a643fe013a [formerly 91b7225c2f]
Former-commit-id: ab30be436b
 2012-06-11 17:33:48 -05:00
Steve Harris
883d66bc46 12.6.1-5 baseline 
Former-commit-id: 1ad64ffa98 [formerly 09f73b0601] [formerly c99afab05f] [formerly 1ad64ffa98 [formerly 09f73b0601] [formerly c99afab05f] [formerly 8947efbc7f [formerly c99afab05f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]]]]
Former-commit-id: 8947efbc7f
Former-commit-id: d5c94ccef2 [formerly b69fa75919] [formerly 1cc870696aedf27ab003448e1146bd540b248a33 [formerly a945ed8e6d]]
Former-commit-id: fc6eb550115880692c0f2fd68727ccec55d0eef7 [formerly 91e65230ad]
Former-commit-id: 3b468d9f50
 2012-06-11 16:23:47 -05:00
Steve Harris
581546a5eb 12.6.1-3 baseline 
Former-commit-id: bc96eba820 [formerly 7c5306b795] [formerly 42f3513175] [formerly bc96eba820 [formerly 7c5306b795] [formerly 42f3513175] [formerly d57eb02b9e [formerly 42f3513175 [formerly 2f4e12140a9b026770563eee58577b8aa2c041e1]]]]
Former-commit-id: d57eb02b9e
Former-commit-id: 471fa3ac04 [formerly 32c0464d79] [formerly 3b70f39d074d5d11b45290eba7eec94d80be38de [formerly 1fdc0aa237]]
Former-commit-id: 47799c2c228b75794e62bf6b17a80d2d42cdf2cc [formerly ca8baf18a3]
Former-commit-id: 518fa79f7f
 2012-06-11 16:23:47 -05:00
Steve Harris
61e2068af7 12.5.1-15 baseline 
Former-commit-id: 244755b393 [formerly 0ca936807e] [formerly d5c238de07] [formerly 244755b393 [formerly 0ca936807e] [formerly d5c238de07] [formerly cee20d8656 [formerly d5c238de07 [formerly 1c128372ef9f478f1b807e8d0f23207d095bfc65]]]]
Former-commit-id: cee20d8656
Former-commit-id: cd017cbb21 [formerly 31d7649939] [formerly 71d57ecda7503a310fc8294587521ac3d45da531 [formerly 7da9afe36a]]
Former-commit-id: 6cb525b2e1f0b266e8a8aef21ae0d0c57440c151 [formerly ad91dc8a2e]
Former-commit-id: ca0f3f5814
 2012-06-11 16:02:30 -05:00
Matt Nash
f24e018c7e issue #693 always allow to invite users after opening create session dialog 
Former-commit-id: be806cfe61 [formerly 179f2d7ffe] [formerly 9f2d97fa68] [formerly be806cfe61 [formerly 179f2d7ffe] [formerly 9f2d97fa68] [formerly b78d86bf04 [formerly 9f2d97fa68 [formerly 204c35530bbe8c7e39749d70331ceb93c4d4a790]]]]
Former-commit-id: b78d86bf04
Former-commit-id: f632b29005 [formerly 4b5af450d1] [formerly 573ee429242ddd058ed5a3d6a8f2cfdb13e96669 [formerly 03ee9d8a90]]
Former-commit-id: e86d83eaf529b848bcf2ae0610014f8f775227c6 [formerly 3e54a2fd18]
Former-commit-id: c13ca2f81b
 2012-06-11 15:34:49 -05:00
Steve Harris
b54ad5af66 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: 975053c3dc [formerly c7024992a3] [formerly 37793c86b1] [formerly 975053c3dc [formerly c7024992a3] [formerly 37793c86b1] [formerly d325d496f5 [formerly 37793c86b1 [formerly a435e6464a78345b5036e3060430375dc53e4faf]]]]
Former-commit-id: d325d496f5
Former-commit-id: 5e0e2d2c48 [formerly 23c34c469a] [formerly 788e16ce64aaeca91000aa565d43e89a27246362 [formerly cf3c768213]]
Former-commit-id: bbdcec83196c1a64fd2e31c1e9abdcf46698ab0b [formerly 3dd5b84aa2]
Former-commit-id: c01b096242
 2012-06-11 15:24:03 -05:00
Matt Nash
82bc8ed96f Issue #693 add nws_collaborate view, and ability for default on startup or not 
Former-commit-id: f3203fa469 [formerly c3b17038f9] [formerly 73da2b1fe8] [formerly f3203fa469 [formerly c3b17038f9] [formerly 73da2b1fe8] [formerly 022e982aae [formerly 73da2b1fe8 [formerly b50cfeb8633e2b9a0d2fc7bb848bbcf7d0404321]]]]
Former-commit-id: 022e982aae
Former-commit-id: c2612e2dde [formerly 945b47e29e] [formerly 861d32c390a280d83c199cb720b2c6374e7bc9b5 [formerly d5e3c97d98]]
Former-commit-id: 0a56ab9472026604b58882f46ecf932176dc4bee [formerly 3a82f9690b]
Former-commit-id: 3f528cbd85
 2012-06-11 10:24:35 -05:00
Matt Nash
bc77d1a297 Issue #703 can change font size in sessions 
Former-commit-id: 5ebc7109a7 [formerly 73ad806eb2] [formerly 9d187cc362] [formerly 5ebc7109a7 [formerly 73ad806eb2] [formerly 9d187cc362] [formerly 4b72bb3d8e [formerly 9d187cc362 [formerly 0e7af586cd96a21540263474f321bd224c45ad54]]]]
Former-commit-id: 4b72bb3d8e
Former-commit-id: aa8e09eece [formerly 11f07ec579] [formerly c2017b77c052809d1df4e0528806f872af4bbb29 [formerly 4453a06f31]]
Former-commit-id: 6afda7f78a4d01d12792cd817aa4e48730a4c6d6 [formerly 822bd01fd9]
Former-commit-id: 254b673be7
 2012-06-11 10:23:45 -05:00