Commit graph

32 commits

Author SHA1 Message Date
Max Schenkelberg
a256b7d794 Issue #1602 Merged menu changes and D2D Nsharp changes to support NUCAPS NPP changes
Change-Id: Ia3375d8c4e03ffa143a74c965c9cf40cb2649402

Former-commit-id: a7776dd53c [formerly 8dee946fa7] [formerly 58c2417d9d] [formerly d610c1b862 [formerly 58c2417d9d [formerly ac58f7ba225688d0c2f56a8937e3477bf30bd8d1]]]
Former-commit-id: d610c1b862
Former-commit-id: 6e1a4cc0bfb51fdd8b86da13d71e5528687e77d3 [formerly de70af581c]
Former-commit-id: ea89a7f161
2013-02-11 16:11:34 -06:00
Roger Ferrel
96deac5f43 Issue #1442 Changes to update display when Simulated Time is changed. Corrections to pqact.conf.template.
Changes based on code review and added listener to GridManager and unit test.

Change-Id: Ida593a7e3cc7d4fd9bd6f44a4455145114484650

Former-commit-id: 863bdb4d52 [formerly 972db12324] [formerly 1cd076671c] [formerly 1e492b81ff [formerly 1cd076671c [formerly 7f70c2f65453db6bf3097ae8157511c38a36b136]]]
Former-commit-id: 1e492b81ff
Former-commit-id: ea2ddcc686b917f0c5feca15fbe115c2be0949d6 [formerly f10521f861]
Former-commit-id: 86d51634dc
2013-01-16 16:53:29 -06:00
Max Schenkelberg
cea378c445 Issue #1462 Created new BundleLoader and BundleProductLoader to consolidate code for loading Bundles to the screen asynchronously.
Amend: Switched to proper ticket

Change-Id: Iacfc73f574aef64bba43323818ea3484b1f5a9b9

Former-commit-id: f51398595e [formerly 9aac1d2871] [formerly 02e7c79de9] [formerly aa88b83859 [formerly 02e7c79de9 [formerly 86aa1a7febbd1b8671e546c2b9eaca10f82860a4]]]
Former-commit-id: aa88b83859
Former-commit-id: 451ec6f6d7261a1c251d7e39253fc41e3af7c367 [formerly c6b6823228]
Former-commit-id: 410abb1144
2013-01-15 14:13:36 -06:00
Dustin Johnson
fe8a2a3b09 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: 7d0e4a6e75 [formerly 8e69107b5a] [formerly 98d7beae50] [formerly 31d7d09c10 [formerly 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]]
Former-commit-id: 31d7d09c10
Former-commit-id: 465044dd2793505eba62cb46e6b3a8ac48623765 [formerly bcf575966b]
Former-commit-id: e7a0f96a9a
2012-11-01 13:36:06 -05:00
Roger Ferrel
f8e0bfb797 Issue #875 Markers and group added to Cave.
Amend: Removed python file

Amemd: Changes based on reviewer comments and additon of popup menus in the PontsMgrDlg.

Amend: deleted unwanted .project file

Amend: Removed comment out code and fix class descriptions

Amend: Changes based on reviewer comments.

Change-Id: I32c9dd754d1bfa06b470872b052b61e42adf11e8

Former-commit-id: f8d0512703 [formerly b3c357c964] [formerly 2e3fc4b400] [formerly f4ae8eb150 [formerly 2e3fc4b400 [formerly c8e5bf1a82979ebc2445acb88682e32ca8813f43]]]
Former-commit-id: f4ae8eb150
Former-commit-id: f9ea3b03486c9aff9f813d9e892a99cac8ea4ff8 [formerly ae41499ba2]
Former-commit-id: 69f22fe6bb
2012-08-08 13:35:47 -05:00
Max Schenkelberg
0377be83d9 Issue #626 Moved menu changes required for NPP to be in satellite menu from old repo into common/core. Fixed AbstractDataCubeAdapter to add System date to time request and fixed GLCMTextureData race condition if sampling a texture that has been created but not staged
Change-Id: I845caf8bedb4b27d16874c2a0a633554412d6dd4

