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

45 commits

Author SHA1 Message Date
Ben Steffensmeier
dd2bb59742 Issue #2491 Clean a few more procedure only objects from ISerializableObject files. 
Former-commit-id: c91c0d3f1a [formerly d386c6bc76] [formerly ff5f08d23a] [formerly 5a928e6ad5 [formerly ff5f08d23a [formerly 047e4cd82846adaf8fc3dcdfe087209bd57e210c]]]
Former-commit-id: 5a928e6ad5
Former-commit-id: c694721b6dae8a56fdf9390a3bc7d8934e8b3711 [formerly 08e73de883]
Former-commit-id: d38879158d
 2013-11-04 13:01:49 -06:00
Nate Jensen
d2af0d52a6 Issue #2361 remove dependencies on mesowest and delete dead grichardson code 
Former-commit-id: bd9578dd6d [formerly 65d7d4dac9] [formerly 477c64c8bd] [formerly 2f79b34a77 [formerly 477c64c8bd [formerly a91a4fe2261050daee83b1edaa7d01404b7b89a0]]]
Former-commit-id: 2f79b34a77
Former-commit-id: a01d69eb125667dc0511591658732e612649a73e [formerly 1adac8829f]
Former-commit-id: 2419a99ac7
 2013-10-23 14:52:29 -05:00
Lee Venable
fc98572a27 Issue #2443 - fixed image memory leak. 
Former-commit-id: 7dae2b36cf [formerly 1021c25d9d] [formerly 0bacce33bc] [formerly 47f8200757 [formerly 0bacce33bc [formerly fccb24f5834dd746f6868b4390e3c17dd12dc729]]]
Former-commit-id: 47f8200757
Former-commit-id: 43dc0958942086502dfa768b01124fa7746d0abb [formerly cd63ee8644]
Former-commit-id: 03c4e9a287
 2013-10-08 09:39:00 -05:00
Lee Venable
ccbc44f9d3 Issue #2436 - disposed of the sort color 
Former-commit-id: f27781b74e [formerly 8c8adf8be6] [formerly 9c97908f36] [formerly c4ddd46b44 [formerly 9c97908f36 [formerly 4545de35a0fdbfc5817a8725bf07ae0c405efb39]]]
Former-commit-id: c4ddd46b44
Former-commit-id: b50a8d2a19218358b07a31a6ee2f605c0ead6152 [formerly 46db8998a6]
Former-commit-id: 2ed106cac4
 2013-10-07 09:11:25 -05:00
Max Schenkelberg
bfb43525f4 Issue #2277 Remove more ScriptCreator references 
Change-Id: I8524faa9914c81afb7ace709b857bca2ef7ff747

Former-commit-id: 84377d3e8c [formerly 487775918d] [formerly 17b38d9f72] [formerly 63e90f6955 [formerly 17b38d9f72 [formerly 0d898da3aebc056c372c7785538b0b27e3e986ef]]]
Former-commit-id: 63e90f6955
Former-commit-id: 59063b336b6f01e333d1863cd1bfa081ea66cd8d [formerly e4b18ef410]
Former-commit-id: 96852b88ec
 2013-09-11 16:32:00 -05:00
David Gillingham
218ec39696 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: bd9b224ff5 [formerly c17f8b4409] [formerly 0b6b0e06cc] [formerly 40b5d54bf3 [formerly 0b6b0e06cc [formerly 5992197809236553e9c021526e42d28ed327b413]]]
Former-commit-id: 40b5d54bf3
Former-commit-id: 677ad3a406560b6ea868401e4fe7be87a4817e25 [formerly 8d347252d2]
Former-commit-id: 9c656c28b9
 2013-08-15 11:30:45 -05:00
Nate Jensen
78e718122d Issue #2142 removing some viz dependencies on edex.common 
Change-Id: I11e42f76c4b58292535af03ddf25023fbdeb734c

