Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan D. Brooks2020-02-11 23:45:21 +0000
committerRyan D. Brooks2020-12-15 21:40:38 +0000
commit1d942ff69576bfcaa9d189aeb3dfe871fba2cd22 (patch)
treedcae235e65b7696f0164a10212b048194249c0b9
parent1c8758523fd8ec307e00c662e8de14d1d32358e7 (diff)
downloadorg.eclipse.osee-1d942ff69576bfcaa9d189aeb3dfe871fba2cd22.tar.gz
org.eclipse.osee-1d942ff69576bfcaa9d189aeb3dfe871fba2cd22.tar.xz
org.eclipse.osee-1d942ff69576bfcaa9d189aeb3dfe871fba2cd22.zip
refactor: Sort this out
-rw-r--r--features/org.eclipse.osee.core.server.external.feature/feature.xml7
-rw-r--r--features/org.eclipse.osee.framework.feature/feature.xml1
-rw-r--r--plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/ImageManager.java2
3 files changed, 1 insertions, 9 deletions
diff --git a/features/org.eclipse.osee.core.server.external.feature/feature.xml b/features/org.eclipse.osee.core.server.external.feature/feature.xml
index 976e6d20868..c09397022a0 100644
--- a/features/org.eclipse.osee.core.server.external.feature/feature.xml
+++ b/features/org.eclipse.osee.core.server.external.feature/feature.xml
@@ -476,13 +476,6 @@
unpack="false"/>
<plugin
- id="org.hsqldb"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.jetty.http"
download-size="0"
install-size="0"
diff --git a/features/org.eclipse.osee.framework.feature/feature.xml b/features/org.eclipse.osee.framework.feature/feature.xml
index f853a0baf99..e066550cc70 100644
--- a/features/org.eclipse.osee.framework.feature/feature.xml
+++ b/features/org.eclipse.osee.framework.feature/feature.xml
@@ -53,7 +53,6 @@
<import plugin="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" version="2.9.2" match="greaterOrEqual" />
<import plugin="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="2.9.2" match="greaterOrEqual" />
<import plugin="org.jsoup"/>
- <import plugin="org.hsqldb"/>
<import plugin="org.hamcrest.core" version="1.3.0" match="greaterOrEqual" />
</requires>
diff --git a/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/ImageManager.java b/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/ImageManager.java
index a2fe72a37d4..d4d480b9a55 100644
--- a/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/ImageManager.java
+++ b/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/ImageManager.java
@@ -109,7 +109,7 @@ public final class ImageManager {
}
public static ImageDescriptor createImageDescriptor(String symbolicBundleName, String imageFileName) {
- return AbstractUIPlugin.imageDescriptorFromPlugin(symbolicBundleName, "OSEE-INF/images" + "/" + imageFileName);
+ return AbstractUIPlugin.imageDescriptorFromPlugin(symbolicBundleName, "OSEE-INF/images/" + imageFileName);
}
public static KeyedImage createKeyedImage(String imageKey, ImageDescriptor descriptor) {

Back to the top