cleanup

3 files changed, 66 insertions, 16 deletions

diff --git a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jardelta/Optimizer.java b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jardelta/Optimizer.java
index 6a89bec8a..75c00d6d1 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jardelta/Optimizer.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jardelta/Optimizer.java
@@ -13,11 +13,23 @@ package org.eclipse.equinox.internal.p2.artifact.optimizers.jardelta;
 
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.equinox.internal.p2.metadata.ArtifactKey;
-import org.eclipse.equinox.p2.artifact.repository.*;
-import org.eclipse.equinox.p2.artifact.repository.processing.*;
+import org.eclipse.equinox.p2.artifact.repository.ArtifactDescriptor;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactDescriptor;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStep;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepHandler;
 import org.eclipse.equinox.p2.metadata.IArtifactKey;
 import org.osgi.framework.Version;
 
@@ -179,13 +191,23 @@ public class Optimizer {
 				OutputStream destination = handler.link(new ProcessingStep[] {optimizerStep}, repositoryStream, null);
 
 				// Do the actual work by asking the repo to get the artifact and put it in the destination.
-				repository.getArtifact(canonical, destination, new NullProgressMonitor());
+				IStatus status = repository.getArtifact(canonical, destination, new NullProgressMonitor());
+				if (!status.isOK()) {
+					System.out.println("Getting the artifact is not ok.");
+					System.out.println(status);
+				}
 			} finally {
 				if (repositoryStream != null)
 					try {
 						repositoryStream.close();
+						IStatus status = ProcessingStepHandler.checkStatus(repositoryStream);
+						if (!status.isOK()) {
+							System.out.println("Skipping optimization of: " + descriptors[i].getArtifactKey());
+							System.out.println(status.toString());
+						}
 					} catch (IOException e) {
-						// TODO Auto-generated catch block
+						System.out.println("Skipping optimization of: " + descriptors[i].getArtifactKey());
+						System.out.println(e.getMessage());
 						e.printStackTrace();
 					}
 			}
diff --git a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jbdiff/Optimizer.java b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jbdiff/Optimizer.java
index eedd23545..995e39f2a 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jbdiff/Optimizer.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jbdiff/Optimizer.java
@@ -13,11 +13,23 @@ package org.eclipse.equinox.internal.p2.artifact.optimizers.jbdiff;
 
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.equinox.internal.p2.artifact.optimizers.VersionlessArtifactKey;
-import org.eclipse.equinox.p2.artifact.repository.*;
-import org.eclipse.equinox.p2.artifact.repository.processing.*;
+import org.eclipse.equinox.p2.artifact.repository.ArtifactDescriptor;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactDescriptor;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStep;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepHandler;
 import org.eclipse.equinox.p2.metadata.IArtifactKey;
 
 public class Optimizer {
@@ -192,13 +204,23 @@ public class Optimizer {
 				OutputStream destination = handler.link(new ProcessingStep[] {diffStep}, repositoryStream, null);
 
 				// Do the actual work by asking the repo to get the artifact and put it in the destination.
-				repository.getArtifact(complete, destination, new NullProgressMonitor());
+				IStatus status = repository.getArtifact(complete, destination, new NullProgressMonitor());
+				if (!status.isOK()) {
+					System.out.println("Getting the artifact is not ok.");
+					System.out.println(status);
+				}
 			} finally {
 				if (repositoryStream != null)
 					try {
 						repositoryStream.close();
+						IStatus status = ProcessingStepHandler.checkStatus(repositoryStream);
+						if (!status.isOK()) {
+							System.out.println("Skipping optimization of: " + descriptors[i].getArtifactKey());
+							System.out.println(status.toString());
+						}
 					} catch (IOException e) {
-						// TODO Auto-generated catch block
+						System.out.println("Skipping optimization of: " + descriptors[i].getArtifactKey());
+						System.out.println(e.getMessage());
 						e.printStackTrace();
 					}
 			}
diff --git a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/pack200/Optimizer.java b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/pack200/Optimizer.java
index ba3e632c0..52a4fd0b5 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/pack200/Optimizer.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/pack200/Optimizer.java
@@ -10,10 +10,15 @@ package org.eclipse.equinox.internal.p2.artifact.optimizers.pack200;
 
 import java.io.IOException;
 import java.io.OutputStream;
+
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.equinox.p2.artifact.repository.*;
-import org.eclipse.equinox.p2.artifact.repository.processing.*;
+import org.eclipse.equinox.p2.artifact.repository.ArtifactDescriptor;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactDescriptor;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStep;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepHandler;
 import org.eclipse.equinox.p2.metadata.IArtifactKey;
 
 public class Optimizer {
@@ -67,21 +72,22 @@ public class Optimizer {
 
 			// Do the actual work by asking the repo to get the artifact and put it in the destination.
 			IStatus status = repository.getArtifact(descriptor, destination, new NullProgressMonitor());
-			if (!status.isOK())
+			if (!status.isOK()) {
+				System.out.println("Getting the artifact is not ok.");
 				System.out.println(status);
+			}
 		} finally {
 			if (repositoryStream != null)
 				try {
 					repositoryStream.close();
-					// TODO need to figure out how to get our processing steps linked into the repositoryStream
-					// so that the close() picks up any status issues.
 					IStatus status = ProcessingStepHandler.checkStatus(repositoryStream);
 					if (!status.isOK()) {
 						System.out.println("Skipping optimization of: " + descriptor.getArtifactKey());
 						System.out.println(status.toString());
 					}
 				} catch (IOException e) {
-					// TODO Auto-generated catch block
+					System.out.println("Skipping optimization of: " + descriptor.getArtifactKey());
+					System.out.println(e.getMessage());
 					e.printStackTrace();
 				}
 		}