Former-commit-id: 178107c128 [formerly bcdaae1922] [formerly 22438766b4] [formerly 4c9cc211ec [formerly 22438766b4 [formerly 399d44a62df1c54e94d93d4e0b198db976104143]]]
Former-commit-id: 4c9cc211ec
Former-commit-id: 3dc4b88484b3a717a07e85e47dd00b4cd0dcaaee [formerly 797760bb71]
Former-commit-id: a51d424851
 2013-07-22 12:20:43 -05:00
Max Schenkelberg
f025c05d04 Issue #2142 Got log4j out of edex. 
Amend: Removed deleted files from build.properties

Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa

Former-commit-id: cd88054e2b [formerly 94fa6f0e30] [formerly 63421a4819] [formerly 50825200a1 [formerly 63421a4819 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]]]
Former-commit-id: 50825200a1
Former-commit-id: 2ff2a01be22c488169cf5231f7c69f9108a2bd0f [formerly 1610826d2e]
Former-commit-id: d1881ffa51
 2013-07-15 14:26:15 -05:00
Steve Harris
7ff64bf8cc Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1 
Former-commit-id: 3ec20c1689 [formerly 61a19a460b] [formerly 305dd72969] [formerly 57f42761d7 [formerly 305dd72969 [formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]]
Former-commit-id: 57f42761d7
Former-commit-id: 3ba12429d361c6540fa79a3a73c1e6b40b39ba2c [formerly a8e1557c62]
Former-commit-id: b423579e4a
 2013-03-05 12:27:49 -06:00
Steve Harris
aabd5cd51f 13.3.1-5 baseline 
Former-commit-id: e4a1c61ad5 [formerly 8123d5ac45] [formerly a89221c75b] [formerly e26f7eb151 [formerly a89221c75b [formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]]
Former-commit-id: e26f7eb151
Former-commit-id: 96eeb29b073d8e7bf413ace53284a7d3f9fd8170 [formerly a40c9136fe]
Former-commit-id: a240379588
 2013-03-05 10:47:06 -06:00
Steve Harris
7e48d3e684 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: abdc733151 [formerly 64744fdb19] [formerly a0573644c4] [formerly 2641d578e2 [formerly a0573644c4 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]
Former-commit-id: 2641d578e2
Former-commit-id: 4a25bf4d6d77c9356aa1e74660e835a98a31e78b [formerly 33dd2589f1]
Former-commit-id: 4f155a183a
 2013-02-21 15:41:39 -06:00
Steve Harris
db712e1fcf 13.3.1-1 baseline 
Former-commit-id: e0406d3183 [formerly 8ae397085e] [formerly 71e8990021] [formerly d2a654625f [formerly 71e8990021 [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]
Former-commit-id: d2a654625f
Former-commit-id: 42269f8019656ea35c9d11244f51d5ae9ac18ac0 [formerly 46d28be4a4]
Former-commit-id: e4435815c9
 2013-02-20 16:19:40 -06:00
Roger Ferrel
26059ae7e0 Issue #1578 Slav's fix for disposed cursors in MonitoringAreaConfigDlg. 
Change-Id: Ia57cfe88e22544260bbc03483b4c852843f67b42

Former-commit-id: 3275e6adfe [formerly 24c88a1673] [formerly 130fa3f73d] [formerly 873f932f8e [formerly 130fa3f73d [formerly 64c6e3b9812dc7232bd36feff181805c4fd504d9]]]
Former-commit-id: 873f932f8e
Former-commit-id: 55ef04696c780948659739ded23b8f7dfe6ff66c [formerly f30b5846c1]
Former-commit-id: 940d442f6f
 2013-02-07 12:46:01 -06:00
Steve Harris
ce726fadc7 13.2.1-2 baseline 
Former-commit-id: a4fa438a41 [formerly 33bc5fd816] [formerly 83e9157df7] [formerly 328c6dccad [formerly 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]
Former-commit-id: 328c6dccad
Former-commit-id: f30d6bb5c391ebffda9767fba913019b2cd7d050 [formerly 47cc08ac79]
Former-commit-id: d9be4dce21
 2013-01-23 11:18:44 -05:00
Steve Harris
82cdde8491 13.1.2-2 baseline 
Former-commit-id: e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553]
Former-commit-id: cd4185ef5c
 2013-01-06 14:32:24 -06:00
Slav Korolev
46dfd61a44 Issue #1351. Changes for non-blocking dialog MonitorDisplayThreshDlg. Changes according to comments. Deleted unused file. 
Change-Id: I62f1d4ad30ca4ed120c0ca94abf140a1e0b90ce6

Former-commit-id: 466abfbc1c [formerly 829899374d] [formerly 48f074eb72] [formerly 1a510a9f61 [formerly 48f074eb72 [formerly c063c2bdb4d4cc7c59917e9882fe78cabb63c06d]]]
Former-commit-id: 1a510a9f61
Former-commit-id: 20c7c17714ef04302d273f0fbac8ec2a7208298e [formerly 6bf265624d]
Former-commit-id: a0d07a46f9
 2012-12-07 15:18:03 -05:00
Slav Korolev
59753c678d Issue #1351. Changes for non-blocking FogMonThreshSetupDlg. Changes according to comments. 
Change-Id: I605f6819def85f197e37e13803627baec67e6786

Former-commit-id: 81d98a46f1 [formerly 349ea52e2b] [formerly a284f0f50f] [formerly b650fa6675 [formerly a284f0f50f [formerly 64fffb1598b943dc9890d2b9ee04a690c006bfe7]]]
Former-commit-id: b650fa6675
Former-commit-id: ab9c4b8c7dbfa4854adca6dd7fb1a100ffd79506 [formerly 1c16ed59c1]
Former-commit-id: b5fc4b6800
 2012-12-07 12:23:39 -05:00
Slav Korolev
d9710603e7 Issue #1351. Changes for non-blocking MonitoringAreaConfigDlg according to reviewer's comments. Changes for History Tables. 
Change-Id: Ic68f4afd44a3039707cb80ee71a935aa2f00a6a2

Former-commit-id: 32f192134d [formerly 153af1673a] [formerly 5e4bbc03a4] [formerly af101861e4 [formerly 5e4bbc03a4 [formerly 82dc81aa3cbdfcfcd0b3f5f6566bfce0b6fddd22]]]
Former-commit-id: af101861e4
Former-commit-id: d7de73f56f69ac57bd4c037b1331da78ad5eafa0 [formerly a6241ff4d8]
Former-commit-id: fd46994bb9
 2012-12-06 12:42:06 -05:00
Slav Korolev
9bb8e24c52 Issue #1297. Changed non-blocking ZoneTableDlg. Next patch. 
Changes from reviewers comments.

Change-Id: Ie812ef1167fa6b1ea78ee615190bd3059285a682

Former-commit-id: a519f985ec [formerly 487a9eabb8] [formerly d220f74018] [formerly 4560efe149 [formerly d220f74018 [formerly 8f002a71cb688fe8fbf7378ef53398dfecb0354e]]]
Former-commit-id: 4560efe149
Former-commit-id: 513793f8cfb0f26fa9576ec1dfb831fc65d80eec [formerly 765dbd8766]
Former-commit-id: 063c155818
 2012-11-16 11:08:42 -05:00
Dustin Johnson
cd5faf58bf 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: acd4cf94d8 [formerly efd3d3735a] [formerly 064ef82d1e] [formerly 1dbeb22893 [formerly 064ef82d1e [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]]
Former-commit-id: 1dbeb22893
Former-commit-id: 6b7958c5dca22552e39ad9f77a0bdd977908f9dc [formerly 4222b24d09]
Former-commit-id: 2d1e886cf3
 2012-11-08 09:57:16 -06:00
Steve Harris
3cb24c1d06 12.12.1-1 baseline 
Former-commit-id: 8278cac143 [formerly c2839cc86d] [formerly e4bd20a515] [formerly e1498006c7 [formerly e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]
Former-commit-id: e1498006c7
Former-commit-id: cc5d9cd9866ef60af47606a02772dd35474145e9 [formerly 214fcd3b63]
Former-commit-id: 4f243de928
 2012-11-07 12:41:20 -06:00
Slav Korolev
a02d2ab1af Issue #1280. Changes for non-blocking TrendPlotDlg. Fixed format. 
Change-Id: I26af77a545c1ecd76dc6a15111e73d580992d77d

Former-commit-id: eefd20833a [formerly 2beb1dbc67] [formerly 52601577db] [formerly 8c1719f248 [formerly 52601577db [formerly d97fb49f2574dc320366475e02a5784be33bbaaf]]]
Former-commit-id: 8c1719f248
Former-commit-id: d0f3bb9f14ff41751a8ee2f8310b8ef7955fb539 [formerly 0e7baf252a]
Former-commit-id: 14c942cf5d
 2012-10-24 09:24:02 -04:00
Steve Harris
d9faed979f 12.9.1-5 baseline 
Former-commit-id: 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]
Former-commit-id: f2fac39428
Former-commit-id: 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb]
Former-commit-id: 7fb0b17bd5
 2012-08-21 15:27:03 -05:00
root
791f3f5b85 Merge 12.9.1-4 into development_on_ss_builds 
Former-commit-id: bb7b5341dd [formerly 0987fc6b3d] [formerly cb46f57879] [formerly 5a453ee984 [formerly cb46f57879 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]]
Former-commit-id: 5a453ee984
Former-commit-id: 9fa79e8d9e9e82e29b8bae3cd42dbb3e0f9f0f26 [formerly 8a66b2f209]
Former-commit-id: 537dbadf64
 2012-08-15 22:15:20 +00:00
Steve Harris
d3023f15ac 12.9.1-1 baseline 
Former-commit-id: b9fb1c89d4 [formerly 8309193ce9] [formerly 31ae7ea218] [formerly 79ce6cfd97 [formerly 31ae7ea218 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]]
Former-commit-id: 79ce6cfd97
Former-commit-id: b452006db8c662d7b75e89f5dcc158103aa65a9b [formerly 0c5d9e2416]
Former-commit-id: aed7a644df
 2012-08-15 13:59:00 -05:00
Nate Jensen
6d8ac0455e Issue #882 improved use of SimulatedTime 
Change-Id: I624427fe42f0d74bc62900216596e724857830fc

Former-commit-id: baff86f951 [formerly 6f90bfa61c] [formerly a65e9608fd] [formerly 4a2841b287 [formerly a65e9608fd [formerly 0deb4ff6eb3dc1aa794916b84a6530b5d77a8b25]]]
Former-commit-id: 4a2841b287
Former-commit-id: 3ab4b622030a864dcf04c61605009347c3550e9a [formerly 8fa0eb70db]
Former-commit-id: 7d478ac74c
 2012-07-31 08:57:54 -05:00
Steve Harris
e528bb0df2 12.6.1-9 baseline 
Former-commit-id: 32fdf6ed3b [formerly 7c064b6868] [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 2c0ff851ca [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]
Former-commit-id: 27afa60345
Former-commit-id: 39c28d347eb5aeecbc48481fe6871268a89c0c2d [formerly 4f7bb90bb0]
Former-commit-id: dc50bc8443
 2012-07-10 07:53:49 -05:00
Bryan Kowal
dfd75b4c72 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 b87b66abc5 [formerly a33740e915 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]]
Former-commit-id: b87b66abc5
Former-commit-id: 351fe6f4caaff528740139f88451b1dae35f0c83 [formerly 9a7d0492fe]
Former-commit-id: b4917e6708
 2012-06-27 17:21:48 -05:00
Steve Harris
7550311ef6 12.6.1-10 baseline 
Former-commit-id: a9742f306e [formerly edac4d827c] [formerly 8dc4a774e2] [formerly 3cd0902b49 [formerly 8dc4a774e2 [formerly dd65e6d99709e0117519a1f2a2f02a41c8938d0e]]]
Former-commit-id: 3cd0902b49
Former-commit-id: 1a8021953ed3a77781e285be5837377b59afd5e3 [formerly eacd5aeb7f]
Former-commit-id: efe25edfad
 2012-06-21 08:58:00 -05:00
Steve Harris
944e3148d4 Revert "12.6.1-10 baseline" 
This reverts commit 530dfc0563 [formerly f8497470fc] [formerly c1748a5eb25e81f51401dbad2116292ba34e48b2 [formerly b33c5bdfcf]] [formerly a2c0893d1a] [formerly 16fd236f2d [formerly 06f1c7b73c] [formerly ddde63eee0] [formerly a2c0893d1a [formerly ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]].


Former-commit-id: 584f7eddf8 [formerly 62cf6a9f92] [formerly b4b1f6975f] [formerly 25198a5cd6 [formerly b4b1f6975f [formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]]]
Former-commit-id: 25198a5cd6
Former-commit-id: 52c1eb5688c898376b24c6add0a2d1a4c3ff2981 [formerly 8367fb50f5]
Former-commit-id: 333fd9c64e
 2012-06-21 08:51:08 -05:00
Steve Harris
530dfc0563 12.6.1-10 baseline 
Former-commit-id: 16fd236f2d [formerly 06f1c7b73c] [formerly ddde63eee0] [formerly a2c0893d1a [formerly ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]
Former-commit-id: a2c0893d1a
Former-commit-id: c1748a5eb25e81f51401dbad2116292ba34e48b2 [formerly b33c5bdfcf]
Former-commit-id: f8497470fc
 2012-06-21 08:38:48 -05:00
Steve Harris
d5c94ccef2 12.6.1-5 baseline 
Former-commit-id: 1ad64ffa98 [formerly 09f73b0601] [formerly c99afab05f] [formerly 8947efbc7f [formerly c99afab05f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]]]
Former-commit-id: 8947efbc7f
Former-commit-id: 1cc870696aedf27ab003448e1146bd540b248a33 [formerly a945ed8e6d]
Former-commit-id: b69fa75919
 2012-06-11 16:23:47 -05:00
Steve Harris
471fa3ac04 12.6.1-3 baseline 
Former-commit-id: bc96eba820 [formerly 7c5306b795] [formerly 42f3513175] [formerly d57eb02b9e [formerly 42f3513175 [formerly 2f4e12140a9b026770563eee58577b8aa2c041e1]]]
Former-commit-id: d57eb02b9e
Former-commit-id: 3b70f39d074d5d11b45290eba7eec94d80be38de [formerly 1fdc0aa237]
Former-commit-id: 32c0464d79
 2012-06-11 16:23:47 -05:00
Steve Harris
5e0e2d2c48 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 d325d496f5 [formerly 37793c86b1 [formerly a435e6464a78345b5036e3060430375dc53e4faf]]]
Former-commit-id: d325d496f5
Former-commit-id: 788e16ce64aaeca91000aa565d43e89a27246362 [formerly cf3c768213]
Former-commit-id: 23c34c469a
 2012-06-11 15:24:03 -05:00
Steve Harris
1f521a70b3 12.5.1-15 baseline 
Former-commit-id: 2f10c7a1e4 [formerly 8552902906] [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 0e40eb424698bf43c230ac21347627590405fcb2 [formerly 676ea3192f]
Former-commit-id: 97c4db937e
 2012-06-08 13:39:48 -05:00
Steve Harris
dbedcc229c 12.5.1-9 baseline 
Former-commit-id: 45773fbee0 [formerly b8de76b45e] [formerly 8f3c9ebfb7] [formerly 1f542697cb [formerly 8f3c9ebfb7 [formerly 25a4d3ed99c4be73a118b92c230c6365b65b56eb]]]
Former-commit-id: 1f542697cb
Former-commit-id: 7f45c65c47eed82c8ae433d59f2e859d5e1df5a0 [formerly ce0422a34a]
Former-commit-id: d23b0e4d60
 2012-05-21 17:48:55 -05:00
Steve Harris
bc695ee025 12.5.1-6 baseline 
Former-commit-id: ba6d779949 [formerly df80148db6] [formerly ffae06aa7059ba46bdf5d6194d790ed5d3513713 [formerly 24474489f9]] [formerly fa87dc6cf1 [formerly 24474489f9 [formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]]]
Former-commit-id: fa87dc6cf1
Former-commit-id: 0fa00c0acf0db00500f5839edb5595f4cd6535d5 [formerly c452cce633]
Former-commit-id: 4792884ab2
 2012-05-16 16:41:22 -05:00
Steve Harris
fe7ac96625 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: fc70139990 [formerly d7f7c26582] [formerly 092efd6072] [formerly 31b3e87ffa [formerly 092efd6072 [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]]
Former-commit-id: 31b3e87ffa
Former-commit-id: 606a1f5f70c4344a8a6b5b7da1c351cf7707cda2 [formerly 98447412f8]
Former-commit-id: 53d2822329
 2012-05-09 13:19:47 -05:00
Dave Hladky
9ae2445f9f Issue #15 Re-wrote SimDate integration for menus, alert observers after 
merge headache.

Former-commit-id: 37da8763eb [formerly 42a12fa7a5] [formerly 1b7473572f] [formerly 5b7ecea866 [formerly 1b7473572f [formerly 647b7ac154dbdaf945231b231f491bbca86d2a24]]]
Former-commit-id: 5b7ecea866
Former-commit-id: d98bc5d5887a016d68a6737704a6fb5e552d838c [formerly 61e31c62ff]
Former-commit-id: a1a3a361dd
 2012-04-30 13:43:34 -05:00
Steve Harris
98d8b3f188 12.4.1-4 baseline 
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]
Former-commit-id: a2a6a18fae
 2012-04-18 15:18:16 -05:00
Richard Peter
a8ab19c6f2 Merge "Issue #449. Fixed problem with simulated time for trend plots in FSS monitors." into 9-Wes2Bridge 
Former-commit-id: 2f351f13f7 [formerly 5bb20ff4a3] [formerly 709be7733b] [formerly be060f1b1c [formerly 709be7733b [formerly 2a3492987c4cd9751aad2c6e20230f983e68f4b5]]]
Former-commit-id: be060f1b1c
Former-commit-id: 17dcac1fcd432101a572e81e1a87d3a53a7d0082 [formerly 4a93a365bd]
Former-commit-id: 9c49c39669
 2012-04-17 13:16:22 -05:00
Slav Korolev
c158df01f8 Issue #449. Fixed problem with simulated time for trend plots in FSS 
monitors.

Former-commit-id: 273abf0ca5 [formerly bf5cf6a903] [formerly 8d29726365] [formerly f02da69ff5 [formerly 8d29726365 [formerly 79b81f2a734142d212d7bc0ad3686c7b64f433c5]]]
Former-commit-id: f02da69ff5
Former-commit-id: 7c520a3f99ccdf1fa13ed92436ba78b85df449ea [formerly 47ba302180]
Former-commit-id: 45d4f9fb86
 2012-04-09 14:50:19 -04:00
Steve Harris
11e448aa39 12.3.1-10 baseline 
Former-commit-id: 760ead2047 [formerly 0e4128712b] [formerly 4068f5295f] [formerly 22bd792cd9 [formerly 4068f5295f [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]]
Former-commit-id: 22bd792cd9
Former-commit-id: b700b47e15bf8e3b38455fe3bf3c827edd272477 [formerly ce3b74c605]
Former-commit-id: 8bc60b1e32
 2012-03-30 08:38:33 -05:00
Matt Nash
fa4cd88c90 Moving 12.1.1 into ss_sync 
Former-commit-id: d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 21d2361f00 [formerly 1faae42484]
Former-commit-id: 82300ccdcf
 2012-01-19 11:53:12 -06:00
root
9bb8decbcf Initial revision of AWIPS2 11.9.0-7p5 
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 377dcd10b9 [formerly 3360eb6c5f]
Former-commit-id: 8e80217e59
 2012-01-06 08:55:05 -06:00