packs: reports added to the Problems window

ilg-ul · ilg-ul · commit 3e0f6569509e · 2014-07-16T13:31:10.000+03:00
diff --git a/ilg.gnuarmeclipse.packs/src/ilg/gnuarmeclipse/packs/Utils.java b/ilg.gnuarmeclipse.packs/src/ilg/gnuarmeclipse/packs/Utils.java
@@ -32,6 +32,9 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.ui.console.MessageConsoleStream;
 import org.w3c.dom.Document;
@@ -365,4 +368,49 @@ public static void makeFolderReadOnlyRecursive(File folder) {
 		}
 	}
 
+	public static String reportError(String message) {
+		
+		try {
+			IMarker marker = ResourcesPlugin.getWorkspace().getRoot()
+					.createMarker(IMarker.PROBLEM);
+			marker.setAttribute(IMarker.MESSAGE, message);
+			marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
+			marker.setAttribute(IMarker.LOCATION, "-");
+		} catch (CoreException e) {
+			System.out.println(message);
+		}
+
+		return message;
+	}
+
+	public static String reportWarning(String message) {
+		
+		try {
+			IMarker marker = ResourcesPlugin.getWorkspace().getRoot()
+					.createMarker(IMarker.PROBLEM);
+			marker.setAttribute(IMarker.MESSAGE, message);
+			marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_WARNING);
+			marker.setAttribute(IMarker.LOCATION, "-");
+		} catch (CoreException e) {
+			System.out.println(message);
+		}
+
+		return message;
+	}
+
+	public static String reportInfo(String message) {
+		
+		try {
+			IMarker marker = ResourcesPlugin.getWorkspace().getRoot()
+					.createMarker(IMarker.PROBLEM);
+			marker.setAttribute(IMarker.MESSAGE, message);
+			marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_INFO);
+			marker.setAttribute(IMarker.LOCATION, "-");
+		} catch (CoreException e) {
+			System.out.println(message);
+		}
+
+		return message;
+	}
+
 }
diff --git a/ilg.gnuarmeclipse.packs/src/ilg/gnuarmeclipse/packs/handlers/RefreshHandler.java b/ilg.gnuarmeclipse.packs/src/ilg/gnuarmeclipse/packs/handlers/RefreshHandler.java
@@ -142,7 +142,8 @@ private IStatus myRun(IProgressMonitor monitor) {
 					workUnits++;
 
 				} else {
-					m_out.println("Repo type \"" + type + "\" not supported.");
+					m_out.println(Utils.reportWarning("Repo type \"" + type
+							+ "\" not supported."));
 				}
 			}
 
@@ -188,7 +189,7 @@ private IStatus myRun(IProgressMonitor monitor) {
 			// m_out.println("Error: " + e.toString());
 		} catch (Exception e) {
 			Activator.log(e);
-			m_out.println("Failed: " + e.toString());
+			m_out.println(Utils.reportError(e.toString()));
 		}
 
 		IStatus status;
@@ -207,8 +208,8 @@ private IStatus myRun(IProgressMonitor monitor) {
 				duration = 1;
 			}
 
-			m_out.println("Refresh packs job completed in " + (duration + 500)
-					/ 1000 + "s.");
+			m_out.println(Utils.reportInfo("Refresh packs completed in "
+					+ (duration + 500) / 1000 + "s."));
 
 			status = Status.OK_STATUS;
 		}
@@ -230,10 +231,9 @@ private void readCmsisIndex(String indexUrl, List<String[]> pdscList) {
 			return;
 
 		} catch (FileNotFoundException e) {
-			m_out.println("Failed: " + e.toString());
+			m_out.println(Utils.reportError("File not found: " + e.getMessage()));
 		} catch (Exception e) {
-			Activator.log(e);
-			m_out.println("Failed: " + e.toString());
+			m_out.println(Utils.reportError(e.toString()));
 		}
 
 		return;
@@ -294,6 +294,9 @@ private void aggregateCmsis(Map<String, Object> repo) {
 
 					// If local file does not exist, create it
 					Utils.copyFile(sourceUrl, cachedFile, m_out, null);
+
+					Utils.reportInfo("Pack " + pdscName + " v" + pdscVersion
+							+ " cached.");
 				}
 
 				if (cachedFile.exists()) {
@@ -302,12 +305,14 @@ private void aggregateCmsis(Map<String, Object> repo) {
 					parser.parsePdscContent(pdscName, pdscVersion, contentRoot);
 
 				} else {
-					m_out.println("Missing \"" + cachedFile + "\", ignored");
+					m_out.println(Utils.reportWarning("Missing \"" + cachedFile
+							+ "\", ignored"));
 					return;
 				}
 
 			} catch (Exception e) {
-				m_out.println("Failed with \"" + e.getMessage() + "\", ignored");
+				m_out.println(Utils.reportWarning("Failed with \""
+						+ e.getMessage() + "\", ignored"));
 				return;
 			}
 
