Merge pull request #80 from derbylock/master

Fixed Bug: update index progress blocks (maven) builds
ajermakovics · Sep 7, 2016 · 464f252 · 464f252
2 parents 358bf3f + e5fc267
commit 464f252
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 4 deletions.
diff --git a/instasearch/src/it/unibz/instasearch/jobs/CheckUpdatesJob.java b/instasearch/src/it/unibz/instasearch/jobs/CheckUpdatesJob.java
@@ -56,6 +56,8 @@ public CheckUpdatesJob()
 	{
 		super("InstaSearch Update Check");
 
+		setPriority(DECORATE);
+
 		setProperty(IProgressConstants.ICON_PROPERTY, 
 				InstaSearchPlugin.getImageDescriptor("update"));
 

diff --git a/instasearch/src/it/unibz/instasearch/jobs/DeleteIndexJob.java b/instasearch/src/it/unibz/instasearch/jobs/DeleteIndexJob.java
@@ -40,6 +40,8 @@ public DeleteIndexJob(WorkspaceIndexer indexer)
 		this.indexer = indexer;
 		setRule(indexer);
 
+		setPriority(DECORATE);
+
 		setProperty(IProgressConstants.NO_IMMEDIATE_ERROR_PROMPT_PROPERTY, Boolean.TRUE);
 		setProperty(IProgressConstants.ICON_PROPERTY, 
 				InstaSearchPlugin.getImageDescriptor("delete"));

diff --git a/instasearch/src/it/unibz/instasearch/jobs/IndexUpdateJob.java b/instasearch/src/it/unibz/instasearch/jobs/IndexUpdateJob.java
@@ -73,6 +73,8 @@ public IndexUpdateJob(WorkspaceIndexer indexer, IndexChangeListener indexChangeL
 
 		setRule(indexer);
 
+		setPriority(DECORATE);
+
 		setProperty(IProgressConstants.ICON_PROPERTY, InstaSearchPlugin.getImageDescriptor("syncdb")); 
 		setProperty(IProgressConstants.NO_IMMEDIATE_ERROR_PROMPT_PROPERTY, Boolean.TRUE);
 	}

diff --git a/instasearch/src/it/unibz/instasearch/jobs/IndexingJob.java b/instasearch/src/it/unibz/instasearch/jobs/IndexingJob.java
@@ -32,6 +32,8 @@ public IndexingJob(WorkspaceIndexer indexer) {
 
 		setRule(indexer);
 
+		setPriority(DECORATE);
+
 		setProperty(IProgressConstants.ICON_PROPERTY, InstaSearchPlugin.getImageDescriptor("binary")); 
 		setProperty(IProgressConstants.NO_IMMEDIATE_ERROR_PROMPT_PROPERTY, Boolean.TRUE);
 	}

diff --git a/instasearch/src/it/unibz/instasearch/jobs/UpdatePluginJob.java b/instasearch/src/it/unibz/instasearch/jobs/UpdatePluginJob.java
@@ -39,6 +39,8 @@ public UpdatePluginJob()
 	{
 		super("InstaSearch Update");
 
+		setPriority(DECORATE);
+
 		setProperty(IProgressConstants.ICON_PROPERTY, InstaSearchPlugin.getImageDescriptor("update"));
 		setProperty(IProgressConstants.NO_IMMEDIATE_ERROR_PROMPT_PROPERTY, Boolean.TRUE);
 	}

diff --git a/instasearch/src/it/unibz/instasearch/ui/ResultLabelProvider.java b/instasearch/src/it/unibz/instasearch/ui/ResultLabelProvider.java
@@ -30,6 +30,7 @@
 import org.eclipse.jface.viewers.StyledString;
 import org.eclipse.jface.viewers.StyledString.Styler;
 import org.eclipse.search.ui.text.Match;
+import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.RGB;
 import org.eclipse.ui.ISharedImages;
@@ -38,9 +39,7 @@
 
 class ResultLabelProvider extends LabelProvider implements IStyledLabelProvider, IPropertyChangeListener {
 
-	/**
-	 * 
-	 */
+    private static final String ECLIPSE_SEARCH_UI_MATCH_HIGHLIGHT = "org.eclipse.search.ui.match.highlight";
 	private static final String HIGHLIGHT_COLOR_NAME = "it.unibz.instasearch.ui.HighlightColor";
 	private static final String IMG_OBJ_TEXT_SEARCH_LINE = "org.eclipse.search.ui.line_match";
 	private static final String MORE_RESULTS_LABEL = "More...";
@@ -58,7 +57,9 @@ class ResultLabelProvider extends LabelProvider implements IStyledLabelProvider,
 	private boolean showFullPath;
 
 	public ResultLabelProvider(ResultContentProvider contentProvider) {
-		JFaceResources.getColorRegistry().put(HIGHLIGHT_COLOR_NAME, new RGB(206, 204, 247));
+	    Color searchColor = JFaceResources.getColorRegistry().get(ECLIPSE_SEARCH_UI_MATCH_HIGHLIGHT);
+
+		JFaceResources.getColorRegistry().put(HIGHLIGHT_COLOR_NAME, (searchColor!=null?searchColor.getRGB():new RGB(206, 204, 247)));
 
 		this.labelProvider = new WorkbenchLabelProvider();
 		this.highlightStyle = StyledString.createColorRegistryStyler(null, HIGHLIGHT_COLOR_NAME);