Skip to content

Commit 47ca464

Browse files
OrShamirCMOrShamirCM
authored
Merge pull request #142 from Checkmarx/Fix/benalvo/eclipse-plugin-mac-compilitaion
Eclipse | Fix eclipse plugin errors in mac (AST-38247)
2 parents 9a92e90 + 9d2631c commit 47ca464

File tree

2 files changed

+52
-75
lines changed

2 files changed

+52
-75
lines changed

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

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

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-
import javax.inject.Inject;
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;
1527
import org.apache.commons.lang3.StringUtils;
1628
import org.eclipse.core.resources.IFile;
1729
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;
2130
import org.eclipse.core.runtime.Path;
22-
import org.eclipse.core.runtime.Status;
31+
import org.eclipse.core.runtime.*;
2332
import org.eclipse.core.runtime.jobs.Job;
24-
import org.eclipse.e4.ui.di.UISynchronize;
2533
import org.eclipse.jface.action.Action;
2634
import org.eclipse.jface.preference.PreferenceDialog;
27-
import org.eclipse.jface.viewers.ArrayContentProvider;
28-
import org.eclipse.jface.viewers.ColumnViewerToolTipSupport;
29-
import org.eclipse.jface.viewers.ComboViewer;
30-
import org.eclipse.jface.viewers.ISelectionChangedListener;
31-
import org.eclipse.jface.viewers.IStructuredSelection;
32-
import org.eclipse.jface.viewers.LabelProvider;
33-
import org.eclipse.jface.viewers.SelectionChangedEvent;
34-
import org.eclipse.jface.viewers.StructuredSelection;
35-
import org.eclipse.jface.viewers.TreeViewer;
36-
import org.eclipse.jface.viewers.TreeViewerColumn;
35+
import org.eclipse.jface.viewers.*;
3736
import org.eclipse.jgit.events.RefsChangedEvent;
3837
import org.eclipse.jgit.events.RefsChangedListener;
3938
import org.eclipse.jgit.lib.Repository;
@@ -44,29 +43,11 @@
4443
import org.eclipse.swt.events.SelectionAdapter;
4544
import org.eclipse.swt.events.SelectionEvent;
4645
import org.eclipse.swt.events.SelectionListener;
47-
import org.eclipse.swt.graphics.Color;
48-
import org.eclipse.swt.graphics.Font;
49-
import org.eclipse.swt.graphics.FontData;
50-
import org.eclipse.swt.graphics.Image;
51-
import org.eclipse.swt.graphics.ImageData;
52-
import org.eclipse.swt.graphics.RGB;
46+
import org.eclipse.swt.graphics.*;
5347
import org.eclipse.swt.layout.FillLayout;
5448
import org.eclipse.swt.layout.GridData;
5549
import org.eclipse.swt.layout.GridLayout;
56-
import org.eclipse.swt.widgets.Button;
57-
import org.eclipse.swt.widgets.Combo;
58-
import org.eclipse.swt.widgets.Composite;
59-
import org.eclipse.swt.widgets.Control;
60-
import org.eclipse.swt.widgets.Display;
61-
import org.eclipse.swt.widgets.Event;
62-
import org.eclipse.swt.widgets.Label;
63-
import org.eclipse.swt.widgets.Link;
64-
import org.eclipse.swt.widgets.Listener;
65-
import org.eclipse.swt.widgets.Shell;
66-
import org.eclipse.swt.widgets.TabFolder;
67-
import org.eclipse.swt.widgets.TabItem;
68-
import org.eclipse.swt.widgets.Text;
69-
import org.eclipse.swt.widgets.TreeColumn;
50+
import org.eclipse.swt.widgets.*;
7051
import org.eclipse.ui.IActionBars;
7152
import org.eclipse.ui.IWorkbenchPage;
7253
import org.eclipse.ui.PartInitException;
@@ -76,30 +57,11 @@
7657
import org.eclipse.ui.part.ViewPart;
7758
import org.osgi.service.event.EventHandler;
7859

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

10466
public class CheckmarxView extends ViewPart implements EventHandler {
10567

@@ -160,9 +122,7 @@ public class CheckmarxView extends ViewPart implements EventHandler {
160122

161123
Font boldFont, titleFont;
162124

163-
@Inject
164-
UISynchronize sync;
165-
125+
UISynchronizeImpl sync;
166126
private Composite resultViewComposite;
167127
private Composite attackVectorCompositePanel;
168128
private Composite titleComposite;
@@ -200,7 +160,7 @@ public class CheckmarxView extends ViewPart implements EventHandler {
200160

201161
public CheckmarxView() {
202162
super();
203-
163+
sync = new UISynchronizeImpl(PlatformUI.getWorkbench().getDisplay());
204164
rootModel = new DisplayModel.DisplayModelBuilder(PluginConstants.EMPTY_STRING).build();
205165
globalSettings.loadSettings();
206166
currentProjectId = globalSettings.getProjectId();

‎checkmarx-ast-eclipse-plugin/src/com/checkmarx/eclipse/views/UISynchronizeImpl.java‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package com.checkmarx.eclipse.views;
2+
3+
import org.eclipse.swt.widgets.Display;
4+
5+
public class UISynchronizeImpl {
6+
private Display display;
7+
public UISynchronizeImpl(Display display){
8+
this.display = display;
9+
}
10+
public void syncExec(Runnable runnable){
11+
display.syncExec(runnable);
12+
}
13+
14+
public void asyncExec(Runnable runnable){
15+
display.asyncExec(runnable);
16+
}
17+
}

0 commit comments

Comments
 (0)