xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #628 Backing out PGEN changes with remote target checking

Browse source 
Former-commit-id: 4e629cc7e4 [formerly 4e629cc7e4 [formerly b5babbb4b852c83680b93b35311d14297f41532e]]
Former-commit-id: 0db325a1cd
Former-commit-id: aeaf7d922b
This commit is contained in:
Brad Gonzales 2012-05-16 14:43:53 -05:00
parent bb04dccd7b
commit 6a7397b0f6
4 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ncep/gov.noaa.nws.ncep.ui.pgen/META-INF/MANIFEST.MF
View file

@ -40,10 +40,8 @@ Export-Package: gov.noaa.nws.ncep.ui.pgen,
gov.noaa.nws.ncep.ui.pgen.tools
Import-Package: com.raytheon.edex.meteoLib,
gov.noaa.nws.ncep.viz.localization,
com.raytheon.uf.viz.remote.graphics,
com.raytheon.viz.core.gl,
com.raytheon.viz.core.gl.images,
gov.noaa.nws.ncep.common.staticdata,
gov.noaa.nws.ncep.staticdataprovider,
javax.measure.unit
Bundle-ClassPath: .

2
ncep/gov.noaa.nws.ncep.ui.pgen/plugin.xml
View file

@ -510,7 +510,7 @@
<view
category="gov.noaa.nws.ncep.viz.ui.nmap"
allowMultiple="false"
restorable="false"
restorable="true"
class="gov.noaa.nws.ncep.ui.pgen.palette.PgenPaletteWindow"
id="gov.noaa.nws.ncep.ui.PGEN"
name="PGEN"/>

7
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/PgenStaticDataProvider.java
View file

@ -3,7 +3,6 @@ package gov.noaa.nws.ncep.ui.pgen;
import org.osgi.framework.ServiceReference;
import gov.noaa.nws.ncep.common.staticdata.IStaticDataProvider;
import gov.noaa.nws.ncep.staticdataprovider.StaticDataProvider;
public class PgenStaticDataProvider {
@ -14,12 +13,6 @@ public class PgenStaticDataProvider {
ServiceReference ref = Activator.getDefault().getBundle().getBundleContext().getServiceReference(
IStaticDataProvider.class.getName());
if (ref == null) {
// cause the classloader to load StaticDataProvided and thus to
// call the Activator for gov.noaa.nws.ncep.staticdataprovider.
StaticDataProvider.getInstance();
ref = Activator.getDefault().getBundle().getBundleContext().getServiceReference(IStaticDataProvider.class.getName());
}
IStaticDataProvider isdp = null;
if(ref != null
&& (isdp = (IStaticDataProvider)Activator.getDefault().getBundle().getBundleContext().getService(ref) )!= null ) {

6
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/rsc/PgenResource.java
View file

@ -75,7 +75,6 @@ import com.raytheon.uf.viz.core.rsc.AbstractVizResource;
import com.raytheon.uf.viz.core.rsc.IResourceDataChanged;
import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.rsc.ResourceList.RemoveListener;
import com.raytheon.uf.viz.remote.graphics.DispatchGraphicsTarget;
import com.raytheon.viz.core.gl.IGLTarget;
import com.raytheon.viz.ui.editor.AbstractEditor;
import com.vividsolutions.jts.geom.Coordinate;
@ -717,10 +716,7 @@ public class PgenResource extends AbstractVizResource<PgenResourceData,MapDescri
*/
private void drawGhost( IGraphicsTarget target, PaintProperties paintProps,
DisplayElementFactory df ){
if (target instanceof DispatchGraphicsTarget) {
// Ensure ghosting is painted to our own target only
target = ((DispatchGraphicsTarget) target).getWrappedObject();
}
df.setLayerDisplayAttr( false, null, false );
Iterator<DrawableElement> iterator = ghost.createDEIterator();