Commit graph

23 commits

Author SHA1 Message Date
Max Schenkelberg
2f28c6a086 Issue #1590 Change localization notification observer to send notification to listeners after unlocking file to avoid deadlock
Change-Id: I2b5ffa08af98259bdd860feb4cd989be013a05be

Former-commit-id: 4ba75b9ece [formerly 232400965d] [formerly 4ba75b9ece [formerly 232400965d] [formerly 3f3359370d [formerly 1ebb6aa360c9f916f09a5da95e5d831a021508e1]]]
Former-commit-id: 3f3359370d
Former-commit-id: 9235c32f9e [formerly 9383d97579]
Former-commit-id: be6a2a47f1
2013-02-07 16:36:53 -06:00
Steve Harris
61a9f644d9 Merge branch '13.2.1_delivery' into development
Conflicts:
	edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/pproc/MpeLightningSrv.java

Former-commit-id: 89f3120c0c [formerly 2c9c6b7dde] [formerly 89f3120c0c [formerly 2c9c6b7dde] [formerly 407d73a04f [formerly cda6b1137d9052b0859f2b51f5bdadecad411e43]]]
Former-commit-id: 407d73a04f
Former-commit-id: 0ca985778e [formerly bbb637faf3]
Former-commit-id: 45760d8bef
2013-01-18 10:52:29 -06:00
Dustin Johnson
e3cf0246c7 Issue #1412 Check file last modified times each time role data is requested
Change-Id: Ieae84ad3106e3aa0cf4d253a10c27e8c9c60ecaa

Former-commit-id: b1ce19e41d [formerly 74d5a70c30] [formerly b1ce19e41d [formerly 74d5a70c30] [formerly 037dabb683 [formerly b7e577237df9e157fdb218af48c41f6209ff2bfb]]]
Former-commit-id: 037dabb683
Former-commit-id: fce3f8bec9 [formerly 6468029207]
Former-commit-id: 799cf85f82
2013-01-17 12:48:01 -06:00
Bryan Kowal
89cc2bdf57 Issue #1469 - pypies will now read the hdf5 root directory from configuration. Relative paths can now be passed to pypies. Rebased to fix merge conflict.
Change-Id: I38873e478729a3644db7ce2813e9bd6c15d9bdf3

Former-commit-id: fba28ea69b [formerly e2a12845d3] [formerly fba28ea69b [formerly e2a12845d3] [formerly 4db9c6c321 [formerly ed2e78738b391bcb9a40ddde7b7a6acf7ccd1b30]]]
Former-commit-id: 4db9c6c321
Former-commit-id: 38480e46b1 [formerly c1330e8121]
Former-commit-id: 290167ac16
2013-01-15 14:56:01 -06:00
Max Schenkelberg
85e82e4b78 Issue #1329 fixed bug in FileLocker
Change-Id: Ide1f4cb2d9f5d6f6ebfb2eed8bac583f0b0e153e

Former-commit-id: ebb303ee06 [formerly d779a82c5e] [formerly ebb303ee06 [formerly d779a82c5e] [formerly 91a8e56302 [formerly 695f92db8aa698393bebfb4c2fed0bcf4d9d4efa]]]
Former-commit-id: 91a8e56302
Former-commit-id: 06004a0e08 [formerly 66f472ed37]
Former-commit-id: 8745f7acf1
2013-01-07 16:04:14 -06:00
Max Schenkelberg
d0a39b6c17 Issue #1329 Fixed nsharp issue that came about after changing when the renderable display sets itself on the descriptor.
Change-Id: I1a5bcb4ba18a8dd73f8857c5bd4256529af57fde

Former-commit-id: 08160fff31 [formerly fabb9bbcff] [formerly 08160fff31 [formerly fabb9bbcff] [formerly 7e3273db95 [formerly 4b62eb9cb14005f5f1a4ab660336d2c6e6db0592]]]
Former-commit-id: 7e3273db95
Former-commit-id: 3a1106efa0 [formerly 904270b99b]
Former-commit-id: 09f1499af9
2012-12-20 17:14:34 -06:00
Max Schenkelberg
2030832669 Issue #1329 Committing some of the core classes touched for MPE time refactor. Made GL data mapping work properly with non float types. Made GriddedImageDisplay2 use new TileSetRenderable for processing and memory efficieny
Change-Id: Ib12a3a6bb1f20f1e8eeb6dbd170802cf79359cfb

Former-commit-id: be99f6c7ca [formerly 3e128b266a] [formerly be99f6c7ca [formerly 3e128b266a] [formerly 5db71ca943 [formerly eaeb75b4f2dd1c19f805c8cf4f4d010b455d99e8]]]
Former-commit-id: 5db71ca943
Former-commit-id: d43e0c1c25 [formerly b74d788909]
Former-commit-id: 206116ab66
2012-12-12 11:39:32 -06:00
Richard Peter
55ae5a07cf Issue #1350: Fix stats aggregation
Change-Id: I652db6f6f5bc0cab8fc9e85969bf57f1c2382da3

