Commit graph

381 commits

Author SHA1 Message Date
Steve Harris
8f3c9ebfb7 12.5.1-9 baseline
Former-commit-id: 25a4d3ed99c4be73a118b92c230c6365b65b56eb
2012-05-21 17:48:55 -05:00
Steve Harris
24474489f9 12.5.1-6 baseline
Former-commit-id: a75af2f0de38d65dcbbd919e159c3b0a268fc245
2012-05-16 16:41:22 -05:00
Nate Jensen
798463a4cf Issue #590 Fix rsc so it can be recycled
Change-Id: I3cddf5d67c2e5dfb52380529f703a0d9558d8916

Former-commit-id: cd52bfbeb593a4b1891f4df7f7ae73c7193504d0
2012-05-11 10:04:36 -05:00
Steve Harris
27bc369818 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: 8f71c807be1d604cea51ab522f04f8bbf8c11f83
2012-05-09 13:14:00 -05:00
Steve Harris
84d191e7b6 12.5.1-2 baseline
Former-commit-id: ff847bf86803a485212f08a098be13bc3d83b0b8
2012-05-03 19:17:13 -05:00
Steve Harris
9f8cb727a5 12.4.1-10 baseline
Former-commit-id: bf53d06834caa780226121334ac1bcf0534c3f16
2012-05-01 18:06:13 -05:00
Steve Harris
704b75e1a1 12.4.1-10 baseline
Former-commit-id: 5bd6393d7577e5625c6c85b7fe5e7beb9f8c477a
2012-04-24 15:38:29 -05:00
Steve Harris
90ae4bbb36 12.4.1-7 baseline
Former-commit-id: 3524730cc38b5420e7529b5a75d62313695e64d6
2012-04-24 15:24:39 -05:00
Steve Harris
67a5a68300 12.4.1-4 baseline
Former-commit-id: ad648deaf4d3edaabdda15184289b3a927308bd7
2012-04-18 15:18:16 -05:00
Max Schenkelberg
cbe92bdf32 Issue #239 Fixed D2D context activation so as not to override important
keys when a unrelated view is active such as Product Browser or
Collaboration views.

Former-commit-id: c7badfd1c2a77d410cd3b841fef967c07c9e6434
2012-04-06 10:23:24 -05:00
Max Schenkelberg
54aaf05209 Issue #239 Added remote capability injection code through factory
method. Cleaned up old/unmaintained 3D references

Former-commit-id: e3b171f34fb7610f4f5796d0dcdf32f7a298c8ca
2012-04-05 13:52:20 -05:00
Steve Harris
4068f5295f 12.3.1-10 baseline
Former-commit-id: 7d62bca046401a670ef7bd917cbcbb073e061b60
2012-03-30 08:38:33 -05:00
Steve Harris
70357d90bc Merge branch 'sync_test' (VCModules) into ss_sync
Former-commit-id: e68338cecbe85a62835633e9aba0925344fb80f1
2012-03-29 10:03:05 -05:00
David Gillingham
d68e3a7eea Issue #354: Refactor AbstractParmManager to better handle ISC parm
pre-loading.

Former-commit-id: e2c66b33fd8c71b0da6518c419296ab8141a07e3
2012-03-05 11:23:11 -06:00
David Gillingham
f6f0ca24df Issue #346: Convert GFE to use identity-based ListenerLists, increase
synchronization in Parm/VCParm to prevent leaking of VCParms through
ListenerLists.

Former-commit-id: 5fc74409511903afa97949bc3cd1b3acf91c35e0
2012-03-02 13:22:46 -06:00
Steve Harris
951ecfe3dd Merge branch 'ss_sync' into sync_test
Former-commit-id: 7ebcf63686d75d58f8bfea92e825edaf49a30df1
2012-03-01 14:01:16 -06:00
David Gillingham
d79f7e9613 Issue #346: Create a dispose method for Parm and use it like AWIPS1's C++ destructor.
Change-Id: I2e8a4e82d5efd210e546abbaf8c0aba960803a9d

Former-commit-id: b6d7661be725d8a37a8294b0eda982208c35ecbe
2012-02-23 14:40:25 -06:00
David Gillingham
32b2c06988 Issue #346: Fix disappearing ISC data from VCParms, fix threading issues in Scalar/Vector pickup value dialogs.
Change-Id: If465b8daf5ef04a76084500425ac3114a48ab908

Former-commit-id: 67aaf1c21e8372b4a84cb82cae62549502992651
2012-02-23 13:23:59 -06:00
Steve Harris
dcadf7baa4 Merge branch '4-Thin_Client' (with OB12.2.1) into 104-integration
Conflicts:
	edexOsgi/build.edex/deploy-install.xml

Seems to have solved itself or was not actually a conflict


Former-commit-id: 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637
2012-02-23 12:38:55 -06:00
Steve Harris
d0bbbfefcc Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client
Conflicts:
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/H5UairPlotInfoRetriever.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java

deleted 'H5U; PlotResource2.java was not edited


Former-commit-id: 5528a1374781f3a4d55702ae1f0c34efcf1e3865
2012-02-23 10:06:18 -06:00
Steve Harris
c8aae98741 Merging SS OB12.2.1 into ss_sync
Former-commit-id: 60f30af0c9e3203e2ff623d420165201dff41601
2012-02-22 11:14:43 -06:00
Steve Harris
cabf9fd956 Merge branch '10-Tech_Blocked' into 104-integration
Conflicts:
	edexOsgi/build.edex/deploy-install.xml
	rpms/awips2.edex/Installer.edex-cots/component.spec

Former-commit-id: f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce
2012-02-20 13:03:39 -06:00
Steve Harris
6a064cb78b Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked
Former-commit-id: ad74b15c5cab1f5275521f18ee67d30f199a8f95
2012-02-20 12:54:25 -06:00
Steve Harris
4b76d22f77 Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
Former-commit-id: a998a29e2f756ffc583eac04a884dcf9aae585e8
2012-02-20 12:43:38 -06:00
Steve Harris
93f6535bd8 Manual merge of SS OB12.1.2-4 changes into ss_sync
Former-commit-id: 0ccca40d35e50072218a1da1db474075f8ad0393
2012-02-17 10:55:02 -06:00
Steve Harris
1002555dbd Merge branch '10-Tech_Blocked' into 104-integration
Former-commit-id: d31ccf5832bf2b2ccfe29126deb4da80806c6739
2012-02-09 08:54:18 -06:00
Max Schenkelberg
5f8d30bb43 Issue #206 Made tear off menu dialog activate contexts for perspective
Former-commit-id: 56103eb133de5325d62bb3453b2353e5d5e23ddd
2012-02-01 17:03:20 -06:00
Ben Steffensmeier
0617773c79 Issue #227 enhanced caching of maps for thin client
Change-Id: Ib2c6665d1725bcfde70be6ed5a490e68115c6b94

Former-commit-id: 067ba5b7d28174d99119d5bf87a28334578f78dd
2012-01-31 10:53:10 -06:00
Matt Nash
cf4e1f764e Issue #26 add tear off code to git baseline
Former-commit-id: dedac216cfa51bd413f7c4d1f7db5ee8ce665866
2012-01-25 12:50:31 -06:00
Matt Nash
66be3bec40 Moving 12.1.1 into ss_sync
Former-commit-id: 2a9569942c48542cf708b6c0b9189146fd954c11
2012-01-19 11:53:12 -06:00
root
9f19e3f712 Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f
2012-01-06 08:55:05 -06:00