@@ -330,7 +335,7 @@ private void aggregateCmsis(Map<String, Object> repo) {
 				m_out.println("File \"" + file.getPath() + "\" written.");
 
 			} catch (IOException e) {
-				m_out.println("Failed: " + e.toString());
+				m_out.println(Utils.reportError(e.toString()));
 			}
 		}
 	}
@@ -348,9 +353,11 @@ private void cacheXcdlContent(Map<String, Object> repo) {
 			m_monitor.worked(1);
 
 		} catch (MalformedURLException e) {
-			m_out.println("Failed: " + e.toString());
+			m_out.println(Utils.reportError(e.toString()));
+		} catch (FileNotFoundException e) {
+			m_out.println(Utils.reportError("File not found: " + e.getMessage()));
 		} catch (IOException e) {
-			m_out.println("Failed: " + e.toString());
+			m_out.println(Utils.reportError(e.toString()));
 		}
 	}
 }
diff --git a/ilg.gnuarmeclipse.packs/src/ilg/gnuarmeclipse/packs/jobs/InstallJob.java b/ilg.gnuarmeclipse.packs/src/ilg/gnuarmeclipse/packs/jobs/InstallJob.java
@@ -140,7 +140,7 @@ protected IStatus run(IProgressMonitor monitor) {
 				versionNode.setBooleanProperty(Property.INSTALLED, true);
 
 			} catch (IOException e) {
-				m_out.println("Error " + e);
+				m_out.println(Utils.reportError(e.toString()));
 			}
 		}
 
@@ -232,6 +232,8 @@ private void installPack(Node versionNode) throws IOException {
 			copyFile(packUrl, archiveFileDownload);
 
 			archiveFileDownload.renameTo(archiveFile);
+
+			Utils.reportInfo("Pack " + archiveName + " downloaded.");
 		} else {
 			m_monitor.worked((int) archiveFile.length());
 		}
@@ -252,6 +254,8 @@ private void installPack(Node versionNode) throws IOException {
 
 		Utils.makeFolderReadOnlyRecursive(destRelPath.toFile());
 
+		Utils.reportInfo("Pack " + archiveName + " installed.");
+
 		m_out.println("All files write protected.");
 	}
 
