Steve Harris
46d05b60a1
Merge branch 'ss_builds' (12.10.1-1) into development
...
Former-commit-id: 319927240c
[formerly 0e046d847a
] [formerly bba4eb12d0
] [formerly 319927240c
[formerly 0e046d847a
] [formerly bba4eb12d0
] [formerly af106f1d29
[formerly bba4eb12d0
[formerly 3eacf0da611b09faa416580b8d2db5bdc9af2d11]]]]
Former-commit-id: af106f1d29
Former-commit-id: 20e088a957
[formerly f224e3e8ad
] [formerly fa15b185c1fb287218beaf2772d775077049f22b [formerly 53e29f59e4
]]
Former-commit-id: 3d9b8193220e5e34df1a2294f95f1fef387de77d [formerly e9582cb789
]
Former-commit-id: f8e7459dfb
2012-09-04 12:11:03 -05:00
Steve Harris
bc97cf788a
12.10.1-1 baseline
...
Former-commit-id: 7248f8b762
[formerly 0abf64b77c
] [formerly 195158c004
] [formerly 7248f8b762
[formerly 0abf64b77c
] [formerly 195158c004
] [formerly d708932029
[formerly 195158c004
[formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]]]
Former-commit-id: d708932029
Former-commit-id: 9f4fa7bf83
[formerly e720b8ed31
] [formerly eb876c43cf6e8b687c0e099c754e050f9cb32001 [formerly 7bd9c63dc7
]]
Former-commit-id: 93d844e1d6c245b4e49c2fcb70d3a7143c1fc5c2 [formerly d65f35ffe9
]
Former-commit-id: a924a8347a
2012-09-04 12:07:27 -05:00
Steve Harris
e38cbf019b
12.9.1-12 baseline
...
Former-commit-id: 6784576fc9
[formerly 4bf4f0043a
] [formerly 948766c387
] [formerly 6784576fc9
[formerly 4bf4f0043a
] [formerly 948766c387
] [formerly 150bc967a5
[formerly 948766c387
[formerly 09035ea929c2e926b2dce13429c29d3fd3707880]]]]
Former-commit-id: 150bc967a5
Former-commit-id: 15fa63819d
[formerly 782941ccc1
] [formerly 4e1215512187f5bc2d7c34ebc42a2aad34e0131f [formerly 9311c1737e
]]
Former-commit-id: 636b0752d8e9909d3f1d52f3fb2dd51e26dcd63d [formerly 38aa573545
]
Former-commit-id: c1e601dc30
2012-09-04 11:47:38 -05:00
Steve Harris
e4a69a14b7
Merge branch 'ss_builds' (12.9.1-11) into development
...
Conflicts:
rpms/build/i386/build.sh
Former-commit-id: 9ff4f369a4
[formerly f52c8b374d
] [formerly 3a9d4961e2
] [formerly 9ff4f369a4
[formerly f52c8b374d
] [formerly 3a9d4961e2
] [formerly 34cbde4124
[formerly 3a9d4961e2
[formerly 73ab8bdcc39291fbe36b5bcffe53d9106cc00238]]]]
Former-commit-id: 34cbde4124
Former-commit-id: a3a1864f56
[formerly ffe253196a
] [formerly b24c67b6e98e964ff9cd901ee9da994905e8a1b9 [formerly 3230e0b246
]]
Former-commit-id: 0a6beb81edff0c6c84ef952189b7118ada94cdbd [formerly 5b4ee818b7
]
Former-commit-id: b63855f152
2012-08-30 14:40:34 -05:00
Steve Harris
cba4faf995
12.9.1-10 baseline
...
Former-commit-id: 264d870cbf
[formerly bdb45cdfae
] [formerly 3adc50a783
] [formerly 264d870cbf
[formerly bdb45cdfae
] [formerly 3adc50a783
] [formerly cb9b80f3a0
[formerly 3adc50a783
[formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]]]
Former-commit-id: cb9b80f3a0
Former-commit-id: c704490769
[formerly f43a5af47f
] [formerly eed64ebc552063bbc01aefdaa691a9c27ae700c3 [formerly dc08c5a71a
]]
Former-commit-id: 8b8bb30a759783a20d278f5fb0049d2db76cb8dc [formerly 5bb474d33c
]
Former-commit-id: ede38c4b3f
2012-08-30 14:28:27 -05:00
Matt Nash
1071ff2049
Issue #1101 fix gfe keybindings for frame change in collaboration
...
Change-Id: Ic6cb90ac60156429aac6c975eda834b23731e09a
Former-commit-id: 04ce96d74e
[formerly ba698ae69a
] [formerly 018f590c70
] [formerly 04ce96d74e
[formerly ba698ae69a
] [formerly 018f590c70
] [formerly ada6ecf5f3
[formerly 018f590c70
[formerly 2c766c16bf8fdbc801097acfe8f8fdfd00e53367]]]]
Former-commit-id: ada6ecf5f3
Former-commit-id: d35027f45e
[formerly cac1c2bb2e
] [formerly 5dd2067f359bb03dbe5cae64c69ba82ef563a1de [formerly 1242054a50
]]
Former-commit-id: c580f22bd8cf1f202bf9fa6adf36dc991f847cf9 [formerly 5c568beda7
]
Former-commit-id: 1b9d645810
2012-08-27 12:16:38 -05:00
Steve Harris
7f13d82b95
Merge branch 'development_on_ss_builds' (with 12.9.1-5) into development
...
Conflicts:
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGribGridResource.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelDataRequestJob.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelGeneratorJob.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbPointSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWarningResource.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnsignedByteArrayWrapper.java
Former-commit-id: 772c4359da
[formerly 51eb89eb2a
] [formerly 91e39617cb
] [formerly 772c4359da
[formerly 51eb89eb2a
] [formerly 91e39617cb
] [formerly a71dac6cad
[formerly 91e39617cb
[formerly b9db13cf5bff60511d815f92f0239a4313498265]]]]
Former-commit-id: a71dac6cad
Former-commit-id: fd6e8d5b63
[formerly dbcb28ce77
] [formerly 1be860f8d952be20f92f7830faeba102244c82ba [formerly 87a602dfee
]]
Former-commit-id: 8e63ec5399842340c4f27680b2ed51ba425ae251 [formerly 0b647c0c9d
]
Former-commit-id: 3f44e46a6f
2012-08-27 09:53:55 -05:00
Steve Harris
98059f9ef1
12.9.1-5 baseline
...
Former-commit-id: 77cbd6c1e5
[formerly a1d931fd44
] [formerly 61f269f54c
] [formerly 77cbd6c1e5
[formerly a1d931fd44
] [formerly 61f269f54c
] [formerly f2fac39428
[formerly 61f269f54c
[formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]]
Former-commit-id: f2fac39428
Former-commit-id: d9faed979f
[formerly 7fb0b17bd5
] [formerly 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb
]]
Former-commit-id: 84e9e52a92ae5e740b0daf680a98316f7435f7f7 [formerly 9b5c2094ed
]
Former-commit-id: 2d928d328e
2012-08-21 15:27:03 -05:00
Ron Anderson
fd53117c14
Issue #436 Made hazardDict an OrderedDict so order of entries is preserved.
...
Modifed include path so procedures/smartTools are found before utilities of the same name so
existing site MakeHazardConfig.py files in procedures will be found before the base file in utilities.
Added code to default new localEffects dicts to empty so existing MakeHazardConfig.py files can be used.
Change-Id: I4a59d930f8b93bf76c28f3dec3881fbccc077eff
Former-commit-id: 0a6de388dd
[formerly 16231374f8
] [formerly d7a818fd1d
] [formerly 0a6de388dd
[formerly 16231374f8
] [formerly d7a818fd1d
] [formerly 7662d249ab
[formerly d7a818fd1d
[formerly 18f0efe7a8d9f2c31786fc449403f720b554b95d]]]]
Former-commit-id: 7662d249ab
Former-commit-id: 21b48541c3
[formerly 6e3674f9fc
] [formerly eadb27af146fe75ce647766fdd43f9aa8948307f [formerly d3693827a1
]]
Former-commit-id: cc064445b1277a5893829a9d2679defa8d74bab9 [formerly 1b655b0826
]
Former-commit-id: f69d7b9c64
2012-08-17 12:41:49 -05:00
Ron Anderson
c1d0cbae01
Issue #436 merging elevation base changes into branch off of development baseline.
...
Former-commit-id: c71ee18e6e
[formerly 93c632c1ff
] [formerly 1321db6a99
] [formerly c71ee18e6e
[formerly 93c632c1ff
] [formerly 1321db6a99
] [formerly 819b9c8e56
[formerly 1321db6a99
[formerly 9287cf98369abb8a674fd5bab99439d055218a05]]]]
Former-commit-id: 819b9c8e56
Former-commit-id: 0a32c7c683
[formerly e5952c1c99
] [formerly 5cae0d5653a03ef5095386e62d4e0139bdd634e9 [formerly 6eafdda705
]]
Former-commit-id: e27e7df534ee0ecbb93248c7bad66447e0b16b5e [formerly f7b9190b51
]
Former-commit-id: b78c280ac8
2012-08-17 12:20:08 -05:00
root
73466bae44
Merge 12.9.1-4 into development_on_ss_builds
...
Former-commit-id: bb7b5341dd
[formerly 0987fc6b3d
] [formerly cb46f57879
] [formerly bb7b5341dd
[formerly 0987fc6b3d
] [formerly cb46f57879
] [formerly 5a453ee984
[formerly cb46f57879
[formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]]]
Former-commit-id: 5a453ee984
Former-commit-id: 791f3f5b85
[formerly 537dbadf64
] [formerly 9fa79e8d9e9e82e29b8bae3cd42dbb3e0f9f0f26 [formerly 8a66b2f209
]]
Former-commit-id: 167e4e289205b778c1de6873be7610daf3a39f5f [formerly 1792158ef8
]
Former-commit-id: 0eb9520e15
2012-08-15 22:15:20 +00:00
Steve Harris
867586657b
12.9.1-4 baseline
...
Former-commit-id: 71b024e3a1
[formerly 36c108e960
] [formerly dcda3a2290
] [formerly 71b024e3a1
[formerly 36c108e960
] [formerly dcda3a2290
] [formerly 33b95fb96d
[formerly dcda3a2290
[formerly df38541c9df38c634626ae214f288b606004a768]]]]
Former-commit-id: 33b95fb96d
Former-commit-id: 80655bf0a3
[formerly d7d60cc623
] [formerly a0362f7c21fdffcde34416e960bbba970227a95e [formerly 9990bf909b
]]
Former-commit-id: e06a87e5baa81edcd3ffe2ce62e1eb2416c1ee57 [formerly de9b64b501
]
Former-commit-id: 7e1d1f6e08
2012-08-15 15:19:10 -05:00
Steve Harris
31353e2296
12.9.1-1 baseline
...
Former-commit-id: b9fb1c89d4
[formerly 8309193ce9
] [formerly 31ae7ea218
] [formerly b9fb1c89d4
[formerly 8309193ce9
] [formerly 31ae7ea218
] [formerly 79ce6cfd97
[formerly 31ae7ea218
[formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]]]
Former-commit-id: 79ce6cfd97
Former-commit-id: d3023f15ac
[formerly aed7a644df
] [formerly b452006db8c662d7b75e89f5dcc158103aa65a9b [formerly 0c5d9e2416
]]
Former-commit-id: b1b11fe00755e632d56330d48d6e1eee387eeef8 [formerly 63bcadf121
]
Former-commit-id: 16d7d955fc
2012-08-15 13:59:00 -05:00
Steve Harris
fe4f531ab4
Merge branch 'ss_builds' (12.8.1-10) into development_on_ss_builds
...
Conflicts:
rpms/awips2.64/Installer.h5py/component.spec
Former-commit-id: 7b6c223552
[formerly 9e2d161f8d
] [formerly f0b7d5e4c5
] [formerly 7b6c223552
[formerly 9e2d161f8d
] [formerly f0b7d5e4c5
] [formerly 85f82b18b3
[formerly f0b7d5e4c5
[formerly f6fc0581c3100ef186b90668cb1f1ae4283eaa7b]]]]
Former-commit-id: 85f82b18b3
Former-commit-id: 4f1a7eb689
[formerly 52e0da2293
] [formerly ee22b108589d0c82dcd1216d6f772ca807503da2 [formerly b2432e096f
]]
Former-commit-id: 0f6649139bcd0bcc13452f409ebf934272d58b9b [formerly dcc56b8a23
]
Former-commit-id: 9fd142b98e
2012-08-06 09:38:26 -05:00
Steve Harris
5b36559525
12.8.1-10 baseline
...
Former-commit-id: 79d4d91e46
[formerly 6244359a80
] [formerly b5e8fee24d
] [formerly 79d4d91e46
[formerly 6244359a80
] [formerly b5e8fee24d
] [formerly ca25d508ec
[formerly b5e8fee24d
[formerly 7c799ab7b99993c77b6568529b46aaf13d01300b]]]]
Former-commit-id: ca25d508ec
Former-commit-id: 330df3323f
[formerly 78d34d65d2
] [formerly ecf87b1305ff66ff4fdee1eb082f70a1ea1b736b [formerly d5563fc340
]]
Former-commit-id: ec8b3d9f8a4ff2a546518a3c5769751ec3bf2a2f [formerly 46daa48f1c
]
Former-commit-id: 78d66ba6df
2012-08-06 09:34:26 -05:00
Steve Harris
5d5bcddfd2
Merge branch 'ss_builds' (12.8.1-5) into development_on_ss_builds
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/AbstractParmManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/VCModuleJobPool.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/GFEColorbarResource.java
edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
rpms/awips2.64/Installer.h5py/component.spec
rpms/awips2.64/Installer.python/component.spec
rpms/awips2.64/Installer.python/src/lapack.patch1
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
rpms/python.site-packages/Installer.pupynere/component.spec
Former-commit-id: 0557c9a0c6
[formerly fb47934159
] [formerly 6d77b94217
] [formerly 0557c9a0c6
[formerly fb47934159
] [formerly 6d77b94217
] [formerly 51e38ca887
[formerly 6d77b94217
[formerly 1b17cebeb85f871d950bd02e27141b11d977c3ad]]]]
Former-commit-id: 51e38ca887
Former-commit-id: 330c7a877c
[formerly d2291ba23f
] [formerly 01cf1f328ecb5a3b2a058b016779fc32e6f68081 [formerly 3476fe755b
]]
Former-commit-id: 398f1f615222e7408fca287d0787208690bcb094 [formerly e892eb4628
]
Former-commit-id: 078b4fff3c
2012-08-01 12:43:12 -05:00
Steve Harris
1098368e19
12.8.1-5 baseline
...
Former-commit-id: 2e804fc8c4
[formerly 2653ddc2e3
] [formerly fd2abfb6f1
] [formerly 2e804fc8c4
[formerly 2653ddc2e3
] [formerly fd2abfb6f1
] [formerly cd49ef3eda
[formerly fd2abfb6f1
[formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]]]
Former-commit-id: cd49ef3eda
Former-commit-id: 4f47148ced
[formerly dab00b12e6
] [formerly 470040dd3334156744a98f7368531647893ed93d [formerly e0c3722fd1
]]
Former-commit-id: 573a0cc46f2d0efe2e8514f12ca675b4673c9160 [formerly e86949a8d3
]
Former-commit-id: d3be09bd74
2012-08-01 10:45:37 -05:00
Ron Anderson
ffa704b341
Issue #851 change date formatters to use ThreadLocal instead of synchronized blocks.
...
Change-Id: I1d3818cf90d21d3cc725b9a83e55eb5068b7aa62
Former-commit-id: c2937d7303
[formerly e9f24e8660
] [formerly 7c6686f2f4
] [formerly c2937d7303
[formerly e9f24e8660
] [formerly 7c6686f2f4
] [formerly b1650b6143
[formerly 7c6686f2f4
[formerly 181fba1a75357aa39a54267c6df907075f4601dc]]]]
Former-commit-id: b1650b6143
Former-commit-id: 701d77f90a
[formerly 4efd9149f7
] [formerly 7e61eb27b9b666aa966565378d537d64b5825d69 [formerly 6a3e6f599f
]]
Former-commit-id: f069830b986452675473f871e65551da025da1f1 [formerly e328b61d87
]
Former-commit-id: d4a29dace5
2012-07-31 08:36:27 -05:00
Ron Anderson
178c38c07f
Issue #851 removed obsolete GFE code.
...
Change-Id: I3713b0e265bec9e32cde3c20bc4dae12f6b20a02
Former-commit-id: b1a633e121
[formerly 74478728de
] [formerly 35d140f0fb
] [formerly b1a633e121
[formerly 74478728de
] [formerly 35d140f0fb
] [formerly d87c0b6c4b
[formerly 35d140f0fb
[formerly c91b6fc2c506096f37f175e8196f9aaeb356141d]]]]
Former-commit-id: d87c0b6c4b
Former-commit-id: 5a58fc89bf
[formerly 4459afa40c
] [formerly 6f790834b05690824c16344926fd96fe4133d97f [formerly 6b7f1b3611
]]
Former-commit-id: 7b388ba1db3d1ca217963cfd739fa1143fd98195 [formerly 251494458f
]
Former-commit-id: 12a02df51c
2012-07-30 15:34:16 -05:00
Steve Harris
a302427d08
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
...
Former-commit-id: e6f4b3f257
[formerly 302aa05586
] [formerly de9034c96c
] [formerly e6f4b3f257
[formerly 302aa05586
] [formerly de9034c96c
] [formerly 4688ac304f
[formerly de9034c96c
[formerly d2a398126648eaf391ddf39f99a77c0f40d08618]]]]
Former-commit-id: 4688ac304f
Former-commit-id: e9f4d5b474
[formerly f2ab9cfe1a
] [formerly 1e9f1a509a3a3df6aa114b32afd9c50a0af22853 [formerly b82d6772c3
]]
Former-commit-id: ff305413af3ce4f661aa49a1d08c099b45e855fc [formerly acfc6eff55
]
Former-commit-id: 05082b1d3a
2012-07-27 14:50:45 -05:00
Steve Harris
2e4db7ecaf
Merge branch 'master' (OB12.7.1-8) into development
...
Conflicts:
cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNSharpDescriptor.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPColorUtils.java
cave/com.raytheon.uf.viz.points/.classpath
cave/com.raytheon.uf.viz.points/.settings/org.eclipse.jdt.core.prefs
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicMaxValImageExtension.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/msgs/IGridHistoryUpdatedListener.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/DbParm.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridVectorResource.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/FloodReportDlg.java
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/WarningTextHandler.java
deltaScripts/.pydevproject
edexOsgi/build.edex/deploy-install.xml
edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/severeWeatherStatement.vm
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.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
edexOsgi/com.raytheon.uf.common.climo/.classpath
edexOsgi/com.raytheon.uf.common.climo/.project
edexOsgi/com.raytheon.uf.common.climo/com.raytheon.uf.common.climo.ecl
edexOsgi/com.raytheon.uf.common.climo/src/com/raytheon/uf/common/climo/IClimoQuery.java
edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPCacheRecord.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/Interpolation.java
edexOsgi/com.raytheon.uf.common.hlstopo/.classpath
edexOsgi/com.raytheon.uf.common.hlstopo/.project
edexOsgi/com.raytheon.uf.common.hlstopo/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
edexOsgi/com.raytheon.uf.common.hlstopo/com.raytheon.uf.common.hlstopo.ecl
edexOsgi/com.raytheon.uf.common.hlstopo/component-deploy.xml
edexOsgi/com.raytheon.uf.common.tafqueue/.classpath
edexOsgi/com.raytheon.uf.common.tafqueue/.project
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java
edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
edexOsgi/com.raytheon.uf.edex.tafqueue/.classpath
edexOsgi/com.raytheon.uf.edex.tafqueue/.project
edexOsgi/com.raytheon.uf.edex.tafqueue/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.uf.edex.tafqueue/com.raytheon.uf.edex.tafqueue.ecl
edexOsgi/com.raytheon.uf.edex.tafqueue/component-deploy.xml
edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/component-deploy.xml
nativeLib/rary.cots.jasper/jasper-1.900.1/ChangeLog
nativeLib/rary.cots.jasper/jasper-1.900.1/src/appl/dummy.c
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.classpath
ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.settings/org.eclipse.jdt.core.prefs
rpms/awips2-rpm.db
rpms/awips2.core/Installer.gfe/component.spec
rpms/awips2.core/Installer.ldm/component.spec
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
rpms/awips2.core/Installer.localapps-environment/scripts/profile.d/awips2Localapps.sh
rpms/awips2.core/Installer.rcm/scripts/conf/start-config
rpms/awips2.edex/deploy.builder/build.sh
rpms/build/release/buildCoreRPMs.sh
rpms/common/yum/arch.x86/comps.xml
tools/devAutoDeploy/devAutoDeploy.ecl
Former-commit-id: 7efcfa7d8d
[formerly 07c40a9c0c
] [formerly 56249c2611
] [formerly 7efcfa7d8d
[formerly 07c40a9c0c
] [formerly 56249c2611
] [formerly 587bb6a274
[formerly 56249c2611
[formerly b866ca00a3bbfc7edd9e941bd5f84699fc21b255]]]]
Former-commit-id: 587bb6a274
Former-commit-id: c18e221e26
[formerly 9e4df42326
] [formerly a41bc7cf63c74a535c86b4b885ed28af3223407b [formerly 2aa4114e4d
]]
Former-commit-id: b31a14d116ecfb9ad88c58315c24f622ad7bf245 [formerly d7540c958f
]
Former-commit-id: 84d0f1fbb6
2012-07-27 14:44:44 -05:00
Ben Steffensmeier
96a8764ecf
Issue #921 register GFEColorbarResource as a listener when recycling.
...
Change-Id: I21e990d4225b5bcf44aac6f2a3c4442442ec51b0
Former-commit-id: 23fa86c332
[formerly 7514bfd6cd
] [formerly e3cfa52237
] [formerly 23fa86c332
[formerly 7514bfd6cd
] [formerly e3cfa52237
] [formerly 044836cd2c
[formerly e3cfa52237
[formerly 90ce1b3643af750a19bc29156137f18848e7dc77]]]]
Former-commit-id: 044836cd2c
Former-commit-id: 3b989242c3
[formerly 97776790cb
] [formerly 861eca1c82baae5dd8124c5f8fb397c9bd50877e [formerly 6f9ec1af50
]]
Former-commit-id: 78f94b2986294769e3110668512f7752e84b7615 [formerly 37f4498d8c
]
Former-commit-id: c5b450e517
2012-07-24 11:29:51 -05:00
Ron Anderson
6c3d52e802
Issue #851 Fixed issues with DatabaseID.dateFormat
...
Change-Id: Ia5d99932059cec78074096e9ef08fa7b90b13e72
Former-commit-id: 8b897c2bb0
[formerly 21431b2693
] [formerly 1f2e581534
] [formerly 8b897c2bb0
[formerly 21431b2693
] [formerly 1f2e581534
] [formerly b52f1400ef
[formerly 1f2e581534
[formerly 1816e3f6c96b1064d52a2cbdf75ae02fb27e3693]]]]
Former-commit-id: b52f1400ef
Former-commit-id: 2c8ea61c9e
[formerly e184dceb91
] [formerly 5d6702b36fde41c8818de2db46efd10773b829e1 [formerly bc034e1863
]]
Former-commit-id: 1b1be3aa099270bdd102801560dcbb12663bbe96 [formerly bc519a7ce2
]
Former-commit-id: fceddcbedc
2012-07-23 16:49:21 -05:00
Steve Harris
23dc8deeb0
12.7.1-8 baseline
...
Former-commit-id: b242dd98d6
[formerly 11f96dbedd
] [formerly 16bf591a33
] [formerly b242dd98d6
[formerly 11f96dbedd
] [formerly 16bf591a33
] [formerly c42ae0fa39
[formerly 16bf591a33
[formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]]]
Former-commit-id: c42ae0fa39
Former-commit-id: e1eb7f5972
[formerly f2102bfb24
] [formerly 02bef853ef7c7fae6630b12e89ad4d9ef11bc391 [formerly 9f97182964
]]
Former-commit-id: 8c3889c2ea3f00fe58aa1f356c175dee2c28f99c [formerly 9aabe438b9
]
Former-commit-id: 36e2ad3023
2012-07-19 16:20:40 -05:00
Steve Harris
461e720c3e
Issue #817 - replacing files that were somehow lost between 12.6.1-9 and 12.6.1-10
...
These files have existing camel-cased equivalents and may not be needed.
Former-commit-id: a456af38fa
[formerly 8fff0d7e53
] [formerly 479ccdbed2
] [formerly a456af38fa
[formerly 8fff0d7e53
] [formerly 479ccdbed2
] [formerly 9454393d13
[formerly 479ccdbed2
[formerly b8e0e8d751a961c5ef25ab346be4b443aadf1291]]]]
Former-commit-id: 9454393d13
Former-commit-id: 1e747f0a42
[formerly 45ac1d4d51
] [formerly 7ed16a1e6561227172b77b9994e15bfb96164579 [formerly 330b9c3174
]]
Former-commit-id: fd07c26e5ac59302fff491238a67bd3c1240158d [formerly 19475ea67b
]
Former-commit-id: 1d367f861a
2012-07-10 09:29:33 -05:00
Steve Harris
c74431ba29
12.6.1-9 baseline
...
Former-commit-id: 32fdf6ed3b
[formerly 7c064b6868
] [formerly 2c0ff851ca
] [formerly 32fdf6ed3b
[formerly 7c064b6868
] [formerly 2c0ff851ca
] [formerly 27afa60345
[formerly 2c0ff851ca
[formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]]
Former-commit-id: 27afa60345
Former-commit-id: e528bb0df2
[formerly dc50bc8443
] [formerly 39c28d347eb5aeecbc48481fe6871268a89c0c2d [formerly 4f7bb90bb0
]]
Former-commit-id: 38b944b7b39fc0e1e6c5f5e0171cfa20b64068e4 [formerly d5fa61041b
]
Former-commit-id: 37f2b6e138
2012-07-10 07:53:49 -05:00
Max Schenkelberg
aa709bc1ce
Issue #626 Moved code from NPP branch in old repo to new common/core setup. Involved adding multichannel imagery code into new baseline. Cleaning up derived parameters to support more than just FloatDataRecords as well as search the full localization hierarchy contributing derived paramters and not just base/site/user files (NPP Derived parameters are in NPP plugin, not cave etc directory where all others reside). Also removed calls to deprecated useBuiltInColorBar function
...
Amend: Fixed Richard's comments
Change-Id: Ie406098bbc73fe6bf53bfb9bb103d7422c6c57d3
Former-commit-id: 3bff06cf92
[formerly 7d13c7d339
] [formerly 9bbb68a547
] [formerly 3bff06cf92
[formerly 7d13c7d339
] [formerly 9bbb68a547
] [formerly 98c2ec7dc5
[formerly 9bbb68a547
[formerly 9d3fd9e078c9c1a2995d2f8ebe4eca757b480050]]]]
Former-commit-id: 98c2ec7dc5
Former-commit-id: 58abd127b7
[formerly c6d324aaeb
] [formerly 16ed73fb714995ccf7fe67f7b63b429bcc378657 [formerly 7286b4e962
]]
Former-commit-id: 6353460f49cb2fb59cc8a8385f88fe8159290a8a [formerly d876190d68
]
Former-commit-id: 3325ed5deb
2012-07-06 16:01:47 -05:00
Ron Anderson
81ca8eb20b
Issue #851 Cleaned up dead code and unused dependencies in GFE.
...
Amend: Issue #851 resubmitting after accepting ticket
Change-Id: I8bef2701a845275bba148e9777f3cb161b056d6e
Former-commit-id: b4c02fd246
[formerly 936b2cabca
] [formerly ff5c7b7498
] [formerly b4c02fd246
[formerly 936b2cabca
] [formerly ff5c7b7498
] [formerly 59a3ebe8ba
[formerly ff5c7b7498
[formerly af1332170e28aed53ff91997ce089b20423203d5]]]]
Former-commit-id: 59a3ebe8ba
Former-commit-id: 68ddc7056d
[formerly 5186dcf321
] [formerly deb40e1efbb342a3a1a406a5b1b9de83925bea87 [formerly 0c5199ba03
]]
Former-commit-id: a1b6ce3f8769ead1b0af5fa0032511ac178d5176 [formerly b109c320ae
]
Former-commit-id: 147b2737f8
2012-07-05 15:39:05 -05:00
Bryan Kowal
57311c0029
Issue #813 - fix merge issues; update the edex features; corrected a problem in edexOsgi/com.raytheon.uf.edex.tafqueue/build.properties
...
Former-commit-id: 4ce58fa303
[formerly 873ee341f5
] [formerly 4acb1d8693
] [formerly 4ce58fa303
[formerly 873ee341f5
] [formerly 4acb1d8693
] [formerly 5fe8bd69f8
[formerly 4acb1d8693
[formerly 403599d216e643dba2fcae0883f32987c7bade3f]]]]
Former-commit-id: 5fe8bd69f8
Former-commit-id: ae096aef72
[formerly 3010c15a2a
] [formerly ecd3d8397c46ee4e729e87e7fd64f6413684adff [formerly 7d807fad71
]]
Former-commit-id: 07f687a4c072b6aeddb13cb0971a782861e30540 [formerly f3409d507f
]
Former-commit-id: 8da12f2c0d
2012-06-27 18:38:19 -05:00
Bryan Kowal
e05b247e3b
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 455d7b90a9
[formerly b1b294c401
] [formerly a33740e915
] [formerly b87b66abc5
[formerly a33740e915
[formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]]]
Former-commit-id: b87b66abc5
Former-commit-id: dfd75b4c72
[formerly b4917e6708
] [formerly 351fe6f4caaff528740139f88451b1dae35f0c83 [formerly 9a7d0492fe
]]
Former-commit-id: 0eec5560d9e68707684a8349e50debb048bda384 [formerly 611925412d
]
Former-commit-id: 2e5a850d28
2012-06-27 17:21:48 -05:00
Bryan Kowal
f21e18aaa1
12.6.1-10 baseline
...
Conflicts:
cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000-500_thkn.attr
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/ext/IImagingExtension.java
cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNSharpDescriptor.java
cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/rsc/D2DNSharpResource.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPTableCellData.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPColorUtils.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.uf.viz.npp.feature/com.raytheon.uf.viz.npp.feature.ecl
cave/com.raytheon.uf.viz.npp.viirs/.classpath
cave/com.raytheon.uf.viz.npp.viirs/.project
cave/com.raytheon.uf.viz.npp.viirs/.settings/org.eclipse.jdt.core.prefs
cave/com.raytheon.uf.viz.npp.viirs/com.raytheon.uf.viz.npp.viirs.ecl
cave/com.raytheon.uf.viz.python.swt/src/com/raytheon/uf/viz/python/swt/widgets/ScaleWidget.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/msgs/IGridHistoryUpdatedListener.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smartscript/FieldDefinition.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridVectorResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGribGridResource.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDataManager.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/AbstractRadarResource.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/WarningTextHandler.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWarningResource.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java
cots/org.jboss.cache/.project
deltaScripts/12.5.1/drop_gfe_tables.sh
edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactSevereWeatherStatement.vm
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscSendQueue.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscSendRecord.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/SendIscTransactions.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/ClimoDatabase.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/HLSTopoDatabase.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/TopoDatabase.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/lock/LockManager.java
edexOsgi/com.raytheon.edex.plugin.redbook/utility/edex_static/base/redbook/redbookFcstMap.xml
edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDB.java
edexOsgi/com.raytheon.uf.common.dataplugin.npp.viirs/.classpath
edexOsgi/com.raytheon.uf.common.dataplugin.npp.viirs/.project
edexOsgi/com.raytheon.uf.common.dataplugin.npp.viirs/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.uf.common.dataplugin.npp.viirs/build.properties
edexOsgi/com.raytheon.uf.common.dataplugin.npp.viirs/com.raytheon.uf.common.dataplugin.npp.viirs.ecl
edexOsgi/com.raytheon.uf.common.tafqueue/.classpath
edexOsgi/com.raytheon.uf.common.tafqueue/.project
edexOsgi/com.raytheon.uf.common.tafqueue/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/.classpath
edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/.project
edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/build.properties
edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/src/com/raytheon/uf/edex/plugin/npp/viirs/VIIRSSpatialMessageData.java
edexOsgi/com.raytheon.uf.edex.tafqueue/.classpath
edexOsgi/com.raytheon.uf.edex.tafqueue/.project
edexOsgi/com.raytheon.uf.edex.tafqueue/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.uf.edex.tafqueue/build.properties
edexOsgi/com.raytheon.uf.edex.tafqueue/component-deploy.xml
edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/gov.noaa.nws.ost.edex.plugin.regionalsat.ecl
edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/utility/cave_static/site/AFC/menus/satellite/regionalsat/baseRegionalComposite.xml
ncep/gov.noaa.nws.ncep.common.staticdata/.classpath
ncep/gov.noaa.nws.ncep.common.staticdata/.project
ncep/gov.noaa.nws.ncep.common.staticdata/.settings/org.eclipse.jdt.core.prefs
ncep/gov.noaa.nws.ncep.common.staticdata/build.properties
ncep/gov.noaa.nws.ncep.common.staticdata/gov.noaa.nws.ncep.common.staticdata.ecl
ncep/gov.noaa.nws.ncep.gempak.parameters.core/.project
ncep/gov.noaa.nws.ncep.gempak.parameters.core/.settings/org.eclipse.jdt.core.prefs
ncep/gov.noaa.nws.ncep.gempak.parameters.core/build.properties
ncep/gov.noaa.nws.ncep.gempak.parameters.core/gov.noaa.nws.ncep.gempak.parameters.core.ecl
ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metParameters/UncondProbOfTstorms2hr.java
ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/ClimDayTemp.java
ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/DayTempAnomaly.java
ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/HeightAboveSeaLevel.java
ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/NightTempAnomaly.java
ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/POP12HrsAnomaly.java
ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/UncondProbOfTstorms12hr.java
ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/UncondProbOfTstorms24hr.java
ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/UncondProbOfTstorms2hr.java
ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/UncondProbOfTstorms6hr.java
ncep/gov.noaa.nws.ncep.staticdataprovider/.classpath
ncep/gov.noaa.nws.ncep.staticdataprovider/.project
ncep/gov.noaa.nws.ncep.staticdataprovider/.settings/org.eclipse.jdt.core.prefs
ncep/gov.noaa.nws.ncep.staticdataprovider/gov.noaa.nws.ncep.staticdataprovider.ecl
ncep/gov.noaa.nws.ncep.viz.customProjection/.classpath
ncep/gov.noaa.nws.ncep.viz.customProjection/.project
ncep/gov.noaa.nws.ncep.viz.customProjection/gov.noaa.nws.ncep.viz.customProjection.ecl
rpms/awips2.core/Installer.ldm/component.spec
Change-Id: Ib8015bb11aef0561ff3b3bc426b51b5c8ee8ef4a
Former-commit-id: 687c8e9968
[formerly 072c88b382
] [formerly 4a17650914
] [formerly 687c8e9968
[formerly 072c88b382
] [formerly 4a17650914
] [formerly 53e5b7c491
[formerly 4a17650914
[formerly 9597fdac96022c94dad425367de23eafedad06bc]]]]
Former-commit-id: 53e5b7c491
Former-commit-id: 84d7454642
[formerly 6d2ca51c52
] [formerly cff125fdb6dd2f2050f98afac20ca59352640221 [formerly 62c7de6d3b
]]
Former-commit-id: cb7d3ce5625e79bff6eb725517fbfb48c3c44620 [formerly 718062f386
]
Former-commit-id: ee40decf54
2012-06-27 15:04:34 -05:00
David Gillingham
e8a7f74a21
Issue #766 : Merge VCModule refactor and Python globals memory leak fix to common baseline.
...
Former-commit-id: 4a32c3b1f1
[formerly 768afb8423
] [formerly 2a0ffc5311
] [formerly 4a32c3b1f1
[formerly 768afb8423
] [formerly 2a0ffc5311
] [formerly 672d7a2c31
[formerly 2a0ffc5311
[formerly 48c3d7d8c7cec6c7366705c9318ce35a46bd8b3d]]]]
Former-commit-id: 672d7a2c31
Former-commit-id: 716ad16f90
[formerly ca54365f87
] [formerly 75363efdd4a4ca39dfe3ce786fd71a0d72dd5a83 [formerly 235cf57de8
]]
Former-commit-id: a4b8a9c76b51306e605da964edc10bd137926ce7 [formerly b2629a6f41
]
Former-commit-id: 201e83898a
2012-06-26 17:49:06 -05:00
Max Schenkelberg
ac8314da2c
Issue #590 fixed context activation for GFE when non GFE views/editors are active. Generalized so any perspective can take advantage of it.
...
Change-Id: I98fa8bd80d2235d605f94f227490e4438ef70ca5
Former-commit-id: c1b95ef2c9
[formerly a691f425ea
] [formerly d0b06374e9
] [formerly c1b95ef2c9
[formerly a691f425ea
] [formerly d0b06374e9
] [formerly 130692aefd
[formerly d0b06374e9
[formerly 75fb17528d393b767df8d8a34abd5e41f007b771]]]]
Former-commit-id: 130692aefd
Former-commit-id: 3caff8171f
[formerly e8e159bed0
] [formerly a277ad161643ccdccd8ce94496000eaa48028c29 [formerly 859e041e10
]]
Former-commit-id: 45d916b2a8cce170d0a492d44295737178bab844 [formerly 34cb1fc585
]
Former-commit-id: ecc5316b44
2012-06-21 16:07:20 -05:00
Steve Harris
8080ea523b
12.6.1-10 baseline
...
Former-commit-id: a9742f306e
[formerly edac4d827c
] [formerly 8dc4a774e2
] [formerly a9742f306e
[formerly edac4d827c
] [formerly 8dc4a774e2
] [formerly 3cd0902b49
[formerly 8dc4a774e2
[formerly dd65e6d99709e0117519a1f2a2f02a41c8938d0e]]]]
Former-commit-id: 3cd0902b49
Former-commit-id: 7550311ef6
[formerly efe25edfad
] [formerly 1a8021953ed3a77781e285be5837377b59afd5e3 [formerly eacd5aeb7f
]]
Former-commit-id: 032c121c88e37cbeafabb63e30162517b2659626 [formerly df59dc7c44
]
Former-commit-id: 56f8cf00a8
2012-06-21 08:58:00 -05:00
Steve Harris
c7356570ae
Revert "12.6.1-10 baseline"
...
This reverts commit 8d09188a88
[formerly 95e7f4fc0c
] [formerly 86d53e7788dde0abd1f819349208edb1cf7464ba [formerly aecc6a8474
]] [formerly 530dfc0563
[formerly f8497470fc
] [formerly c1748a5eb25e81f51401dbad2116292ba34e48b2 [formerly b33c5bdfcf
]]] [formerly a2c0893d1a
] [formerly 16fd236f2d
[formerly 06f1c7b73c
] [formerly ddde63eee0
] [formerly 16fd236f2d
[formerly 06f1c7b73c
] [formerly ddde63eee0
] [formerly a2c0893d1a
[formerly ddde63eee0
[formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]]].
Former-commit-id: 584f7eddf8
[formerly 62cf6a9f92
] [formerly b4b1f6975f
] [formerly 584f7eddf8
[formerly 62cf6a9f92
] [formerly b4b1f6975f
] [formerly 25198a5cd6
[formerly b4b1f6975f
[formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]]]]
Former-commit-id: 25198a5cd6
Former-commit-id: 944e3148d4
[formerly 333fd9c64e
] [formerly 52c1eb5688c898376b24c6add0a2d1a4c3ff2981 [formerly 8367fb50f5
]]
Former-commit-id: 0bc0b7e1c450b6264ca8eb9457b80c79a047f13a [formerly 75f77df418
]
Former-commit-id: e77a15c047
2012-06-21 08:51:08 -05:00
Steve Harris
8d09188a88
12.6.1-10 baseline
...
Former-commit-id: 16fd236f2d
[formerly 06f1c7b73c
] [formerly ddde63eee0
] [formerly 16fd236f2d
[formerly 06f1c7b73c
] [formerly ddde63eee0
] [formerly a2c0893d1a
[formerly ddde63eee0
[formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]]
Former-commit-id: a2c0893d1a
Former-commit-id: 530dfc0563
[formerly f8497470fc
] [formerly c1748a5eb25e81f51401dbad2116292ba34e48b2 [formerly b33c5bdfcf
]]
Former-commit-id: 86d53e7788dde0abd1f819349208edb1cf7464ba [formerly aecc6a8474
]
Former-commit-id: 95e7f4fc0c
2012-06-21 08:38:48 -05:00
Max Schenkelberg
766144ed59
Issue #590 Fixed GFE colorbar when changing parms after setting up collaboration session. Needed to move adding of listeners to initInternal and not the constructor so recycling readds them after dispose removes them
...
Change-Id: Ieb5fc7786682b5b442deccf4a5292374a4a7de47
Former-commit-id: 509c5946d1
[formerly 81b6158c40
] [formerly ab871d218b
] [formerly 509c5946d1
[formerly 81b6158c40
] [formerly ab871d218b
] [formerly 61e0ea0516
[formerly ab871d218b
[formerly c0d7f68bed2b141240d2e2a695c8439f7a4ffa67]]]]
Former-commit-id: 61e0ea0516
Former-commit-id: ffb4dc36e6
[formerly 460a1179af
] [formerly 5a67be7c23dd5999c23928f27069f071fec4abbc [formerly 66a60a7b7b
]]
Former-commit-id: fc99eff9cc2bcf562a0c5e7c523cabeb0d860993 [formerly 77aef2db41
]
Former-commit-id: 379ca48057
2012-06-20 15:32:27 -05:00
Steve Harris
ec9204fa94
Merge branch 'ss_sync' (OB12.5.1-15) into 11-Collaboration
...
Conflicts:
cave/build/p2-build.xml
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/IGraphicsTarget.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/RotatePanelsHandler.java
cave/com.raytheon.uf.viz.radar.gl/src/com/raytheon/uf/viz/radar/gl/mosaic/GLMosaicImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
ncep/com.raytheon.uf.viz.ncep.core.feature/feature.xml
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/OutlookAttrDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/WatchFormatMsgDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/vaadialog/CcfpTimeDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/file/FileTools.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProdTypeDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProductConfigureDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/producttypes/ProdType.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/AbstractPgenDrawingTool.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenTextDrawingTool.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenWatchBoxAddDelCntyHandler.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/conditionalfilter/ConditionalFilterHelpDialog.java
Former-commit-id: 03383359f3
[formerly af6c0529ad
] [formerly 2f20a86a30
] [formerly 03383359f3
[formerly af6c0529ad
] [formerly 2f20a86a30
] [formerly 48860df690
[formerly 2f20a86a30
[formerly 9e83341a16b6e68f9bfe579dff60271553c3db82]]]]
Former-commit-id: 48860df690
Former-commit-id: 6c0d8be39e
[formerly d7a4853091
] [formerly 2439ad1c1bff354f69594e31d7a2a27f4fc21bc4 [formerly 27b50c57bd
]]
Former-commit-id: e4fb4019cc599080c632d3e4becfebc21fb21929 [formerly 2838ca117f
]
Former-commit-id: 70a928d039
2012-06-12 14:37:12 -05:00
Steve Harris
883d66bc46
12.6.1-5 baseline
...
Former-commit-id: 1ad64ffa98
[formerly 09f73b0601
] [formerly c99afab05f
] [formerly 1ad64ffa98
[formerly 09f73b0601
] [formerly c99afab05f
] [formerly 8947efbc7f
[formerly c99afab05f
[formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]]]]
Former-commit-id: 8947efbc7f
Former-commit-id: d5c94ccef2
[formerly b69fa75919
] [formerly 1cc870696aedf27ab003448e1146bd540b248a33 [formerly a945ed8e6d
]]
Former-commit-id: fc6eb550115880692c0f2fd68727ccec55d0eef7 [formerly 91e65230ad
]
Former-commit-id: 3b468d9f50
2012-06-11 16:23:47 -05:00
Steve Harris
581546a5eb
12.6.1-3 baseline
...
Former-commit-id: bc96eba820
[formerly 7c5306b795
] [formerly 42f3513175
] [formerly bc96eba820
[formerly 7c5306b795
] [formerly 42f3513175
] [formerly d57eb02b9e
[formerly 42f3513175
[formerly 2f4e12140a9b026770563eee58577b8aa2c041e1]]]]
Former-commit-id: d57eb02b9e
Former-commit-id: 471fa3ac04
[formerly 32c0464d79
] [formerly 3b70f39d074d5d11b45290eba7eec94d80be38de [formerly 1fdc0aa237
]]
Former-commit-id: 47799c2c228b75794e62bf6b17a80d2d42cdf2cc [formerly ca8baf18a3
]
Former-commit-id: 518fa79f7f
2012-06-11 16:23:47 -05:00
Steve Harris
46068c6716
12.5.1-15 baseline
...
Former-commit-id: 2f10c7a1e4
[formerly 8552902906
] [formerly b13cbb7e00
] [formerly 2f10c7a1e4
[formerly 8552902906
] [formerly b13cbb7e00
] [formerly 3904c4ccf5
[formerly b13cbb7e00
[formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 1f521a70b3
[formerly 97c4db937e
] [formerly 0e40eb424698bf43c230ac21347627590405fcb2 [formerly 676ea3192f
]]
Former-commit-id: 5dd364497cd5da1357297a4b842e962ad3d5e006 [formerly 9054c5ab6c
]
Former-commit-id: 39ff9954f8
2012-06-08 13:39:48 -05:00
Max Schenkelberg
66f0444b0e
Issue #697 Fixed session closing issues and null pointer in gfe
...
Change-Id: Id12a3a15616299aaff4bc6fec72b615f1d79ef10
Former-commit-id: f7dfbc11f1
[formerly 0adccb8b12
] [formerly 7d5d086fe1
] [formerly f7dfbc11f1
[formerly 0adccb8b12
] [formerly 7d5d086fe1
] [formerly 6a0ed72e5e
[formerly 7d5d086fe1
[formerly 695134c3139868d6e9ace9dca7757368e0bfa5ec]]]]
Former-commit-id: 6a0ed72e5e
Former-commit-id: e215aa65cb
[formerly 57af7d8bdc
] [formerly 6f71405b33f53ae3c5d3ed12feb49683cc8698c2 [formerly 70461db99f
]]
Former-commit-id: d8dfcdcfbdea7b43157fd7c71b22db70e211e8f5 [formerly 0eb6e89fb3
]
Former-commit-id: f3e91d1717
2012-06-07 09:44:40 -05:00
Matt Nash
62a48e041d
Issue #659 fix GFE issue with mouse handlers
...
Former-commit-id: 45cb41faed
[formerly 0e3b539ada
] [formerly c4d26f8b1b
] [formerly 45cb41faed
[formerly 0e3b539ada
] [formerly c4d26f8b1b
] [formerly ed0b70501f
[formerly c4d26f8b1b
[formerly 43f277de57d148c2d742266d8346b9b93cbcb82f]]]]
Former-commit-id: ed0b70501f
Former-commit-id: c4db1d3d30
[formerly fef4b5d8af
] [formerly be9d7bfb290d8dd29973c5e43b3df9db459cc72a [formerly e99cd89281
]]
Former-commit-id: 61ded76c1672a01b3af57a59569a51f7e230a4d7 [formerly 3d8f99e127
]
Former-commit-id: 96372489d4
2012-06-06 14:13:55 -05:00
Max Schenkelberg
cddce41572
Issue #590 Fixed gfe edit area selection issue
...
Change-Id: I67029301f515583a7ca3eea408513d9310e3fd35
Former-commit-id: d1f1f5106c
[formerly 2750c4ba08
] [formerly b8bedd1247
] [formerly d1f1f5106c
[formerly 2750c4ba08
] [formerly b8bedd1247
] [formerly fbd269f4c7
[formerly b8bedd1247
[formerly 6588f58c80782f793c3621a2fd7ec81be2d1ead2]]]]
Former-commit-id: fbd269f4c7
Former-commit-id: a5ad37d88e
[formerly 66f39cc77b
] [formerly 48f93d8d755b8432050fe2aca67e0fe5ae3bf206 [formerly 13bd18829f
]]
Former-commit-id: 0815beac2fd99ee771fd42e46ff1d4c6d3489bae [formerly c6ebaebf1a
]
Former-commit-id: 7296fc3a91
2012-06-06 12:05:47 -05:00
Max Schenkelberg
00ec4036a7
Issue #590 fixed GFE session creation bugs. Added refresh to tool items
...
on undo/redo from keyboard
Former-commit-id: 603726498f
[formerly f0e2ef8c91
] [formerly b5da470e0a
] [formerly 603726498f
[formerly f0e2ef8c91
] [formerly b5da470e0a
] [formerly 8b87b6a0a1
[formerly b5da470e0a
[formerly 5c3d4a7fffe3873afbe8db60310afae2b3f0738b]]]]
Former-commit-id: 8b87b6a0a1
Former-commit-id: 4fe4709862
[formerly af72c6411a
] [formerly 1b3f753ea0cf2015ee33e8f1e26d5a3ddf66eec2 [formerly a6ca2ee4f6
]]
Former-commit-id: b94f4e93217e51045854356a11935c614f1c67fc [formerly 55949aef25
]
Former-commit-id: 4618dc9b94
2012-06-05 16:43:27 -05:00
Max Schenkelberg
cf35b993e2
Issue #239 Moved initialization code in GFE resources so recycle() works properly
...
Change-Id: I3a4e1f18a7246af504a6d1ce791bd94ab1f721d5
Former-commit-id: 2374bc2d88
[formerly 4c0a18894c
] [formerly e81a9ee935
] [formerly 2374bc2d88
[formerly 4c0a18894c
] [formerly e81a9ee935
] [formerly 52a78af98c
[formerly e81a9ee935
[formerly 1f092691e6e43bd8f6d10c2b8fab0a68eca38992]]]]
Former-commit-id: 52a78af98c
Former-commit-id: 7c014c9fbe
[formerly da46b6efc0
] [formerly 2583d28f688819b8221f8f2dd83602f8e821e9da [formerly 7b7e708092
]]
Former-commit-id: c4d37a6c123268080cd08ec3650c858729cfd260 [formerly 4e9971aac6
]
Former-commit-id: 2d9ccfe9ce
2012-05-22 09:56:27 -05:00
Steve Harris
17403e71d1
12.5.1-9 baseline
...
Former-commit-id: 45773fbee0
[formerly b8de76b45e
] [formerly 8f3c9ebfb7
] [formerly 45773fbee0
[formerly b8de76b45e
] [formerly 8f3c9ebfb7
] [formerly 1f542697cb
[formerly 8f3c9ebfb7
[formerly 25a4d3ed99c4be73a118b92c230c6365b65b56eb]]]]
Former-commit-id: 1f542697cb
Former-commit-id: dbedcc229c
[formerly d23b0e4d60
] [formerly 7f45c65c47eed82c8ae433d59f2e859d5e1df5a0 [formerly ce0422a34a
]]
Former-commit-id: 6decc15480698e9232071e71afd1e40f6e166fd7 [formerly 399c00d295
]
Former-commit-id: ee7b53c7c4
2012-05-21 17:48:55 -05:00
Steve Harris
e460104ec9
12.5.1-6 baseline
...
Former-commit-id: ba6d779949
[formerly df80148db6
] [formerly 24474489f9
] [formerly ba6d779949
[formerly df80148db6
] [formerly 24474489f9
] [formerly fa87dc6cf1
[formerly 24474489f9
[formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]]]]
Former-commit-id: fa87dc6cf1
Former-commit-id: bc695ee025
[formerly 4792884ab2
] [formerly 0fa00c0acf0db00500f5839edb5595f4cd6535d5 [formerly c452cce633
]]
Former-commit-id: 61f9f0b1d1e0d73dbd8918f64faa0a6bc9672dfa [formerly 2738af2019
]
Former-commit-id: 26ed02c3dc
2012-05-16 16:41:22 -05:00
Nate Jensen
8fa91d1e98
Issue #590 Fix rsc so it can be recycled
...
Change-Id: I3cddf5d67c2e5dfb52380529f703a0d9558d8916
Former-commit-id: 853a83c753
[formerly fbd4b64be8
] [formerly 798463a4cf
] [formerly 853a83c753
[formerly fbd4b64be8
] [formerly 798463a4cf
] [formerly 78c1298085
[formerly 798463a4cf
[formerly cd52bfbeb593a4b1891f4df7f7ae73c7193504d0]]]]
Former-commit-id: 78c1298085
Former-commit-id: 4138e24a59
[formerly 536d47dcf0
] [formerly cfaa15df4d58a67c84a557ac50103581eb95cead [formerly 7be5ef8528
]]
Former-commit-id: 90f78d117fa659376aed5bffe80c3ed5fd663263 [formerly 814be4f5c8
]
Former-commit-id: b43cbc5bbb
2012-05-11 10:04:36 -05:00
Steve Harris
c76fddc7e4
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 bcc12e03ed
[formerly 572e1bb476
] [formerly 27bc369818
] [formerly 58037cb5d1
[formerly 27bc369818
[formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]]]
Former-commit-id: 58037cb5d1
Former-commit-id: 43f936900c
[formerly 9c9e01dbda
] [formerly ec875d4e25b0d41a71abbea662364ddefd6fe144 [formerly 63ea8599d7
]]
Former-commit-id: c26989a65231e5bf4f604b7a06a750251f0cd612 [formerly 7978d3b640
]
Former-commit-id: 1d2ad9224a
2012-05-09 13:14:00 -05:00