Commit graph

42 commits

Author SHA1 Message Date
Lee Venable
8c8adf8be6 Issue #2436 - disposed of the sort color
Former-commit-id: c4ddd46b44 [formerly 4545de35a0fdbfc5817a8725bf07ae0c405efb39]
Former-commit-id: 9c97908f36
2013-10-07 09:11:25 -05:00
Max Schenkelberg
487775918d Issue #2277 Remove more ScriptCreator references
Change-Id: I8524faa9914c81afb7ace709b857bca2ef7ff747

Former-commit-id: 63e90f6955 [formerly 0d898da3aebc056c372c7785538b0b27e3e986ef]
Former-commit-id: 17b38d9f72
2013-09-11 16:32:00 -05:00
David Gillingham
c17f8b4409 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: 40b5d54bf3 [formerly 5992197809236553e9c021526e42d28ed327b413]
Former-commit-id: 0b6b0e06cc
2013-08-15 11:30:45 -05:00
Nate Jensen
bcdaae1922 Issue #2142 removing some viz dependencies on edex.common
Change-Id: I11e42f76c4b58292535af03ddf25023fbdeb734c

Former-commit-id: 4c9cc211ec [formerly 399d44a62df1c54e94d93d4e0b198db976104143]
Former-commit-id: 22438766b4
2013-07-22 12:20:43 -05:00
Max Schenkelberg
94fa6f0e30 Issue #2142 Got log4j out of edex.
Amend: Removed deleted files from build.properties

Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa

Former-commit-id: 50825200a1 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]
Former-commit-id: 63421a4819
2013-07-15 14:26:15 -05:00
Steve Harris
61a19a460b Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
Former-commit-id: 57f42761d7 [formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]
Former-commit-id: 305dd72969
2013-03-05 12:27:49 -06:00
Steve Harris
8123d5ac45 13.3.1-5 baseline
Former-commit-id: e26f7eb151 [formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]
Former-commit-id: a89221c75b
2013-03-05 10:47:06 -06:00
Steve Harris
64744fdb19 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: 2641d578e2 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]
Former-commit-id: a0573644c4
2013-02-21 15:41:39 -06:00
Steve Harris
8ae397085e 13.3.1-1 baseline
Former-commit-id: d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]
Former-commit-id: 71e8990021
2013-02-20 16:19:40 -06:00
Roger Ferrel
24c88a1673 Issue #1578 Slav's fix for disposed cursors in MonitoringAreaConfigDlg.
Change-Id: Ia57cfe88e22544260bbc03483b4c852843f67b42

Former-commit-id: 873f932f8e [formerly 64c6e3b9812dc7232bd36feff181805c4fd504d9]
Former-commit-id: 130fa3f73d
2013-02-07 12:46:01 -06:00
Steve Harris
33bc5fd816 13.2.1-2 baseline
Former-commit-id: 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]
Former-commit-id: 83e9157df7
2013-01-23 11:18:44 -05:00
Steve Harris
51208e5515 13.1.2-2 baseline
Former-commit-id: 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]
Former-commit-id: c0c1d56f3a
2013-01-06 14:32:24 -06:00
Slav Korolev
829899374d Issue #1351. Changes for non-blocking dialog MonitorDisplayThreshDlg. Changes according to comments. Deleted unused file.
Change-Id: I62f1d4ad30ca4ed120c0ca94abf140a1e0b90ce6

Former-commit-id: 1a510a9f61 [formerly c063c2bdb4d4cc7c59917e9882fe78cabb63c06d]
Former-commit-id: 48f074eb72
2012-12-07 15:18:03 -05:00
Slav Korolev
349ea52e2b Issue #1351. Changes for non-blocking FogMonThreshSetupDlg. Changes according to comments.
Change-Id: I605f6819def85f197e37e13803627baec67e6786

Former-commit-id: b650fa6675 [formerly 64fffb1598b943dc9890d2b9ee04a690c006bfe7]
Former-commit-id: a284f0f50f
2012-12-07 12:23:39 -05:00
Slav Korolev
153af1673a Issue #1351. Changes for non-blocking MonitoringAreaConfigDlg according to reviewer's comments. Changes for History Tables.
Change-Id: Ic68f4afd44a3039707cb80ee71a935aa2f00a6a2

Former-commit-id: af101861e4 [formerly 82dc81aa3cbdfcfcd0b3f5f6566bfce0b6fddd22]
Former-commit-id: 5e4bbc03a4
2012-12-06 12:42:06 -05:00
Slav Korolev
487a9eabb8 Issue #1297. Changed non-blocking ZoneTableDlg. Next patch.
Changes from reviewers comments.

Change-Id: Ie812ef1167fa6b1ea78ee615190bd3059285a682

Former-commit-id: 4560efe149 [formerly 8f002a71cb688fe8fbf7378ef53398dfecb0354e]
Former-commit-id: d220f74018
2012-11-16 11:08:42 -05:00
Dustin Johnson
efd3d3735a 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: 1dbeb22893 [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]
Former-commit-id: 064ef82d1e
2012-11-08 09:57:16 -06:00
Steve Harris
c2839cc86d 12.12.1-1 baseline
Former-commit-id: e1498006c7 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]
Former-commit-id: e4bd20a515
2012-11-07 12:41:20 -06:00
Slav Korolev
2beb1dbc67 Issue #1280. Changes for non-blocking TrendPlotDlg. Fixed format.
Change-Id: I26af77a545c1ecd76dc6a15111e73d580992d77d