Former-commit-id: 9ac745e1f4 [formerly 0cfd8834c2] [formerly c8909c0fbc] [formerly d8971a72fd [formerly c8909c0fbc [formerly fb323d9e48c7f35f68d188d4f8fbb677971ebbb1]]]
Former-commit-id: d8971a72fd
Former-commit-id: 461ad2e9ad311ab17437a1a0d2f7cb3a066dc5ba [formerly bc0ec0455d]
Former-commit-id: 5d8515fb58
2012-07-19 11:45:01 -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
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
Bryan Kowal
ac72941bf0 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 f0e3b957e3 [formerly f528e10391 [formerly 9e117e495d669e310839bc9ff8e1e8207b03491b]]]
Former-commit-id: f0e3b957e3
Former-commit-id: a8e6aa8338ee37d89f37110fad7307c33a5ad620 [formerly 1ee59eac71]
Former-commit-id: 21e8618852
2012-06-18 11:16:28 -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
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
Steve Harris
43f936900c Merge branch 'ss_sync' (OB12.4.1-10) into 11-Collaboration
Conflicts:
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/IncludeMenuItem.java

Former-commit-id: bcc12e03ed [formerly 572e1bb476] [formerly 27bc369818] [formerly 58037cb5d1 [formerly 27bc369818 [formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]]
Former-commit-id: 58037cb5d1
Former-commit-id: ec875d4e25b0d41a71abbea662364ddefd6fe144 [formerly 63ea8599d7]
Former-commit-id: 9c9e01dbda
2012-05-09 13:14:00 -05:00
David Gillingham
eeb836f5eb Issue #562: Rename QPFRecord getters and setters to match Java-naming
conventions, correct bugs in other classes found during test.

Change-Id: I7f490793678741ffa41769a63371e06d27840bdb

Former-commit-id: 034cab5000 [formerly 6497272c1d] [formerly c28bfaddee] [formerly 292374ce21 [formerly c28bfaddee [formerly fe6ec52b4cf64d410f3de609b06cf9666a5936bc]]]
Former-commit-id: 292374ce21
Former-commit-id: 4ffd35492e1f4e3a22ff89cb2e9d2d09bf68492e [formerly 6f40ba77f1]
Former-commit-id: 1107eac65d
2012-04-27 12:43:04 -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
Matt Nash
c010118826 Issue #429 working telestration collaboration capabilities
Former-commit-id: cb909ce21f [formerly 86e2f1a7ad] [formerly 3c2fcc59d0] [formerly c27a3cf672 [formerly 3c2fcc59d0 [formerly f1c9552a757e7d194e31ed9786cb358c53e631b7]]]
Former-commit-id: c27a3cf672
Former-commit-id: 3c3dd55c6aa4fca138d9d2c15294dd9bfbddabdc [formerly 28df06150e]
Former-commit-id: a7544fadf9
2012-04-04 11:23:34 -05:00
Max Schenkelberg
129bd62196 Issue #206 fixed dialog context deactivation bug
Former-commit-id: 3560698faf [formerly d5369932fd] [formerly 9535ae2d0e] [formerly fe59c3e8d8 [formerly 9535ae2d0e [formerly b2b66e7483065e9677d8bd34f19b514c7914ef8c]]]
Former-commit-id: fe59c3e8d8
Former-commit-id: 56ccf4761ab72766f6229a41f02810af4159766e [formerly 9a7efcaae8]
Former-commit-id: 0c4a9cf58a
2012-02-07 16:45:59 -06:00
Max Schenkelberg
26b5acd957 Issue #206 - Fixed loading and disposing bugs in tear off menus
Issue #206 Fixed bugs in maps menu and other dynamically created menus


Former-commit-id: 885f291b35 [formerly be37f19c90] [formerly 370e20f0ae] [formerly a7ccea5eda [formerly 370e20f0ae [formerly 875c90104e80d95798956330e24b59d83ef52942]]]
Former-commit-id: a7ccea5eda
Former-commit-id: ead10f07881d137ecc80314da8c248c4e77e5f1b [formerly a6622153d7]
Former-commit-id: 825bd76f55
2012-02-07 16:12:19 -06:00
Matt Nash
b6f2bb73c3 Issue #26 tear off menu changes to fix issues
Former-commit-id: 41d93a82a1 [formerly 0ea872be36] [formerly 542049e455] [formerly 0ff3ef8d72 [formerly 542049e455 [formerly 30c43cbcd4500c5754261b420f5c9b031bd63014]]]
Former-commit-id: 0ff3ef8d72
Former-commit-id: bc5a3a17c6ecc7edd1af6a345b6d7e1d8bd2b15d [formerly 88689efbfa]
Former-commit-id: 919433b8d4
2012-02-03 13:13:15 -06:00
Max Schenkelberg
d26d122c56 Issue #29 Fixed issue with radar menu dispose
Former-commit-id: 1cde213e67 [formerly 56897ee0df] [formerly f131667c9e] [formerly 8f0fbbf4e8 [formerly f131667c9e [formerly 279c4037f9f6fbefe53bc12cbf82017daa3399d2]]]
Former-commit-id: 8f0fbbf4e8
Former-commit-id: 1b6d9389ac6e57e2c133f2575ba2dbdfc9896c98 [formerly f33039a269]
Former-commit-id: f5b7ebc249
2012-02-02 16:53:53 -06:00
Matt Nash
3daca6067d Issue #26 radio buttons hopefully gerrit doesn't screw this up
Change-Id: I5ebc3356f83b3f5eb213cb659badd5ae93694d11

Former-commit-id: e4034f0fa5 [formerly eead5c9a7e] [formerly c966b7d8fd] [formerly b236733537 [formerly c966b7d8fd [formerly c03b20a3c52a7570133a972a8c915bffd167f733]]]
Former-commit-id: b236733537
Former-commit-id: 08d0111c6d1158bd9b704f1e9f629300df408cfe [formerly 6a23c2537f]
Former-commit-id: c6183ff3a3
2012-02-02 15:32:33 -06:00
Max Schenkelberg
1f516b60fc Issue #206 Fixed issue with local radar menu items getting disposed
Former-commit-id: 773eb31bd9 [formerly f78858bf2f] [formerly 84ead088ca] [formerly ba619200c9 [formerly 84ead088ca [formerly 07b72ce297ec52811439d03b4e753f5959eeb532]]]
Former-commit-id: ba619200c9
Former-commit-id: fd32febdb7979a4d29025c5a84f77ae00c6b6585 [formerly 5ef6d79ef9]
Former-commit-id: c8ddc206fc
2012-02-02 14:24:19 -06:00
Matt Nash
8a3d767487 Issue #26 fix the issue with the checkboxes out of sync
Change-Id: Ibeb05ddfc4a495d3d56a9d3c6bcc64c3494e3d32

Former-commit-id: a6d2dac19f [formerly 2408e25f2f] [formerly 4ee3ccb133] [formerly 3716c7424f [formerly 4ee3ccb133 [formerly b1032a5a6bf24fcc4a0cf48ad6f2955adcaf0480]]]
Former-commit-id: 3716c7424f
Former-commit-id: d56d3985144bc9d94b1e93507e88825d644ead2c [formerly 2b7d5941d5]
Former-commit-id: 5c66805415
2012-02-01 17:32:51 -06:00
Matt Nash
47a7819df3 Merge "Issue #206 Made tear off menu dialog activate contexts for perspective" into 10-Tech_Blocked
Former-commit-id: 167c03907d [formerly 9893d3b246] [formerly 54d27a840f] [formerly b1eca1ae8f [formerly 54d27a840f [formerly 1ca26738cc10a37119b939a405987198245a4d65]]]
Former-commit-id: b1eca1ae8f
Former-commit-id: f11b7e1812a72932c93933a9c21285c5f4b8e061 [formerly 1b4a05d33a]
Former-commit-id: b8062619fe
2012-02-01 17:13:10 -06:00
Max Schenkelberg
2683c94927 Issue #206 Made tear off menu dialog activate contexts for perspective
Former-commit-id: 83de7660b6 [formerly c410a4eb33] [formerly fe37491648e0fc8206d099dbb83c2a534862c4b9 [formerly 5f8d30bb43]] [formerly e422b13ded [formerly 5f8d30bb43 [formerly 56103eb133de5325d62bb3453b2353e5d5e23ddd]]]
Former-commit-id: e422b13ded
Former-commit-id: e58fc953c960af41fe0d16f529fdd017ca742ce6 [formerly 3a26b0cea5]
Former-commit-id: 2185e1a31e
2012-02-01 17:03:20 -06:00
Matt Nash
33edd5f1bd Issue #206 radio buttons ready to update when menu is clicked
Change-Id: I8218e920bb3221e986d4698771d3199398cb655f

Former-commit-id: 39333465cb [formerly 6713ff899a] [formerly 75d6af1ab9] [formerly 0981e7044d [formerly 75d6af1ab9 [formerly cda41b60a0189c5320fa8a1236a936910f1e98d4]]]
Former-commit-id: 0981e7044d
Former-commit-id: 17be77ce64b47b891cc200aa3d239f0f7a0bf285 [formerly b0b1c9cc11]
Former-commit-id: 1d91ab7b46
2012-02-01 14:07:50 -06:00
Matt Nash
8dcbb297c9 Issue #206 radio buttons only select one at a time
Former-commit-id: 3430c01156 [formerly 42b4f10d37] [formerly 5094c1ec1c] [formerly c8365fa660 [formerly 5094c1ec1c [formerly 38de69ea29c429a2295518fb9d8c1707efe1d3c4]]]
Former-commit-id: c8365fa660
Former-commit-id: 864503773583d07d8597244deea399d7f0d59d17 [formerly 3b247ad783]
Former-commit-id: e977aefb73
2012-01-27 11:50:34 -06:00
Matt Nash
422decc589 Issue #208 removing check boxes so they will not be out of sync
Former-commit-id: 7ae652e360 [formerly 3e08ff4209] [formerly 047e9e132f] [formerly d41eef10e3 [formerly 047e9e132f [formerly 3eff5c38fe6a20aa3c0dd02e84a5f1a0e6340ef4]]]
Former-commit-id: d41eef10e3
Former-commit-id: f92e4a6589e1426b1bedc1d78e67c649bdf43127 [formerly e4ebb712c6]
Former-commit-id: f11e0888dd
2012-01-27 08:10:04 -06:00
Matt Nash
96563bf2bf Issue #26 removing the svn files from the repo
Former-commit-id: 471d66f8b5 [formerly e97a8a2273] [formerly cf203980a9] [formerly f7dca45767 [formerly cf203980a9 [formerly 77197fdc91d5ece9c15f31e9203998d1ef510c7c]]]
Former-commit-id: f7dca45767
Former-commit-id: f9318a1d93669338b472e417f870f2f77914676a [formerly 94108f34fb]
Former-commit-id: 3c1c73e0c4
2012-01-25 17:17:46 -06:00
Matt Nash
e4fb11ce75 Issue #26 add tear off code to git baseline
Former-commit-id: ea6ef73802 [formerly 892cb9a7ae] [formerly cf4e1f764e] [formerly 4286cb0342 [formerly cf4e1f764e [formerly dedac216cfa51bd413f7c4d1f7db5ee8ce665866]]]
Former-commit-id: 4286cb0342
Former-commit-id: 6e2a1045719c1a26e7628366b3ec9f4ceaa8912c [formerly 8e3d2af84e]
Former-commit-id: e8d239e963
2012-01-25 12:50:31 -06: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