< prev index next >

application/org.openjdk.jmc.flightrecorder.ext.jfx/src/main/java/org/openjdk/jmc/flightrecorder/ext/jfx/JfxConstants.java

Print this page

        

@@ -30,43 +30,45 @@
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
  * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package org.openjdk.jmc.flightrecorder.ext.jfx;
 
-import java.awt.Color;
-
 import org.openjdk.jmc.common.item.Aggregators;
 import org.openjdk.jmc.common.item.Attribute;
 import org.openjdk.jmc.common.item.IAggregator;
 import org.openjdk.jmc.common.item.IAttribute;
 import org.openjdk.jmc.common.item.IItemFilter;
 import org.openjdk.jmc.common.item.ItemFilters;
 import org.openjdk.jmc.common.unit.IQuantity;
 import org.openjdk.jmc.common.unit.UnitLookup;
 import org.openjdk.jmc.flightrecorder.JfrAttributes;
 
-public class JfxConstants {
+final class JfxConstants {
 
-        static final String JFX_PULSE_ID = "http://www.oracle.com/technetwork/java/javafx/index.html/javafx/pulse"; //$NON-NLS-1$
-        static final String JFX_INPUT_ID = "http://www.oracle.com/technetwork/java/javafx/index.html/javafx/input"; //$NON-NLS-1$
+        static final String TYPE_ID_PULSE_PHASE_8 = "http://www.oracle.com/technetwork/java/javafx/index.html/javafx/pulse"; //$NON-NLS-1$
+        static final String TYPE_ID_INPUT_8 = "http://www.oracle.com/technetwork/java/javafx/index.html/javafx/input"; //$NON-NLS-1$
+        static final String TYPE_ID_PULSE_PHASE_12 = "javafx.PulsePhase"; //$NON-NLS-1$
+        static final String TYPE_ID_INPUT_12 = "javafx.Input"; //$NON-NLS-1$
 
         static final String JFX_RULE_PATH = "javaFx"; //$NON-NLS-1$
 
-        static final Color PULSE_ID_COLOR = new Color(0xE37A44);
-
-        static final IItemFilter JFX_PULSE_FILTER = ItemFilters.type(JFX_PULSE_ID);
-        static final IItemFilter JFX_INPUT_FILTER = ItemFilters.type(JFX_INPUT_ID);
+        static final IItemFilter JFX_PULSE_FILTER = ItemFilters.or(ItemFilters.type(TYPE_ID_PULSE_PHASE_8), ItemFilters.type(TYPE_ID_PULSE_PHASE_12));
+        static final IItemFilter JFX_INPUT_FILTER = ItemFilters.or(ItemFilters.type(TYPE_ID_INPUT_8), ItemFilters.type(TYPE_ID_INPUT_12));
 
         static final IItemFilter JFX_FILTER = ItemFilters.or(JFX_INPUT_FILTER, JFX_PULSE_FILTER);
 
-        static final IAttribute<IQuantity> PULSE_ID = Attribute.attr("pulseNumber", Messages.JfxConstants_PULSE_ID, //$NON-NLS-1$
+        static final IAttribute<IQuantity> ATTRIBUTE_PULSE_ID_8 = Attribute.attr("pulseNumber", Messages.JfxConstants_PULSE_ID, //$NON-NLS-1$
                         UnitLookup.NUMBER);
-        static final IAttribute<String> PHASE_NAME = Attribute.attr("phase", Messages.JfxConstants_PHASE, //$NON-NLS-1$
+        static final IAttribute<IQuantity> ATTRIBUTE_PULSE_ID_12 = Attribute.attr("pulseId", Messages.JfxConstants_PULSE_ID, //$NON-NLS-1$
+                        UnitLookup.NUMBER);
+        static final IAttribute<String> ATTRIBUTE_PHASE_NAME_8 = Attribute.attr("phase", Messages.JfxConstants_PHASE_NAME, //$NON-NLS-1$
+                        UnitLookup.PLAIN_TEXT);
+        static final IAttribute<String> ATTRIBUTE_PHASE_NAME_12 = Attribute.attr("phaseName", Messages.JfxConstants_PHASE_NAME, //$NON-NLS-1$
                         UnitLookup.PLAIN_TEXT);
         static final IAttribute<String> INPUT_TYPE = Attribute.attr("input", Messages.JfxConstants_INPUT_TYPE, //$NON-NLS-1$
                         UnitLookup.PLAIN_TEXT);
 
-        static final IAggregator<IQuantity, ?> MAX_PULSE_DURATION = Aggregators.max(JFX_PULSE_ID, JfrAttributes.DURATION);
+        static final IAggregator<IQuantity, ?> MAX_PULSE_DURATION = Aggregators.max(TYPE_ID_PULSE_PHASE_12, JfrAttributes.DURATION);
         static final IAggregator<IQuantity, ?> PULSE_START = Aggregators.min(Messages.JfxConstants_PULSE_START,
-                        Messages.JfxConstants_PULSE_START_DESCRIPTION, JfxConstants.JFX_PULSE_ID, JfrAttributes.START_TIME);
+                        Messages.JfxConstants_PULSE_START_DESCRIPTION, JfxConstants.TYPE_ID_PULSE_PHASE_12, JfrAttributes.START_TIME);
 
 }
< prev index next >