[jbosstools-commits] JBoss Tools SVN: r17095 - in trunk/common/plugins/org.jboss.tools.common.text.xml: resources/icons and 2 other directories.
Author: dgolovin
Date: 2009-08-14 19:48:17 -0400 (Fri, 14 Aug 2009)
New Revision: 17095
Added:
trunk/common/plugins/org.jboss.tools.common.text.xml/resources/org/jboss/tools/common/text/xml/xpl/
Removed:
trunk/common/plugins/org.jboss.tools.common.text.xml/resources/icons/xpl/
Modified:
trunk/common/plugins/org.jboss.tools.common.text.xml/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/xpl/ToggleOccurencesMarkUpAction.java
Log:
fix for exceptions in Hibernate-console tests when they are running in development
environment related to opening XML editor.
fix for occurrences icons loading to work right in dev and runtime workspace
Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.xml/META-INF/MANIFEST.MF 2009-08-14
21:31:23 UTC (rev 17094)
+++ trunk/common/plugins/org.jboss.tools.common.text.xml/META-INF/MANIFEST.MF 2009-08-14
23:48:17 UTC (rev 17095)
@@ -21,21 +21,14 @@
org.jboss.tools.jst.jsp.text,
org.jboss.tools.jst.jsp.text.xpl
Require-Bundle: org.jboss.tools.common,
- org.eclipse.ui.ide,
- org.eclipse.ui.editors,
org.eclipse.core.runtime,
- org.eclipse.swt,
org.eclipse.ui,
- org.eclipse.text,
- org.eclipse.jface,
org.eclipse.jface.text,
- org.eclipse.ui.workbench,
org.eclipse.ui.workbench.texteditor,
org.eclipse.jdt.ui,
org.eclipse.jdt.core,
org.eclipse.wst.xml.ui,
org.eclipse.wst.sse.ui,
- org.eclipse.wst.xml.core,
org.eclipse.wst.sse.core,
org.eclipse.core.resources
Bundle-Version: 2.0.0
Copied:
trunk/common/plugins/org.jboss.tools.common.text.xml/resources/org/jboss/tools/common/text/xml/xpl
(from rev 17063,
trunk/common/plugins/org.jboss.tools.common.text.xml/resources/icons/xpl)
Modified:
trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/xpl/ToggleOccurencesMarkUpAction.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/xpl/ToggleOccurencesMarkUpAction.java 2009-08-14
21:31:23 UTC (rev 17094)
+++
trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/xpl/ToggleOccurencesMarkUpAction.java 2009-08-14
23:48:17 UTC (rev 17095)
@@ -100,22 +100,15 @@
setDescription(getString(bundle, descriptionKey, null));
String relPath= getString(bundle, imageKey, null);
-
- try {
- ImageDescriptor id =
ImageDescriptor.createFromURL(makeIconFileURL("icons/xpl", relPath));
//$NON-NLS-1$
- if (id != null)
- setImageDescriptor(id);
- } catch (MalformedURLException e) {
- //ignore
+ ImageDescriptor id = ImageDescriptor.createFromFile(ToggleOccurencesMarkUpAction.class,
relPath); //$NON-NLS-1$
+ if (id != null) {
+ setImageDescriptor(id);
}
- relPath= getString(bundle, disabledImageKey, null);
- try {
- ImageDescriptor id=
ImageDescriptor.createFromURL(makeIconFileURL("icons/xpl", relPath));
//$NON-NLS-1$
- if (id != null)
- setDisabledImageDescriptor(id);
- } catch (MalformedURLException e) {
- //ignore
+ relPath = getString(bundle, disabledImageKey, null);
+ id= ImageDescriptor.createFromFile(ToggleOccurencesMarkUpAction.class, relPath);
//$NON-NLS-1$
+ if (id != null) {
+ setDisabledImageDescriptor(id);
}
}