Skip to content

Commit 7e3a7f3

Browse files
fix latest version (#156)
* fix latest version * update * update * update * update * update * update * test * update
1 parent 66e89db commit 7e3a7f3

5 files changed

Lines changed: 77 additions & 35 deletions

File tree

checkmarx-ast-eclipse-plugin/.classpath

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,6 @@
1717
<classpathentry exported="true" kind="lib" path="lib/org.apache.commons.lang_2.6.0.v20220406-2305.jar"/>
1818
<classpathentry exported="true" kind="lib" path="lib/org-eclipse-mylyn-commons-core.jar"/>
1919
<classpathentry kind="src" path="src"/>
20+
<classpathentry kind="lib" path="lib/slf4j-reload4j-1.7.36.jar"/>
2021
<classpathentry kind="output" path="target/classes"/>
2122
</classpath>

checkmarx-ast-eclipse-plugin/META-INF/MANIFEST.MF

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ Require-Bundle: org.eclipse.ui,
1010
org.eclipse.ui.ide,
1111
org.eclipse.jgit,
1212
org.eclipse.e4.core.services,
13-
org.eclipse.osgi.services;resolution:=optional,
1413
com.google.guava,
1514
org.eclipse.e4.ui.di,
1615
jakarta.inject.jakarta.inject-api;bundle-version="1.0.5"
1716
Automatic-Module-Name: com.checkmarx.eclipse
1817
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
19-
Import-Package: org.eclipse.core.resources
18+
Import-Package: org.eclipse.core.resources,
19+
org.osgi.service.event;version="1.4.1"
2020
Bundle-ActivationPolicy: lazy
2121
Bundle-Activator: com.checkmarx.eclipse.Activator
2222
Bundle-ClassPath: lib/slf4j-simple-1.7.5.jar,
Binary file not shown.

checkmarx-ast-eclipse-plugin/src/com/checkmarx/eclipse/views/CheckmarxView.java

Lines changed: 69 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
package com.checkmarx.eclipse.views;
22

3-
import com.checkmarx.ast.codebashing.CodeBashing;
4-
import com.checkmarx.ast.learnMore.LearnMore;
5-
import com.checkmarx.ast.learnMore.Sample;
6-
import com.checkmarx.ast.predicate.Predicate;
7-
import com.checkmarx.ast.project.Project;
8-
import com.checkmarx.ast.results.result.Node;
9-
import com.checkmarx.ast.results.result.PackageData;
10-
import com.checkmarx.ast.results.result.Result;
11-
import com.checkmarx.ast.scan.Scan;
12-
import com.checkmarx.ast.wrapper.CxException;
13-
import com.checkmarx.eclipse.Activator;
14-
import com.checkmarx.eclipse.enums.ActionName;
15-
import com.checkmarx.eclipse.enums.Severity;
16-
import com.checkmarx.eclipse.utils.CxLogger;
17-
import com.checkmarx.eclipse.utils.NotificationPopUpUI;
18-
import com.checkmarx.eclipse.utils.PluginConstants;
19-
import com.checkmarx.eclipse.utils.PluginUtils;
20-
import com.checkmarx.eclipse.views.actions.ToolBarActions;
21-
import com.checkmarx.eclipse.views.filters.FilterState;
22-
import com.checkmarx.eclipse.views.provider.ColumnProvider;
23-
import com.checkmarx.eclipse.views.provider.TreeContentProvider;
24-
import com.google.common.base.Strings;
25-
import com.google.common.eventbus.EventBus;
26-
import com.google.common.eventbus.Subscribe;
3+
import java.io.IOException;
4+
import java.net.MalformedURLException;
5+
import java.net.URL;
6+
import java.util.ArrayList;
7+
import java.util.Arrays;
8+
import java.util.Collections;
9+
import java.util.HashSet;
10+
import java.util.List;
11+
import java.util.Optional;
12+
import java.util.Set;
13+
import java.util.UUID;
14+
2715
import org.apache.commons.lang3.StringUtils;
2816
import org.eclipse.core.resources.IFile;
2917
import org.eclipse.core.resources.IMarker;
18+
import org.eclipse.core.runtime.CoreException;
19+
import org.eclipse.core.runtime.IProgressMonitor;
20+
import org.eclipse.core.runtime.IStatus;
3021
import org.eclipse.core.runtime.Path;
31-
import org.eclipse.core.runtime.*;
22+
import org.eclipse.core.runtime.Status;
3223
import org.eclipse.core.runtime.jobs.Job;
3324
import org.eclipse.jface.action.Action;
3425
import org.eclipse.jface.preference.PreferenceDialog;
35-
import org.eclipse.jface.viewers.*;
26+
import org.eclipse.jface.viewers.ArrayContentProvider;
27+
import org.eclipse.jface.viewers.ColumnViewerToolTipSupport;
28+
import org.eclipse.jface.viewers.ComboViewer;
29+
import org.eclipse.jface.viewers.ISelectionChangedListener;
30+
import org.eclipse.jface.viewers.IStructuredSelection;
31+
import org.eclipse.jface.viewers.LabelProvider;
32+
import org.eclipse.jface.viewers.SelectionChangedEvent;
33+
import org.eclipse.jface.viewers.StructuredSelection;
34+
import org.eclipse.jface.viewers.TreeViewer;
35+
import org.eclipse.jface.viewers.TreeViewerColumn;
3636
import org.eclipse.jgit.events.RefsChangedEvent;
3737
import org.eclipse.jgit.events.RefsChangedListener;
3838
import org.eclipse.jgit.lib.Repository;
@@ -43,11 +43,28 @@
4343
import org.eclipse.swt.events.SelectionAdapter;
4444
import org.eclipse.swt.events.SelectionEvent;
4545
import org.eclipse.swt.events.SelectionListener;
46-
import org.eclipse.swt.graphics.*;
46+
import org.eclipse.swt.graphics.Color;
47+
import org.eclipse.swt.graphics.Font;
48+
import org.eclipse.swt.graphics.FontData;
49+
import org.eclipse.swt.graphics.Image;
50+
import org.eclipse.swt.graphics.RGB;
4751
import org.eclipse.swt.layout.FillLayout;
4852
import org.eclipse.swt.layout.GridData;
4953
import org.eclipse.swt.layout.GridLayout;
50-
import org.eclipse.swt.widgets.*;
54+
import org.eclipse.swt.widgets.Button;
55+
import org.eclipse.swt.widgets.Combo;
56+
import org.eclipse.swt.widgets.Composite;
57+
import org.eclipse.swt.widgets.Control;
58+
import org.eclipse.swt.widgets.Display;
59+
import org.eclipse.swt.widgets.Event;
60+
import org.eclipse.swt.widgets.Label;
61+
import org.eclipse.swt.widgets.Link;
62+
import org.eclipse.swt.widgets.Listener;
63+
import org.eclipse.swt.widgets.Shell;
64+
import org.eclipse.swt.widgets.TabFolder;
65+
import org.eclipse.swt.widgets.TabItem;
66+
import org.eclipse.swt.widgets.Text;
67+
import org.eclipse.swt.widgets.TreeColumn;
5168
import org.eclipse.ui.IActionBars;
5269
import org.eclipse.ui.IWorkbenchPage;
5370
import org.eclipse.ui.PartInitException;
@@ -57,11 +74,30 @@
5774
import org.eclipse.ui.part.ViewPart;
5875
import org.osgi.service.event.EventHandler;
5976

60-
import java.io.IOException;
61-
import java.net.MalformedURLException;
62-
import java.net.URL;
63-
import java.util.List;
64-
import java.util.*;
77+
import com.checkmarx.ast.codebashing.CodeBashing;
78+
import com.checkmarx.ast.learnMore.LearnMore;
79+
import com.checkmarx.ast.learnMore.Sample;
80+
import com.checkmarx.ast.predicate.Predicate;
81+
import com.checkmarx.ast.project.Project;
82+
import com.checkmarx.ast.results.result.Node;
83+
import com.checkmarx.ast.results.result.PackageData;
84+
import com.checkmarx.ast.results.result.Result;
85+
import com.checkmarx.ast.scan.Scan;
86+
import com.checkmarx.ast.wrapper.CxException;
87+
import com.checkmarx.eclipse.Activator;
88+
import com.checkmarx.eclipse.enums.ActionName;
89+
import com.checkmarx.eclipse.enums.Severity;
90+
import com.checkmarx.eclipse.utils.CxLogger;
91+
import com.checkmarx.eclipse.utils.NotificationPopUpUI;
92+
import com.checkmarx.eclipse.utils.PluginConstants;
93+
import com.checkmarx.eclipse.utils.PluginUtils;
94+
import com.checkmarx.eclipse.views.actions.ToolBarActions;
95+
import com.checkmarx.eclipse.views.filters.FilterState;
96+
import com.checkmarx.eclipse.views.provider.ColumnProvider;
97+
import com.checkmarx.eclipse.views.provider.TreeContentProvider;
98+
import com.google.common.base.Strings;
99+
import com.google.common.eventbus.EventBus;
100+
import com.google.common.eventbus.Subscribe;
65101

66102
public class CheckmarxView extends ViewPart implements EventHandler {
67103

pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,5 +133,10 @@
133133
<artifactId>jakarta.inject-api</artifactId>
134134
<version>1.0.5</version>
135135
</dependency>
136+
<dependency>
137+
<groupId>org.osgi</groupId>
138+
<artifactId>org.osgi.service.event</artifactId>
139+
<version>1.4.1</version>
140+
</dependency>
136141
</dependencies>
137142
</project>

0 commit comments

Comments
 (0)