Former-commit-id: 71574f210d [formerly 94df67d354] [formerly 71574f210d [formerly 94df67d354] [formerly 2b124db62a [formerly b06d51266d600e0b04f7fe10bc36e312a2275428]]]
Former-commit-id: 2b124db62a
Former-commit-id: 99f19186ef [formerly 5a45254db0]
Former-commit-id: 9a51a3d3b2
2012-11-29 17:27:15 -06:00
Max Schenkelberg
dc4876fa33 Issue #1243 Revert locking in UtilityManager.getFileChecksum to avoid lock timing out until FileLocker can be fixed
Change-Id: I25ab9832d725647c17aea505514334a7c0026ae7

Former-commit-id: 34c4ec44c3 [formerly 0daa22064b] [formerly 34c4ec44c3 [formerly 0daa22064b] [formerly 71367ef5bb [formerly a7386c6570455fe6f9175eaeae1225923124cce8]]]
Former-commit-id: 71367ef5bb
Former-commit-id: afc4de9a1a [formerly 102c2dbaa1]
Former-commit-id: 755c64bfdc
2012-11-16 14:12:27 -06:00
Max Schenkelberg
a94b9c173d Issue #1243 moved locking for getFile into adapter code for cave since that is the only time a file is actually downloaded and requires locking
Change-Id: I39920677769e1a885ac7b3f1003dd52ae1dc2737

Former-commit-id: a472f5535b [formerly 655f54b098] [formerly a472f5535b [formerly 655f54b098] [formerly f540f65fd7 [formerly 4648ab539b37a0608ab7ebab5080317bbf618504]]]
Former-commit-id: f540f65fd7
Former-commit-id: db2fe0b5e8 [formerly f1866b2e49]
Former-commit-id: 7ffce5cd45
2012-11-15 16:21:42 -06:00
Max Schenkelberg
eec401909b Issue #1243 Made localization lock more intelligently to avoid files getting out of sync and causing errors.
Amend: Fixed LocalizationFileOutputStream so it has option to close and save file and made LocalizationFile.write so it is more clear as to
what it is doing. Made CloudHeightData and AdaptivePlotResourceData not create FileUpdateMessages.

Amend: Rebased

Change-Id: I5aff6402004f4b4d3040c8c71f5ee16dfeb33567

Former-commit-id: fe11e31bfb [formerly dcde9e8951] [formerly fe11e31bfb [formerly dcde9e8951] [formerly 28e61c8285 [formerly 85a0b9bb03887b9ef50e67a1ae3a36afd24b3a58]]]
Former-commit-id: 28e61c8285
Former-commit-id: 5aa26e4f13 [formerly 2e20c3e799]
Former-commit-id: 429ddc7312
2012-11-14 16:19:37 -06:00
Dustin Johnson
0c5a52f3b1 Issue #1322 Common baseline changes to support BandwidthManager
Amend:
  Revert EDEXLocalizationAdapter and duplicate getPath() in test version.

Change-Id: I72205aadeba1f894ee49cb4d146519df10d941f8

