Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Vogel2014-02-21 11:25:34 +0000
committerGerrit Code Review @ Eclipse.org2014-02-24 14:24:17 +0000
commit1b58a7af4ebb93f4d66f2a6466d155d5fc31c60f (patch)
tree15faa3d701f874a0cb6664c326e9ece462a9017b
parent2061b2ae38440c5c4d291000944104a7d218416e (diff)
downloadeclipse.platform.ui-1b58a7af4ebb93f4d66f2a6466d155d5fc31c60f.tar.gz
eclipse.platform.ui-1b58a7af4ebb93f4d66f2a6466d155d5fc31c60f.tar.xz
eclipse.platform.ui-1b58a7af4ebb93f4d66f2a6466d155d5fc31c60f.zip
Bug 428715 - [CSS] [Themes] org.eclipse.ui.themes plugin throws
java.net.MalformedURLException when used in RCP app Removes the default ULR (org.eclipse.platform or org.eclipse.ui.themes) and moves the images Change-Id: I5f49926dc97fda94391a60d5a75ae4acdfe4c868 Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>
-rw-r--r--bundles/org.eclipse.e4.ui.css.swt.theme/src/org/eclipse/e4/ui/css/swt/internal/theme/ThemeEngine.java6
-rw-r--r--bundles/org.eclipse.ui.themes/images/dragHandle.pngbin0 -> 3606 bytes
-rw-r--r--bundles/org.eclipse.ui.themes/images/macGrey.pngbin0 -> 819 bytes
-rw-r--r--bundles/org.eclipse.ui.themes/images/macHandle.pngbin0 -> 108 bytes
-rw-r--r--bundles/org.eclipse.ui.themes/images/macTSFrame.pngbin0 -> 138 bytes
-rw-r--r--bundles/org.eclipse.ui.themes/images/win7.pngbin0 -> 2477 bytes
-rw-r--r--bundles/org.eclipse.ui.themes/images/win7Handle.pngbin0 -> 110 bytes
-rw-r--r--bundles/org.eclipse.ui.themes/images/win7TSFrame.pngbin0 -> 138 bytes
-rw-r--r--bundles/org.eclipse.ui.themes/images/winClassicHandle.pngbin0 -> 108 bytes
-rw-r--r--bundles/org.eclipse.ui.themes/images/winClassicTSFrame.pngbin0 -> 138 bytes
-rw-r--r--bundles/org.eclipse.ui.themes/images/winXPBluHandle.pngbin0 -> 110 bytes
-rw-r--r--bundles/org.eclipse.ui.themes/images/winXPBluTSFrame.pngbin0 -> 138 bytes
-rw-r--r--bundles/org.eclipse.ui.themes/images/winXPBlue.pngbin0 -> 3482 bytes
-rw-r--r--bundles/org.eclipse.ui.themes/images/winXPHandle.pngbin0 -> 193 bytes
-rw-r--r--bundles/org.eclipse.ui.themes/images/winXPOlive.pngbin0 -> 434 bytes
-rw-r--r--bundles/org.eclipse.ui.themes/images/winXPTSFrame.pngbin0 -> 227 bytes
16 files changed, 4 insertions, 2 deletions
diff --git a/bundles/org.eclipse.e4.ui.css.swt.theme/src/org/eclipse/e4/ui/css/swt/internal/theme/ThemeEngine.java b/bundles/org.eclipse.e4.ui.css.swt.theme/src/org/eclipse/e4/ui/css/swt/internal/theme/ThemeEngine.java
index 407a4c69df9..07d078cc891 100644
--- a/bundles/org.eclipse.e4.ui.css.swt.theme/src/org/eclipse/e4/ui/css/swt/internal/theme/ThemeEngine.java
+++ b/bundles/org.eclipse.e4.ui.css.swt.theme/src/org/eclipse/e4/ui/css/swt/internal/theme/ThemeEngine.java
@@ -213,8 +213,10 @@ public class ThemeEngine implements IThemeEngine {
}
}
- //Resolve to install dir
- registerResourceLocator(new OSGiResourceLocator("platform:/plugin/org.eclipse.platform/css/"));
+ // register a default resolver for platform uri's
+ registerResourceLocator(new OSGiResourceLocator(
+ "platform:/plugin/org.eclipse.ui.themes/css/"));
+ // register a default resolver for file uri's
registerResourceLocator(new FileResourcesLocatorImpl());
// FIXME: perhaps ResourcesLocatorManager shouldn't have a default?
// registerResourceLocator(new HttpResourcesLocatorImpl());
diff --git a/bundles/org.eclipse.ui.themes/images/dragHandle.png b/bundles/org.eclipse.ui.themes/images/dragHandle.png
new file mode 100644
index 00000000000..bea11793b12
--- /dev/null
+++ b/bundles/org.eclipse.ui.themes/images/dragHandle.png
Binary files differ
diff --git a/bundles/org.eclipse.ui.themes/images/macGrey.png b/bundles/org.eclipse.ui.themes/images/macGrey.png
new file mode 100644
index 00000000000..59075addb38
--- /dev/null
+++ b/bundles/org.eclipse.ui.themes/images/macGrey.png
Binary files differ
diff --git a/bundles/org.eclipse.ui.themes/images/macHandle.png b/bundles/org.eclipse.ui.themes/images/macHandle.png
new file mode 100644
index 00000000000..98b2193b0b5
--- /dev/null
+++ b/bundles/org.eclipse.ui.themes/images/macHandle.png
Binary files differ
diff --git a/bundles/org.eclipse.ui.themes/images/macTSFrame.png b/bundles/org.eclipse.ui.themes/images/macTSFrame.png
new file mode 100644
index 00000000000..ee32cf56b88
--- /dev/null
+++ b/bundles/org.eclipse.ui.themes/images/macTSFrame.png
Binary files differ
diff --git a/bundles/org.eclipse.ui.themes/images/win7.png b/bundles/org.eclipse.ui.themes/images/win7.png
new file mode 100644
index 00000000000..b9bf09d3369
--- /dev/null
+++ b/bundles/org.eclipse.ui.themes/images/win7.png
Binary files differ
diff --git a/bundles/org.eclipse.ui.themes/images/win7Handle.png b/bundles/org.eclipse.ui.themes/images/win7Handle.png
new file mode 100644
index 00000000000..b73a9632b16
--- /dev/null
+++ b/bundles/org.eclipse.ui.themes/images/win7Handle.png
Binary files differ
diff --git a/bundles/org.eclipse.ui.themes/images/win7TSFrame.png b/bundles/org.eclipse.ui.themes/images/win7TSFrame.png
new file mode 100644
index 00000000000..eec6be6f8e8
--- /dev/null
+++ b/bundles/org.eclipse.ui.themes/images/win7TSFrame.png
Binary files differ
diff --git a/bundles/org.eclipse.ui.themes/images/winClassicHandle.png b/bundles/org.eclipse.ui.themes/images/winClassicHandle.png
new file mode 100644
index 00000000000..cfeb6dd3e0f
--- /dev/null
+++ b/bundles/org.eclipse.ui.themes/images/winClassicHandle.png
Binary files differ
diff --git a/bundles/org.eclipse.ui.themes/images/winClassicTSFrame.png b/bundles/org.eclipse.ui.themes/images/winClassicTSFrame.png
new file mode 100644
index 00000000000..0b9101cc03e
--- /dev/null
+++ b/bundles/org.eclipse.ui.themes/images/winClassicTSFrame.png
Binary files differ
diff --git a/bundles/org.eclipse.ui.themes/images/winXPBluHandle.png b/bundles/org.eclipse.ui.themes/images/winXPBluHandle.png
new file mode 100644
index 00000000000..45441b32864
--- /dev/null
+++ b/bundles/org.eclipse.ui.themes/images/winXPBluHandle.png
Binary files differ
diff --git a/bundles/org.eclipse.ui.themes/images/winXPBluTSFrame.png b/bundles/org.eclipse.ui.themes/images/winXPBluTSFrame.png
new file mode 100644
index 00000000000..5880d782482
--- /dev/null
+++ b/bundles/org.eclipse.ui.themes/images/winXPBluTSFrame.png
Binary files differ
diff --git a/bundles/org.eclipse.ui.themes/images/winXPBlue.png b/bundles/org.eclipse.ui.themes/images/winXPBlue.png
new file mode 100644
index 00000000000..fc279647bff
--- /dev/null
+++ b/bundles/org.eclipse.ui.themes/images/winXPBlue.png
Binary files differ
diff --git a/bundles/org.eclipse.ui.themes/images/winXPHandle.png b/bundles/org.eclipse.ui.themes/images/winXPHandle.png
new file mode 100644
index 00000000000..17eb69a8935
--- /dev/null
+++ b/bundles/org.eclipse.ui.themes/images/winXPHandle.png
Binary files differ
diff --git a/bundles/org.eclipse.ui.themes/images/winXPOlive.png b/bundles/org.eclipse.ui.themes/images/winXPOlive.png
new file mode 100644
index 00000000000..c745ee1b418
--- /dev/null
+++ b/bundles/org.eclipse.ui.themes/images/winXPOlive.png
Binary files differ
diff --git a/bundles/org.eclipse.ui.themes/images/winXPTSFrame.png b/bundles/org.eclipse.ui.themes/images/winXPTSFrame.png
new file mode 100644
index 00000000000..baf45b9be5a
--- /dev/null
+++ b/bundles/org.eclipse.ui.themes/images/winXPTSFrame.png
Binary files differ

Back to the top