diff --git a/ilg.gnuarmeclipse.packs/src/ilg/gnuarmeclipse/packs/jobs/RemoveJob.java b/ilg.gnuarmeclipse.packs/src/ilg/gnuarmeclipse/packs/jobs/RemoveJob.java
@@ -129,8 +129,10 @@ protected IStatus run(IProgressMonitor monitor) {
 				// Add it to the list for final notifications
 				removedPacksList.add(versionNode);
 
+				Utils.reportInfo("Pack " + packFullName + " removed.");
+
 			} catch (IOException e) {
-				m_out.println(e.getMessage());
+				m_out.println(Utils.reportError(e.getMessage()));
 				break;
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,8 @@ private IStatus myRun(IProgressMonitor monitor) {`
`142`	`142`	`workUnits++;`
`143`	`143`
`144`	`144`	`} else {`
`145`		`- m_out.println("Repo type \"" + type + "\" not supported.");`
	`145`	`+ m_out.println(Utils.reportWarning("Repo type \"" + type`
	`146`	`+ + "\" not supported."));`
`146`	`147`	`}`
`147`	`148`	`}`
`148`	`149`
`@@ -188,7 +189,7 @@ private IStatus myRun(IProgressMonitor monitor) {`
`188`	`189`	`// m_out.println("Error: " + e.toString());`
`189`	`190`	`} catch (Exception e) {`
`190`	`191`	`Activator.log(e);`
`191`		`- m_out.println("Failed: " + e.toString());`
	`192`	`+ m_out.println(Utils.reportError(e.toString()));`
`192`	`193`	`}`
`193`	`194`
`194`	`195`	`IStatus status;`
`@@ -207,8 +208,8 @@ private IStatus myRun(IProgressMonitor monitor) {`
`207`	`208`	`duration = 1;`
`208`	`209`	`}`
`209`	`210`
`210`		`- m_out.println("Refresh packs job completed in " + (duration + 500)`
`211`		`- / 1000 + "s.");`
	`211`	`+ m_out.println(Utils.reportInfo("Refresh packs completed in "`
	`212`	`+ + (duration + 500) / 1000 + "s."));`
`212`	`213`
`213`	`214`	`status = Status.OK_STATUS;`
`214`	`215`	`}`
`@@ -230,10 +231,9 @@ private void readCmsisIndex(String indexUrl, List<String[]> pdscList) {`
`230`	`231`	`return;`
`231`	`232`
`232`	`233`	`} catch (FileNotFoundException e) {`
`233`		`- m_out.println("Failed: " + e.toString());`
	`234`	`+ m_out.println(Utils.reportError("File not found: " + e.getMessage()));`
`234`	`235`	`} catch (Exception e) {`
`235`		`- Activator.log(e);`
`236`		`- m_out.println("Failed: " + e.toString());`
	`236`	`+ m_out.println(Utils.reportError(e.toString()));`
`237`	`237`	`}`
`238`	`238`
`239`	`239`	`return;`
`@@ -294,6 +294,9 @@ private void aggregateCmsis(Map<String, Object> repo) {`
`294`	`294`
`295`	`295`	`// If local file does not exist, create it`
`296`	`296`	`Utils.copyFile(sourceUrl, cachedFile, m_out, null);`
	`297`	`+`
	`298`	`+ Utils.reportInfo("Pack " + pdscName + " v" + pdscVersion`
	`299`	`+ + " cached.");`
`297`	`300`	`}`
`298`	`301`
`299`	`302`	`if (cachedFile.exists()) {`
`@@ -302,12 +305,14 @@ private void aggregateCmsis(Map<String, Object> repo) {`
`302`	`305`	`parser.parsePdscContent(pdscName, pdscVersion, contentRoot);`
`303`	`306`
`304`	`307`	`} else {`
`305`		`- m_out.println("Missing \"" + cachedFile + "\", ignored");`
	`308`	`+ m_out.println(Utils.reportWarning("Missing \"" + cachedFile`
	`309`	`+ + "\", ignored"));`
`306`	`310`	`return;`
`307`	`311`	`}`
`308`	`312`
`309`	`313`	`} catch (Exception e) {`
`310`		`- m_out.println("Failed with \"" + e.getMessage() + "\", ignored");`
	`314`	`+ m_out.println(Utils.reportWarning("Failed with \""`
	`315`	`+ + e.getMessage() + "\", ignored"));`
`311`	`316`	`return;`
`312`	`317`	`}`
`313`	`318`
`@@ -330,7 +335,7 @@ private void aggregateCmsis(Map<String, Object> repo) {`
`330`	`335`	`m_out.println("File \"" + file.getPath() + "\" written.");`
`331`	`336`
`332`	`337`	`} catch (IOException e) {`
`333`		`- m_out.println("Failed: " + e.toString());`
	`338`	`+ m_out.println(Utils.reportError(e.toString()));`
`334`	`339`	`}`
`335`	`340`	`}`
`336`	`341`	`}`
`@@ -348,9 +353,11 @@ private void cacheXcdlContent(Map<String, Object> repo) {`
`348`	`353`	`m_monitor.worked(1);`
`349`	`354`
`350`	`355`	`} catch (MalformedURLException e) {`
`351`		`- m_out.println("Failed: " + e.toString());`
	`356`	`+ m_out.println(Utils.reportError(e.toString()));`
	`357`	`+ } catch (FileNotFoundException e) {`
	`358`	`+ m_out.println(Utils.reportError("File not found: " + e.getMessage()));`
`352`	`359`	`} catch (IOException e) {`
`353`		`- m_out.println("Failed: " + e.toString());`
	`360`	`+ m_out.println(Utils.reportError(e.toString()));`
`354`	`361`	`}`
`355`	`362`	`}`
`356`	`363`	`}`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ protected IStatus run(IProgressMonitor monitor) {`
`140`	`140`	`versionNode.setBooleanProperty(Property.INSTALLED, true);`
`141`	`141`
`142`	`142`	`} catch (IOException e) {`
`143`		`- m_out.println("Error " + e);`
	`143`	`+ m_out.println(Utils.reportError(e.toString()));`
`144`	`144`	`}`
`145`	`145`	`}`
`146`	`146`
`@@ -232,6 +232,8 @@ private void installPack(Node versionNode) throws IOException {`
`232`	`232`	`copyFile(packUrl, archiveFileDownload);`
`233`	`233`
`234`	`234`	`archiveFileDownload.renameTo(archiveFile);`
	`235`	`+`
	`236`	`+ Utils.reportInfo("Pack " + archiveName + " downloaded.");`
`235`	`237`	`} else {`
`236`	`238`	`m_monitor.worked((int) archiveFile.length());`
`237`	`239`	`}`
`@@ -252,6 +254,8 @@ private void installPack(Node versionNode) throws IOException {`
`252`	`254`
`253`	`255`	`Utils.makeFolderReadOnlyRecursive(destRelPath.toFile());`
`254`	`256`
	`257`	`+ Utils.reportInfo("Pack " + archiveName + " installed.");`
	`258`	`+`
`255`	`259`	`m_out.println("All files write protected.");`
`256`	`260`	`}`
`257`	`261`
Original file line number	Diff line number	Diff line change
`@@ -129,8 +129,10 @@ protected IStatus run(IProgressMonitor monitor) {`
`129`	`129`	`// Add it to the list for final notifications`
`130`	`130`	`removedPacksList.add(versionNode);`
`131`	`131`
	`132`	`+ Utils.reportInfo("Pack " + packFullName + " removed.");`
	`133`	`+`
`132`	`134`	`} catch (IOException e) {`
`133`		`- m_out.println(e.getMessage());`
	`135`	`+ m_out.println(Utils.reportError(e.getMessage()));`
`134`	`136`	`break;`
`135`	`137`	`}`
`136`	`138`	`}`