Issue #2251 cleanup of moving style rules and fix an ncep project

Change-Id: I625a2f919be6b4f2a649addaf62aa1fa948e4739

Former-commit-id: 89d251ef64 [formerly b60db8dd8b [formerly aa426e18a0be68455a600b641074130b0bb1f9cb]]
Former-commit-id: b60db8dd8b
Former-commit-id: 4799f1b69f

cave/com.raytheon.uf.viz.core.feature/feature.xml

@@ -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>

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

@@ -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 {

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

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

edexOsgi/com.raytheon.uf.common.base.feature/feature.xml

@@ -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>

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

@@ -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 INSTRUMENT = "instrument";
-//
+    //
-//    private static final String WAVELENGTH = "wavelength";
+    // private static final String WAVELENGTH = "wavelength";
-//
+    //
-//    private static final String INT_TIME = "intTime";
+    // 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() ) {
+        if (!rscdata.getInstrument().isEmpty()) {
-            criteria.setInstrument( rscdata.getInstrument() );
+            criteria.setInstrument(rscdata.getInstrument());
         }
 
-        if( !rscdata.getWavelength().isEmpty() ) {
+        if (!rscdata.getWavelength().isEmpty()) {
-            criteria.setWavelength( rscdata.getWavelength() );
+            criteria.setWavelength(rscdata.getWavelength());
         }
 
-        if( !rscdata.getIntTime().isEmpty() ) {
+        if (!rscdata.getIntTime().isEmpty()) {
-            criteria.setIntTime( rscdata.getIntTime() );    
+            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)) {
+             * if (detector != null &&
-                rval++;
+             * detector.equalsIgnoreCase(criteria.detector)) { rval++; }
-            }*/
+             */
         }
         return rval;
     }

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

@@ -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

ncep/gov.noaa.nws.ncep.viz.timeseries/src/gov/noaa/nws/ncep/viz/timeseries/GeoMagTimeSeriesAdapter.java

@@ -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;