Former-commit-id: afd9a767ea [formerly 7d9e7567bd] [formerly afd9a767ea [formerly 7d9e7567bd] [formerly 7c59f9ea41 [formerly 07aeec469a83ce07286bc27ea3e6bda41909be8d]]]
Former-commit-id: 7c59f9ea41
Former-commit-id: 5d410ff934 [formerly c0c60c2488]
Former-commit-id: 3129d3bd3a
2012-11-14 12:19:10 -06:00
Dustin Johnson
b4a13190ad 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: efd3d3735a [formerly 064ef82d1e] [formerly efd3d3735a [formerly 064ef82d1e] [formerly 1dbeb22893 [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]]
Former-commit-id: 1dbeb22893
Former-commit-id: 2d1e886cf3 [formerly 4222b24d09]
Former-commit-id: 6613c51d3b
2012-11-08 09:57:16 -06:00
Dustin Johnson
931d94d1de Issue #1302 Merge branch '5-Data_Delivery' into development
Conflicts:
    edexOsgi/build.edex/deploy-common/external-rules.xml
    edexOsgi/build.edex/deploy-common/plugin-methods.xml
    edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
    edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
    edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
    edexOsgi/build.edex/build.xml
    edexOsgi/build.edex/esb/conf/modes.xml
    edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
    edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
    edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java

Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0

Former-commit-id: 8e69107b5a [formerly 98d7beae50] [formerly 8e69107b5a [formerly 98d7beae50] [formerly 31d7d09c10 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]]
Former-commit-id: 31d7d09c10
Former-commit-id: e7a0f96a9a [formerly bcf575966b]
Former-commit-id: 4d9c945388
2012-11-01 13:36:06 -05:00
Roger Ferrel
85cf1738ef Issue #875 Added tri-state for Point fields movable and hidden.
Change-Id: Idcb54906735a6f727f4db88ca39ae0e57deb2964

Former-commit-id: 4978b5305d [formerly 70217e1556] [formerly 4978b5305d [formerly 70217e1556] [formerly 66d98d068c [formerly 15833c5ca3b8415b3a2fef1da98c42e95721331d]]]
Former-commit-id: 66d98d068c
Former-commit-id: 8d21873f2f [formerly 7bbcb004be]
Former-commit-id: ed3663b145
2012-09-17 09:02:26 -05:00
Max Schenkelberg
29ab00a4cb Issue #1138 Changed LocalizationFile.protectedFile from boolean to LocalizationLevel so the protected level is specified if the file is protected. That way the file browser knows what level the file can be copied or moved to. Made speed improvements to perspective when refreshing files and consolidated different ways of doing same thing. Made all localization actions check protected level when setting if enabled or not. Added tool tip to protected files to show they are protected in view.
Change-Id: Id6862f29f431dd79758e39282659a670fe3a1536

Former-commit-id: 6d78afd423 [formerly 80439b309b] [formerly 6d78afd423 [formerly 80439b309b] [formerly 84658dd03a [formerly 1d5b8912fe38bd21496c7b9f4ba385e27d7dedcd]]]
Former-commit-id: 84658dd03a
Former-commit-id: d2d74fac20 [formerly 20f5d966db]
Former-commit-id: 264bc403d6
2012-09-10 10:45:37 -05:00
Ron Anderson
b78c280ac8 Issue #436 merging elevation base changes into branch off of development baseline.
Former-commit-id: 93c632c1ff [formerly 1321db6a99] [formerly 93c632c1ff [formerly 1321db6a99] [formerly 819b9c8e56 [formerly 9287cf98369abb8a674fd5bab99439d055218a05]]]
Former-commit-id: 819b9c8e56
Former-commit-id: e5952c1c99 [formerly 6eafdda705]
Former-commit-id: f7b9190b51
2012-08-17 12:20:08 -05:00
Max Schenkelberg
ecd2068cf0 Issue #440 made PathManager not request data if there are no contexts to request for
Former-commit-id: 1e8e9db9eb [formerly e856cfedf4] [formerly 1e8e9db9eb [formerly e856cfedf4] [formerly db57eeee16 [formerly d5ad7950c520e8b8d384b6dad73f0da6e84935d0]]]
Former-commit-id: db57eeee16
Former-commit-id: 15c59d6621 [formerly 1f10cddfa2]
Former-commit-id: 9e296ec8b9
2012-06-19 13:00:44 -05:00
Max Schenkelberg
6cbb7a0e8c Issue #639 Cleaned up chat logging a bit
Change-Id: Iba4e2a935dfdca9518ac0184fc53acfad2306c32

Former-commit-id: fdcc024dd7 [formerly d9c1499311] [formerly fdcc024dd7 [formerly d9c1499311] [formerly dce9ee1905 [formerly 19f338e41a81b50e57fe13b969c2b3a80f78ace0]]]
Former-commit-id: dce9ee1905
Former-commit-id: 6723e813e6 [formerly f6e74cc027]
Former-commit-id: 1462e030ec
2012-05-17 13:58:33 -05:00
Brad Gonzales
06a99fd702 Issue #639 added collaboration chat logging to localization.
Former-commit-id: 954324a221 [formerly 5935fd7091] [formerly 954324a221 [formerly 5935fd7091] [formerly 892b6d83e5 [formerly bf4e1e674e7461871ce19fe7ea74da7ef4db48ae]]]
Former-commit-id: 892b6d83e5
Former-commit-id: aa71750482 [formerly 06ebcfb533]
Former-commit-id: 0e79b46c23
2012-05-17 12:13:30 -05:00
Steve Harris
74b66d9683 12.4.1-4 baseline
Former-commit-id: 750b7543dd [formerly 67a5a68300] [formerly 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: a2a6a18fae [formerly a4e519f3cd]
Former-commit-id: 8cd5974f4c
2012-04-18 15:18:16 -05:00
Matt Nash
bcc32c10bc Moving 12.1.1 into ss_sync
Former-commit-id: 580e2938d7 [formerly 66be3bec40] [formerly 580e2938d7 [formerly 66be3bec40] [formerly c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 82300ccdcf [formerly 1faae42484]
Former-commit-id: 21d2361f00
2012-01-19 11:53:12 -06:00
root
e2ecdcfe33 Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: a02aeb236c [formerly 9f19e3f712] [formerly a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 8e80217e59 [formerly 3360eb6c5f]
Former-commit-id: 377dcd10b9
2012-01-06 08:55:05 -06:00