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

Merge "Issue #2251 cleanup of moving style rules and fix an ncep project" into development

Browse source 
Former-commit-id: b209f87199 [formerly ec7e5d011d1638b1dec62ca43ae9b8b45a41beb6]
Former-commit-id: d63abcb6a8
This commit is contained in:
Nate Jensen 2013-09-10 12:17:13 -05:00 • committed by Gerrit Code Review
commit f6d30d15f2
7 changed files with 28 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cave/com.raytheon.uf.viz.core.feature/feature.xml
View file

@ -198,12 +198,4 @@
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="com.raytheon.uf.common.style"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>

2
cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/style/VIIRSDataMatchCriteria.java
View file

@ -66,7 +66,7 @@ public class VIIRSDataMatchCriteria extends MatchCriteria {
* (non-Javadoc)
*
* @see com.raytheon.uf.common.style.MatchCriteria#matches(com.raytheon
* .uf. viz.core.style.MatchCriteria)
* .uf.common.style.MatchCriteria)
*/
@Override
public int matches(MatchCriteria aCriteria) throws StyleException {

5
cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/style/VIIRSDataRecordCriteria.java
View file

@ -60,9 +60,8 @@ public class VIIRSDataRecordCriteria extends MatchCriteria {
/*
* (non-Javadoc)
*
* @see
* com.raytheon.uf.common.style.MatchCriteria#matches(com.raytheon.uf.
* viz.core.style.MatchCriteria)
* @see com.raytheon.uf.common.style.MatchCriteria#matches(com.raytheon.uf.
* common.style.MatchCriteria)
*/
@Override
public int matches(MatchCriteria aCriteria) throws StyleException {

6
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
View file

@ -393,4 +393,10 @@
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.style"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>

33
ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/display/SolarImageMatchCriteria.java
View file

@ -29,16 +29,15 @@ import javax.xml.bind.annotation.XmlRootElement;
import com.raytheon.uf.common.style.MatchCriteria;
import com.raytheon.uf.common.style.StyleException;
@XmlAccessorType(XmlAccessType.NONE)
@XmlRootElement(name = "solarImageMatches")
public class SolarImageMatchCriteria extends MatchCriteria {
// private static final String INSTRUMENT = "instrument";
//
// private static final String WAVELENGTH = "wavelength";
//
// private static final String INT_TIME = "intTime";
// private static final String INSTRUMENT = "instrument";
//
// private static final String WAVELENGTH = "wavelength";
//
// private static final String INT_TIME = "intTime";
@XmlElement
private String instrument;
@ -57,16 +56,16 @@ public class SolarImageMatchCriteria extends MatchCriteria {
SolarImageMatchCriteria criteria = new SolarImageMatchCriteria();
if( !rscdata.getInstrument().isEmpty() ) {
criteria.setInstrument( rscdata.getInstrument() );
if (!rscdata.getInstrument().isEmpty()) {
criteria.setInstrument(rscdata.getInstrument());
}
if( !rscdata.getWavelength().isEmpty() ) {
criteria.setWavelength( rscdata.getWavelength() );
if (!rscdata.getWavelength().isEmpty()) {
criteria.setWavelength(rscdata.getWavelength());
}
if( !rscdata.getIntTime().isEmpty() ) {
criteria.setIntTime( rscdata.getIntTime() );
if (!rscdata.getIntTime().isEmpty()) {
criteria.setIntTime(rscdata.getIntTime());
}
return criteria;
@ -76,7 +75,7 @@ public class SolarImageMatchCriteria extends MatchCriteria {
* (non-Javadoc)
*
* @see com.raytheon.uf.common.style.MatchCriteria#matches(com.raytheon
* .uf. viz.core.style.MatchCriteria)
* .uf.common.style.MatchCriteria)
*/
@Override
public int matches(MatchCriteria aCriteria) throws StyleException {
@ -96,10 +95,10 @@ public class SolarImageMatchCriteria extends MatchCriteria {
&& wavelength.equalsIgnoreCase(criteria.wavelength)) {
rval++;
}
/*if (detector != null
&& detector.equalsIgnoreCase(criteria.detector)) {
rval++;
}*/
/*
* if (detector != null &&
* detector.equalsIgnoreCase(criteria.detector)) { rval++; }
*/
}
return rval;
}

3
ncep/gov.noaa.nws.ncep.viz.timeseries/META-INF/MANIFEST.MF
View file

@ -18,6 +18,7 @@ Require-Bundle: org.eclipse.ui,
gov.noaa.nws.ncep.common.dataplugin.geomag;bundle-version="1.0.0",
org.geotools;bundle-version="2.6.4",
com.raytheon.viz.core;bundle-version="1.12.1174",
com.raytheon.uf.viz.xy;bundle-version="1.12.1174"
com.raytheon.uf.viz.xy;bundle-version="1.12.1174",
com.raytheon.uf.common.style;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6

2
ncep/gov.noaa.nws.ncep.viz.timeseries/src/gov/noaa/nws/ncep/viz/timeseries/GeoMagTimeSeriesAdapter.java
View file

@ -9,9 +9,9 @@ import javax.measure.unit.SI;
import javax.measure.unit.Unit;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.style.level.SingleLevel;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.style.level.SingleLevel;
import com.raytheon.uf.viz.xy.timeseries.adapter.AbstractTimeSeriesAdapter;
import com.raytheon.viz.core.graphing.xy.XYData;
import com.raytheon.viz.core.graphing.xy.XYDataList;