Richard Peter
0c4ae068ad
Merge branch 'omaha_14.1.1' (14.1.1-11) into development
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/smartinit/IFPWE.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs
Change-Id: Iaf9f42e7ee93949d34c70916fd91acf8c838c83a
Former-commit-id: b09f1559254f06a82afa91f0cc14c8150f88ce64
2013-12-05 12:12:27 -06:00
Steve Harris
b24d9c80b0
14.1.1-12 baseline
...
Former-commit-id: 3b3b8ffbdadc65f41b67f2d649ec18e19521c989
2013-12-04 16:47:59 -05:00
Richard Peter
79bdd34f4f
Merge branch 'omaha_14.1.1' (14.1.1-8) into development_on_RHEL6
...
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DatabaseArchiver.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DefaultPluginArchiveFileNameFormatter.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IDataArchiver.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiveFileNameFormatter.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiver.java
nativeLib/rary.meteorological/src/solax.f
Change-Id: I188bbccdb3c6f4036577aa90074a990e2832b822
Former-commit-id: f7f30006cdaf3c8e99d166463c226b504f458b83
2013-11-14 14:40:23 -06:00
Steve Harris
aa6c977e7b
14.1.1-8 baseline
...
Former-commit-id: 41e87fe87d5074f138649c5ca8053e658488fbd0
2013-11-13 12:32:17 -05:00
Ben Steffensmeier
ff5f08d23a
Issue #2491 Clean a few more procedure only objects from ISerializableObject files.
...
Former-commit-id: 047e4cd82846adaf8fc3dcdfe087209bd57e210c
2013-11-04 13:01:49 -06:00
Nate Jensen
477c64c8bd
Issue #2361 remove dependencies on mesowest and delete dead grichardson code
...
Former-commit-id: a91a4fe2261050daee83b1edaa7d01404b7b89a0
2013-10-23 14:52:29 -05:00
Lee Venable
0bacce33bc
Issue #2443 - fixed image memory leak.
...
Former-commit-id: fccb24f5834dd746f6868b4390e3c17dd12dc729
2013-10-08 09:39:00 -05:00
Lee Venable
9c97908f36
Issue #2436 - disposed of the sort color
...
Former-commit-id: 4545de35a0fdbfc5817a8725bf07ae0c405efb39
2013-10-07 09:11:25 -05:00
Max Schenkelberg
17b38d9f72
Issue #2277 Remove more ScriptCreator references
...
Change-Id: I8524faa9914c81afb7ace709b857bca2ef7ff747
Former-commit-id: 0d898da3aebc056c372c7785538b0b27e3e986ef
2013-09-11 16:32:00 -05:00
David Gillingham
0b6b0e06cc
Issue #2262 : Port hgt2pres, ztopsa, ptozsa, calcrh from meteolib into
...
Java. Convert to use of these new methods where possible. Create unit tests.
Change-Id: Ib21dc7e92eb7324dba79d128d785ced58aaeae2d
Former-commit-id: 5992197809236553e9c021526e42d28ed327b413
2013-08-15 11:30:45 -05:00
Nate Jensen
22438766b4
Issue #2142 removing some viz dependencies on edex.common
...
Change-Id: I11e42f76c4b58292535af03ddf25023fbdeb734c
Former-commit-id: 399d44a62df1c54e94d93d4e0b198db976104143
2013-07-22 12:20:43 -05:00
Max Schenkelberg
63421a4819
Issue #2142 Got log4j out of edex.
...
Amend: Removed deleted files from build.properties
Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa
Former-commit-id: f47d21972b86d8c2c757874c5e450f93e5704133
2013-07-15 14:26:15 -05:00
Steve Harris
0be473728a
13.3.1-12 baseline
...
Former-commit-id: 1f109861760e5fbc9d7a13cc4f518341cbc31276
2013-03-25 13:27:13 -05:00
Steve Harris
305dd72969
Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
...
Former-commit-id: 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c
2013-03-05 12:27:49 -06:00
Steve Harris
a89221c75b
13.3.1-5 baseline
...
Former-commit-id: 97fafc60d9327ab3ea3f72266113c8f5e122a275
2013-03-05 10:47:06 -06:00
Steve Harris
a0573644c4
Merge branch 'development' into omaha_13.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java
Former-commit-id: e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c
2013-02-21 15:41:39 -06:00
Steve Harris
71e8990021
13.3.1-1 baseline
...
Former-commit-id: 34684c71436ce4c395ea523eb34ded6792476816
2013-02-20 16:19:40 -06:00
Roger Ferrel
130fa3f73d
Issue #1578 Slav's fix for disposed cursors in MonitoringAreaConfigDlg.
...
Change-Id: Ia57cfe88e22544260bbc03483b4c852843f67b42
Former-commit-id: 64c6e3b9812dc7232bd36feff181805c4fd504d9
2013-02-07 12:46:01 -06:00
Steve Harris
83e9157df7
13.2.1-2 baseline
...
Former-commit-id: bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf
2013-01-23 11:18:44 -05:00
Steve Harris
c0c1d56f3a
13.1.2-2 baseline
...
Former-commit-id: 221d0aaf0e19a054387134e72a76a278159bf4d0
2013-01-06 14:32:24 -06:00
Slav Korolev
48f074eb72
Issue #1351 . Changes for non-blocking dialog MonitorDisplayThreshDlg. Changes according to comments. Deleted unused file.
...
Change-Id: I62f1d4ad30ca4ed120c0ca94abf140a1e0b90ce6
Former-commit-id: c063c2bdb4d4cc7c59917e9882fe78cabb63c06d
2012-12-07 15:18:03 -05:00
Slav Korolev
a284f0f50f
Issue #1351 . Changes for non-blocking FogMonThreshSetupDlg. Changes according to comments.
...
Change-Id: I605f6819def85f197e37e13803627baec67e6786
Former-commit-id: 64fffb1598b943dc9890d2b9ee04a690c006bfe7
2012-12-07 12:23:39 -05:00
Slav Korolev
5e4bbc03a4
Issue #1351 . Changes for non-blocking MonitoringAreaConfigDlg according to reviewer's comments. Changes for History Tables.
...
Change-Id: Ic68f4afd44a3039707cb80ee71a935aa2f00a6a2
Former-commit-id: 82dc81aa3cbdfcfcd0b3f5f6566bfce0b6fddd22
2012-12-06 12:42:06 -05:00
Slav Korolev
d220f74018
Issue #1297 . Changed non-blocking ZoneTableDlg. Next patch.
...
Changes from reviewers comments.
Change-Id: Ie812ef1167fa6b1ea78ee615190bd3059285a682
Former-commit-id: 8f002a71cb688fe8fbf7378ef53398dfecb0354e
2012-11-16 11:08:42 -05:00
Dustin Johnson
064ef82d1e
Issue #1302 Address peer review comments for 5-Data_Delivery/development merge
...
Amend:
More peer review comments
Restore PreferencesHandler
Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7
Former-commit-id: c04f7dca6f980ab7f3d77825312ddc34ba3b188d
2012-11-08 09:57:16 -06:00
Steve Harris
e4bd20a515
12.12.1-1 baseline
...
Former-commit-id: 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535
2012-11-07 12:41:20 -06:00
Slav Korolev
52601577db
Issue #1280 . Changes for non-blocking TrendPlotDlg. Fixed format.
...
Change-Id: I26af77a545c1ecd76dc6a15111e73d580992d77d
Former-commit-id: d97fb49f2574dc320366475e02a5784be33bbaaf
2012-10-24 09:24:02 -04:00
Steve Harris
61f269f54c
12.9.1-5 baseline
...
Former-commit-id: d85b989f77196d20eb2d2a21cf4daa13d50474ae
2012-08-21 15:27:03 -05:00
root
cb46f57879
Merge 12.9.1-4 into development_on_ss_builds
...
Former-commit-id: a178af491f4b4cd75ed1517f023354bab0b9c8c8
2012-08-15 22:15:20 +00:00
Steve Harris
31ae7ea218
12.9.1-1 baseline
...
Former-commit-id: 6601ddb09c2928754c2c3859dac284998d73ff81
2012-08-15 13:59:00 -05:00
Nate Jensen
a65e9608fd
Issue #882 improved use of SimulatedTime
...
Change-Id: I624427fe42f0d74bc62900216596e724857830fc
Former-commit-id: 0deb4ff6eb3dc1aa794916b84a6530b5d77a8b25
2012-07-31 08:57:54 -05:00
Steve Harris
2c0ff851ca
12.6.1-9 baseline
...
Former-commit-id: 8f93efb93ec2d244fe599c16b3af5b33784c0232
2012-07-10 07:53:49 -05:00
Bryan Kowal
a33740e915
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
Steve Harris
8dc4a774e2
12.6.1-10 baseline
...
Former-commit-id: dd65e6d99709e0117519a1f2a2f02a41c8938d0e
2012-06-21 08:58:00 -05:00
Steve Harris
b4b1f6975f
Revert "12.6.1-10 baseline"
...
This reverts commit ddde63eee0
2012-06-21 08:51:08 -05:00
Steve Harris
ddde63eee0
12.6.1-10 baseline
...
Former-commit-id: 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1
2012-06-21 08:38:48 -05:00
Steve Harris
c99afab05f
12.6.1-5 baseline
...
Former-commit-id: 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb
2012-06-11 16:23:47 -05:00
Steve Harris
42f3513175
12.6.1-3 baseline
...
Former-commit-id: 2f4e12140a9b026770563eee58577b8aa2c041e1
2012-06-11 16:23:47 -05:00
Steve Harris
37793c86b1
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
Steve Harris
b13cbb7e00
12.5.1-15 baseline
...
Former-commit-id: 4909e0dd166e43c22a34d96aa744f51db8a7d6c0
2012-06-08 13:39:48 -05:00
Steve Harris
8f3c9ebfb7
12.5.1-9 baseline
...
Former-commit-id: 25a4d3ed99c4be73a118b92c230c6365b65b56eb
2012-05-21 17:48:55 -05:00
Steve Harris
24474489f9
12.5.1-6 baseline
...
Former-commit-id: a75af2f0de38d65dcbbd919e159c3b0a268fc245
2012-05-16 16:41:22 -05:00
Steve Harris
092efd6072
Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge
...
Conflicts:
ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
All of these were 'self-resolved' when kdiff3 invoked
Former-commit-id: f98354aae305ad227eaf3b36e4393b8aefc80f02
2012-05-09 13:19:47 -05:00
Dave Hladky
1b7473572f
Issue #15 Re-wrote SimDate integration for menus, alert observers after
...
merge headache.
Former-commit-id: 647b7ac154dbdaf945231b231f491bbca86d2a24
2012-04-30 13:43:34 -05:00
Steve Harris
67a5a68300
12.4.1-4 baseline
...
Former-commit-id: ad648deaf4d3edaabdda15184289b3a927308bd7
2012-04-18 15:18:16 -05:00
Richard Peter
709be7733b
Merge "Issue #449 . Fixed problem with simulated time for trend plots in FSS monitors." into 9-Wes2Bridge
...
Former-commit-id: 2a3492987c4cd9751aad2c6e20230f983e68f4b5
2012-04-17 13:16:22 -05:00
Slav Korolev
8d29726365
Issue #449 . Fixed problem with simulated time for trend plots in FSS
...
monitors.
Former-commit-id: 79b81f2a734142d212d7bc0ad3686c7b64f433c5
2012-04-09 14:50:19 -04:00
Steve Harris
4068f5295f
12.3.1-10 baseline
...
Former-commit-id: 7d62bca046401a670ef7bd917cbcbb073e061b60
2012-03-30 08:38:33 -05:00
Matt Nash
66be3bec40
Moving 12.1.1 into ss_sync
...
Former-commit-id: 2a9569942c48542cf708b6c0b9189146fd954c11
2012-01-19 11:53:12 -06:00
root
9f19e3f712
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f
2012-01-06 08:55:05 -06:00
