Using eclipse icons instead

bioclipse · Jul 15, 2013 · f7a77e8 · f7a77e8
1 parent f47132f
commit f7a77e8
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 13 deletions.
diff --git a/plugins/net.bioclipse.hpc/plugin.xml b/plugins/net.bioclipse.hpc/plugin.xml
@@ -18,12 +18,14 @@
       <view
             class="net.bioclipse.hpc.views.projinfo.ProjInfoView"
             id="net.bioclipse.hpc.views.ProjInfoView"
-            name="Project Info">
+            name="Project Info"
+            icon="src/net/bioclipse/hpc/images/group.gif">
       </view>
       <view
             class="net.bioclipse.hpc.views.jobinfo.JobInfoView"
             id="net.bioclipse.hpc.views.JobInfoView"
-            name="JobInfo">
+            name="JobInfo"
+            icon="src/net/bioclipse/hpc/images/jobs.gif">
       </view>
    </extension>
 

diff --git a/plugins/net.bioclipse.hpc/src/net/bioclipse/hpc/images/group.gif b/plugins/net.bioclipse.hpc/src/net/bioclipse/hpc/images/group.gif
diff --git a/plugins/net.bioclipse.hpc/src/net/bioclipse/hpc/images/job_pending.gif b/plugins/net.bioclipse.hpc/src/net/bioclipse/hpc/images/job_pending.gif
diff --git a/plugins/net.bioclipse.hpc/src/net/bioclipse/hpc/images/job_running.gif b/plugins/net.bioclipse.hpc/src/net/bioclipse/hpc/images/job_running.gif
diff --git a/plugins/net.bioclipse.hpc/src/net/bioclipse/hpc/images/jobs.gif b/plugins/net.bioclipse.hpc/src/net/bioclipse/hpc/images/jobs.gif
diff --git a/plugins/net.bioclipse.hpc/src/net/bioclipse/hpc/images/jobs_pending.gif b/plugins/net.bioclipse.hpc/src/net/bioclipse/hpc/images/jobs_pending.gif
diff --git a/plugins/net.bioclipse.hpc/src/net/bioclipse/hpc/images/jobs_running.gif b/plugins/net.bioclipse.hpc/src/net/bioclipse/hpc/images/jobs_running.gif
diff --git a/plugins/net.bioclipse.hpc/src/net/bioclipse/hpc/images/person.gif b/plugins/net.bioclipse.hpc/src/net/bioclipse/hpc/images/person.gif
diff --git a/plugins/net.bioclipse.hpc/src/net/bioclipse/hpc/views/jobinfo/JobInfoLabelProvider.java b/plugins/net.bioclipse.hpc/src/net/bioclipse/hpc/views/jobinfo/JobInfoLabelProvider.java
@@ -38,9 +38,10 @@ public class JobInfoLabelProvider implements ITableLabelProvider {
 			"# Nodes", 
 			"Node list");
 	private HashMap<Integer,String> jobColumnLabelMap = new HashMap<Integer, String>();
-	private Image clockImg;
-	private Image cogImg;
-	private Image playImg;
+	private Image jobsPendingImg;
+	private Image jobPendningImg;
+	private Image jobsRunningImg;
+	private Image jobRunningImg;
 	private static final Logger logger = LoggerFactory.getLogger(ProjInfoView.class);
 
 	public JobInfoLabelProvider() {
@@ -51,9 +52,11 @@ public JobInfoLabelProvider() {
 
 		logger.info("Abs path: " + new File(".").getAbsolutePath());
 
-		clockImg = new Image(null, ImageRetriever.class.getResourceAsStream("clock2.png"));
-		cogImg = new Image(null, ImageRetriever.class.getResourceAsStream("cog.png"));
-		playImg = new Image(null, ImageRetriever.class.getResourceAsStream("control_play.png"));		
+		jobsPendingImg = new Image(null, ImageRetriever.class.getResourceAsStream("jobs_pending.gif"));
+		jobPendningImg = new Image(null, ImageRetriever.class.getResourceAsStream("job_pending.gif"));
+
+		jobsRunningImg = new Image(null, ImageRetriever.class.getResourceAsStream("jobs_running.gif"));		
+		jobRunningImg = new Image(null, ImageRetriever.class.getResourceAsStream("job_running.gif"));
 	}
 
 	/* (non-Javadoc)
@@ -103,12 +106,16 @@ public Image getColumnImage(Object element, int columnIndex) {
 		if (columnIndex == 0) {
 			if (element instanceof JobState) {
 				if (((JobState) element).getJobState().equals(JobState.STATE_RUNNING)) {
-					return playImg;
+					return jobsRunningImg;
 				} else if (((JobState) element).getJobState().equals(JobState.STATE_PENDING)) {
-					return clockImg;
+					return jobsPendingImg;
 				}
 			} else if (element instanceof Job) {
-				return cogImg;
+				if (((Job) element).getState().equals(JobState.STATE_PENDING)) {
+					return jobPendningImg;										
+				} else if (((Job) element).getState().equals(JobState.STATE_RUNNING)) {
+					return jobRunningImg;					
+				}
 			} 			
 		}
 		return null;

diff --git a/plugins/net.bioclipse.hpc/src/net/bioclipse/hpc/views/projinfo/ProjInfoLabelProvider.java b/plugins/net.bioclipse.hpc/src/net/bioclipse/hpc/views/projinfo/ProjInfoLabelProvider.java
@@ -22,8 +22,8 @@ class ProjInfoLabelProvider implements ITableLabelProvider {
 
   // Constructs a PlayerLabelProvider
   public ProjInfoLabelProvider() {
-		groupImg = new Image(null, ImageRetriever.class.getResourceAsStream("group.png"));
-		userImg = new Image(null, ImageRetriever.class.getResourceAsStream("user.png"));
+		groupImg = new Image(null, ImageRetriever.class.getResourceAsStream("group.gif"));
+		userImg = new Image(null, ImageRetriever.class.getResourceAsStream("person.gif"));
   }
 
   /**