Skip to content

5561: Support for Crypto Events in JMC #686

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

5561: Support for Crypto Events in JMC #686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions application/org.openjdk.jmc.flightrecorder.ui/defaultPages.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,6 +727,30 @@
</eventList>
</state>
</page>

<page factory="org.openjdk.jmc.flightrecorder.ui.security" id="org.openjdk.jmc.flightrecorder.ui.security">
<state>
<sash />
<securityX509AlgorithmTable sortColumn="cryptoIcon">
<column id="cryptoIcon" width="100" sortAscending="true" />
<column id="cryptoRemark" hidden="false"/>
<column id="algorithm" hidden="false"/>
<column id="keyType" hidden="false"/>
<column id="keyLength" hidden="false" />
<column id="serialNumber" hidden="false"/>
<column id="subject" hidden="false" />
<column id="validFrom" hidden="false" />
<column id="validUntil" hidden="false"/>
<column id="thread" hidden="false" />
<column id="certificateId" hidden="false" />
<column id="issuer" hidden="false"/>
</securityX509AlgorithmTable>
<chart>
<series id="x509CertificateCount" />
</chart>
</state>
</page>

<page factory="org.openjdk.jmc.flightrecorder.ui.threaddumps" id="org.openjdk.jmc.flightrecorder.ui.threaddumps">
<state>
<sash weights="2,3" horizontal="true"/>
Expand Down
Binary file added application/org.openjdk.jmc.flightrecorder.ui/icons/pages/security16.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions application/org.openjdk.jmc.flightrecorder.ui/org.openjdk.jmc.flightrecorder.ui_contexts.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,11 @@
<description></description>
<topic href="PLUGINS_ROOT/org.openjdk.jmc.docs/html/GUID-4F885E48-A548-4140-B985-74B1685BEDEA.htm" label="Using the TLAB Allocations Page" />
</context>

<context id="security">
<description></description>
<topic href="PLUGINS_ROOT/org.openjdk.jmc.docs/html/GUID-4F885E48-A548-4140-B985-74B1685BEDEA.htm" label="Using the Security Page" />
</context>

<context id="environment">
<description></description>
Expand Down
4 changes: 4 additions & 0 deletions application/org.openjdk.jmc.flightrecorder.ui/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,10 @@
class="org.openjdk.jmc.flightrecorder.ui.pages.TlabPage$TlabPageFactory"
id="org.openjdk.jmc.flightrecorder.ui.tlab">
</factory>
<factory
class="org.openjdk.jmc.flightrecorder.ui.pages.SecurityPage$SecurityPageFactory"
id="org.openjdk.jmc.flightrecorder.ui.security">
</factory>
<factory
class="org.openjdk.jmc.flightrecorder.ui.pages.SystemPage$SystemPageFactory"
id="org.openjdk.jmc.flightrecorder.ui.system">
Expand Down
1 change: 1 addition & 0 deletions ...ghtrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/common/ImageConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ public class ImageConstants {
public static final String PAGE_COMPILATIONS = "pages/compilations.png"; //$NON-NLS-1$
public static final String PAGE_CLASSLOADING = "pages/classloading.png"; //$NON-NLS-1$
public static final String PAGE_TLAB_ALLOCATIONS = "pages/allocations.png"; //$NON-NLS-1$
public static final String PAGE_SECURITY = "pages/security16.png"; //$NON-NLS-1$
public static final String PAGE_ENVIRONMENT = "pages/system.png"; //$NON-NLS-1$
public static final String PAGE_PROCESSES = "pages/processes.png"; //$NON-NLS-1$
public static final String PAGE_ENVIRONMENT_VARIABLES = "pages/environment.png"; //$NON-NLS-1$
Expand Down
16 changes: 16 additions & 0 deletions ...mc.flightrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/common/ItemList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import java.util.stream.Stream;

import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.ColumnLabelProvider;
import org.eclipse.jface.viewers.ColumnViewerToolTipSupport;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StructuredSelection;
Expand Down Expand Up @@ -83,6 +84,21 @@ public void addColumn(IAttribute<?> a) {
a.getContentType() instanceof LinearKindOfQuantity, accessor);
}

public void addColumn(IAttribute<?> a, ColumnLabelProvider iconProvider) {
@SuppressWarnings("deprecation")
IMemberAccessor<?, IItem> accessor = ItemToolkit.accessor(a);
addColumn(a.getIdentifier(), a.getName(), a.getDescription(),
a.getContentType() instanceof LinearKindOfQuantity, accessor, iconProvider);
}

private void addColumn(
String columnId, String name, String description, boolean right, IMemberAccessor<?, IItem> accessor,
ColumnLabelProvider iconProvider) {
columns.add(new ColumnBuilder(name, columnId, accessor, iconProvider).description(description)
.style(right ? SWT.RIGHT : SWT.NONE).build());

}

public void addColumn(
String columnId, String name, String description, boolean right, IMemberAccessor<?, IItem> accessor) {
columns.add(new ColumnBuilder(name, columnId, accessor).description(description)
Expand Down
5 changes: 5 additions & 0 deletions ...corder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/messages/internal/Messages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,6 +523,11 @@ public class Messages extends NLS {
public static String SAVE_AS_NO_SRC_ERROR_MSG;
public static String SAVE_AS_TITLE;
public static String SEARCH_TREE_TEXT;
public static String SecurityPage_PAGE_NAME;
public static String SecurityPage_TIMELINE_SELECTION;
public static String SecurityPage_TABLE_SELECTION;
public static String SecurityPage_SECTION_X509_CERTIFICATES;
public static String SecurityPage_SECTION_X509_ALGORITHMS;
public static String SELECTION_STORE_NO_SELECTION;
public static String SELECT_RANGE_WIZARD_DESCRIPTION;
public static String SELECT_RANGE_WIZARD_TEXT;
Expand Down
Loading