Commit graph

27 commits

Author SHA1 Message Date
Max Schenkelberg
4c0a18894c Issue #239 Moved initialization code in GFE resources so recycle() works properly
Change-Id: I3a4e1f18a7246af504a6d1ce791bd94ab1f721d5

Former-commit-id: 52a78af98c [formerly 1f092691e6e43bd8f6d10c2b8fab0a68eca38992]
Former-commit-id: e81a9ee935
2012-05-22 09:56:27 -05:00
Nate Jensen
fbd4b64be8 Issue #590 Fix rsc so it can be recycled
Change-Id: I3cddf5d67c2e5dfb52380529f703a0d9558d8916

Former-commit-id: 78c1298085 [formerly cd52bfbeb593a4b1891f4df7f7ae73c7193504d0]
Former-commit-id: 798463a4cf
2012-05-11 10:04:36 -05:00
Steve Harris
572e1bb476 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: 58037cb5d1 [formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]
Former-commit-id: 27bc369818
2012-05-09 13:14:00 -05:00
Steve Harris
4bfbdad17d 12.4.1-10 baseline
Former-commit-id: 8485b90ff8 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]
Former-commit-id: 9f8cb727a5
2012-05-01 18:06:13 -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
Max Schenkelberg
a5fa19c914 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: 6812c1ba2b [formerly c7badfd1c2a77d410cd3b841fef967c07c9e6434]
Former-commit-id: cbe92bdf32
2012-04-06 10:23:24 -05:00
Max Schenkelberg
48ca9ca105 Issue #239 Added remote capability injection code through factory
method. Cleaned up old/unmaintained 3D references

Former-commit-id: 16056d53c5 [formerly e3b171f34fb7610f4f5796d0dcdf32f7a298c8ca]
Former-commit-id: 54aaf05209
2012-04-05 13:52:20 -05: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
Steve Harris
0665862abe Merge branch 'sync_test' (VCModules) into ss_sync
Former-commit-id: a0abcf8120 [formerly e68338cecbe85a62835633e9aba0925344fb80f1]
Former-commit-id: 70357d90bc
2012-03-29 10:03:05 -05:00
David Gillingham
1908212c27 Issue #354: Refactor AbstractParmManager to better handle ISC parm
pre-loading.

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

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

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

Former-commit-id: 85998bc654 [formerly 67aaf1c21e8372b4a84cb82cae62549502992651]
Former-commit-id: 32b2c06988
2012-02-23 13:23:59 -06:00
Steve Harris
4981170462 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: 86e586befe [formerly 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637]
Former-commit-id: dcadf7baa4
2012-02-23 12:38:55 -06:00
Steve Harris
92084b3f20 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: 7a10ca9766 [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]
Former-commit-id: d0bbbfefcc
2012-02-23 10:06:18 -06:00
Steve Harris
8da36046de Merging SS OB12.2.1 into ss_sync
Former-commit-id: 54be9660f1 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]
Former-commit-id: c8aae98741
2012-02-22 11:14:43 -06:00
Steve Harris
d971880b98 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: 5e9d2dd367 [formerly f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce]
Former-commit-id: cabf9fd956
2012-02-20 13:03:39 -06:00
Steve Harris
a2fd2cf6fa Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked
Former-commit-id: d02529fef4 [formerly ad74b15c5cab1f5275521f18ee67d30f199a8f95]
Former-commit-id: 6a064cb78b
2012-02-20 12:54:25 -06:00
Steve Harris
c268da57bc Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
Former-commit-id: cc66c8be24 [formerly a998a29e2f756ffc583eac04a884dcf9aae585e8]
Former-commit-id: 4b76d22f77
2012-02-20 12:43:38 -06:00
Steve Harris
c209d6de36 Manual merge of SS OB12.1.2-4 changes into ss_sync
Former-commit-id: b137302802 [formerly 0ccca40d35e50072218a1da1db474075f8ad0393]
Former-commit-id: 93f6535bd8
2012-02-17 10:55:02 -06:00
Steve Harris
695e2979c3 Merge branch '10-Tech_Blocked' into 104-integration
Former-commit-id: f693b6d0a7 [formerly d31ccf5832bf2b2ccfe29126deb4da80806c6739]
Former-commit-id: 1002555dbd
2012-02-09 08:54:18 -06:00
Max Schenkelberg
c410a4eb33 Issue #206 Made tear off menu dialog activate contexts for perspective
Former-commit-id: e422b13ded [formerly 56103eb133de5325d62bb3453b2353e5d5e23ddd]
Former-commit-id: 5f8d30bb43
2012-02-01 17:03:20 -06:00
Ben Steffensmeier
138b4de82f Issue #227 enhanced caching of maps for thin client
Change-Id: Ib2c6665d1725bcfde70be6ed5a490e68115c6b94

Former-commit-id: 9b78596436 [formerly 067ba5b7d28174d99119d5bf87a28334578f78dd]
Former-commit-id: 0617773c79
2012-01-31 10:53:10 -06:00
Matt Nash
892cb9a7ae Issue #26 add tear off code to git baseline
Former-commit-id: 4286cb0342 [formerly dedac216cfa51bd413f7c4d1f7db5ee8ce665866]
Former-commit-id: cf4e1f764e
2012-01-25 12:50:31 -06: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