Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonald.g.dunne2016-03-31 16:13:11 +0000
committerRyan D. Brooks2016-03-31 16:13:11 +0000
commiteb15d8a80a49a4c6185be5b42541fcad2503b398 (patch)
tree5bbbe2e8cf468a2be0a3647e3eb6d9f067a44445 /plugins/org.eclipse.osee.framework.ui.skynet
parenta6c453299a6536d2db479428a4fce0fb42921a26 (diff)
downloadorg.eclipse.osee-eb15d8a80a49a4c6185be5b42541fcad2503b398.tar.gz
org.eclipse.osee-eb15d8a80a49a4c6185be5b42541fcad2503b398.tar.xz
org.eclipse.osee-eb15d8a80a49a4c6185be5b42541fcad2503b398.zip
feature[ats_ATS280450]: Consolidate WorldEditor and TaskEditor
Diffstat (limited to 'plugins/org.eclipse.osee.framework.ui.skynet')
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF5
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/FrameworkArtifactImageProvider.java7
2 files changed, 8 insertions, 4 deletions
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF
index 23e30f9c211..286586f222d 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF
@@ -17,8 +17,9 @@ Import-Package: com.google.common.base;version="15.0.0",
com.lowagie.text.rtf,
javax.mail,
javax.mail.internet,
- javax.ws.rs.client;version="2.0.0",
- javax.ws.rs.core;version="2.0.0",
+ javax.ws.rs,
+ javax.ws.rs.client,
+ javax.ws.rs.core,
org.apache.commons.io,
org.apache.commons.lang,
org.apache.commons.lang.mutable,
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/FrameworkArtifactImageProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/FrameworkArtifactImageProvider.java
index 028d0bcd4a8..67a5610a851 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/FrameworkArtifactImageProvider.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/FrameworkArtifactImageProvider.java
@@ -15,6 +15,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.logging.Level;
+import javax.ws.rs.NotFoundException;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.UriBuilder;
import org.codehaus.jackson.map.ObjectMapper;
@@ -143,8 +144,10 @@ public class FrameworkArtifactImageProvider extends ArtifactImageProvider {
}
} catch (Exception ex) {
- OseeLog.logf(FrameworkArtifactImageProvider.class, Level.SEVERE, ex,
- "Error processing dynamic artifact images.");
+ if (!(ex instanceof NotFoundException)) {
+ OseeLog.logf(FrameworkArtifactImageProvider.class, Level.SEVERE, ex,
+ "Error processing dynamic artifact images.");
+ }
}
}

Back to the top