Former-commit-id: 8c1719f248 [formerly d97fb49f2574dc320366475e02a5784be33bbaaf]
Former-commit-id: 52601577db
2012-10-24 09:24:02 -04:00
Steve Harris
a1d931fd44 12.9.1-5 baseline
Former-commit-id: f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]
Former-commit-id: 61f269f54c
2012-08-21 15:27:03 -05:00
root
0987fc6b3d Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: 5a453ee984 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]
Former-commit-id: cb46f57879
2012-08-15 22:15:20 +00:00
Steve Harris
8309193ce9 12.9.1-1 baseline
Former-commit-id: 79ce6cfd97 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]
Former-commit-id: 31ae7ea218
2012-08-15 13:59:00 -05:00
Nate Jensen
6f90bfa61c Issue #882 improved use of SimulatedTime
Change-Id: I624427fe42f0d74bc62900216596e724857830fc

Former-commit-id: 4a2841b287 [formerly 0deb4ff6eb3dc1aa794916b84a6530b5d77a8b25]
Former-commit-id: a65e9608fd
2012-07-31 08:57:54 -05:00
Steve Harris
7c064b6868 12.6.1-9 baseline
Former-commit-id: 27afa60345 [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]
Former-commit-id: 2c0ff851ca
2012-07-10 07:53:49 -05:00
Bryan Kowal
b1b294c401 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: b87b66abc5 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]
Former-commit-id: a33740e915
2012-06-27 17:21:48 -05:00
Steve Harris
edac4d827c 12.6.1-10 baseline
Former-commit-id: 3cd0902b49 [formerly dd65e6d99709e0117519a1f2a2f02a41c8938d0e]
Former-commit-id: 8dc4a774e2
2012-06-21 08:58:00 -05:00
Steve Harris
62cf6a9f92 Revert "12.6.1-10 baseline"
This reverts commit 06f1c7b73c [formerly ddde63eee0] [formerly a2c0893d1a [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]].


Former-commit-id: 25198a5cd6 [formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]
Former-commit-id: b4b1f6975f
2012-06-21 08:51:08 -05:00
Steve Harris
06f1c7b73c 12.6.1-10 baseline
Former-commit-id: a2c0893d1a [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]
Former-commit-id: ddde63eee0
2012-06-21 08:38:48 -05:00
Steve Harris
09f73b0601 12.6.1-5 baseline
Former-commit-id: 8947efbc7f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]
Former-commit-id: c99afab05f
2012-06-11 16:23:47 -05:00
Steve Harris
7c5306b795 12.6.1-3 baseline
Former-commit-id: d57eb02b9e [formerly 2f4e12140a9b026770563eee58577b8aa2c041e1]
Former-commit-id: 42f3513175
2012-06-11 16:23:47 -05:00
Steve Harris
c7024992a3 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: d325d496f5 [formerly a435e6464a78345b5036e3060430375dc53e4faf]
Former-commit-id: 37793c86b1
2012-06-11 15:24:03 -05:00
Steve Harris
8552902906 12.5.1-15 baseline
Former-commit-id: 3904c4ccf5 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]
Former-commit-id: b13cbb7e00
2012-06-08 13:39:48 -05:00
Steve Harris
b8de76b45e 12.5.1-9 baseline
Former-commit-id: 1f542697cb [formerly 25a4d3ed99c4be73a118b92c230c6365b65b56eb]
Former-commit-id: 8f3c9ebfb7
2012-05-21 17:48:55 -05:00
Steve Harris
df80148db6 12.5.1-6 baseline
Former-commit-id: fa87dc6cf1 [formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]
Former-commit-id: 24474489f9
2012-05-16 16:41:22 -05:00
Steve Harris
d7f7c26582 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: 31b3e87ffa [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]
Former-commit-id: 092efd6072
2012-05-09 13:19:47 -05:00
Dave Hladky
42a12fa7a5 Issue #15 Re-wrote SimDate integration for menus, alert observers after
merge headache.

Former-commit-id: 5b7ecea866 [formerly 647b7ac154dbdaf945231b231f491bbca86d2a24]
Former-commit-id: 1b7473572f
2012-04-30 13:43:34 -05:00
Steve Harris
750b7543dd 12.4.1-4 baseline
Former-commit-id: 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]
Former-commit-id: 67a5a68300
2012-04-18 15:18:16 -05:00
Richard Peter
5bb20ff4a3 Merge "Issue #449. Fixed problem with simulated time for trend plots in FSS monitors." into 9-Wes2Bridge
Former-commit-id: be060f1b1c [formerly 2a3492987c4cd9751aad2c6e20230f983e68f4b5]
Former-commit-id: 709be7733b
2012-04-17 13:16:22 -05:00
Slav Korolev
bf5cf6a903 Issue #449. Fixed problem with simulated time for trend plots in FSS
monitors.

Former-commit-id: f02da69ff5 [formerly 79b81f2a734142d212d7bc0ad3686c7b64f433c5]
Former-commit-id: 8d29726365
2012-04-09 14:50:19 -04:00
Steve Harris
0e4128712b 12.3.1-10 baseline
Former-commit-id: 22bd792cd9 [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]
Former-commit-id: 4068f5295f
2012-03-30 08:38:33 -05:00
Matt Nash
580e2938d7 Moving 12.1.1 into ss_sync
Former-commit-id: c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]
Former-commit-id: 66be3bec40
2012-01-19 11:53:12 -06:00
root
a02aeb236c Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]
Former-commit-id: 9f19e3f712
2012-01-06 08:55:05 -06:00