Author: scabanovich Date: 2007-07-20 10:50:46 -0400 (Fri, 20 Jul 2007) New Revision: 2556 Modified: trunk/shale/plugins/org.jboss.tools.shale/src/org/jboss/tools/shale/model/clay/ShaleClayEntityRecognizer.java trunk/shale/plugins/org.jboss.tools.shale/src/org/jboss/tools/shale/model/dialog/ShaleDialogEntityRecognizer.java trunk/shale/plugins/org.jboss.tools.shale/src/org/jboss/tools/shale/model/spring/SpringBeansEntityRecognizer.java Log: EXIN-86 NullPointerException prevented when registering missing resources. Modified: trunk/shale/plugins/org.jboss.tools.shale/src/org/jboss/tools/shale/model/clay/ShaleClayEntityRecognizer.java =================================================================== --- trunk/shale/plugins/org.jboss.tools.shale/src/org/jboss/tools/shale/model/clay/ShaleClayEntityRecognizer.java 2007-07-20 14:50:23 UTC (rev 2555) +++ trunk/shale/plugins/org.jboss.tools.shale/src/org/jboss/tools/shale/model/clay/ShaleClayEntityRecognizer.java 2007-07-20 14:50:46 UTC (rev 2556) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.tools.shale.model.clay; -import org.eclipse.core.runtime.FileLocator; import org.jboss.tools.common.model.loaders.EntityRecognizer; import org.jboss.tools.common.xml.XMLEntityResolver; import org.jboss.tools.shale.ShaleModelPlugin; @@ -20,7 +19,7 @@ static { try { Class<?> c = ShaleClayEntityRecognizer.class; - XMLEntityResolver.registerPublicEntity(DOC_PUBLICID, FileLocator.resolve(c.getResource("/meta/shale-clay-config_1_0.dtd")).toString()); + XMLEntityResolver.registerPublicEntity(DOC_PUBLICID, c, "/meta/shale-clay-config_1_0.dtd"); } catch (Exception e) { ShaleModelPlugin.getPluginLog().logError(e); } Modified: trunk/shale/plugins/org.jboss.tools.shale/src/org/jboss/tools/shale/model/dialog/ShaleDialogEntityRecognizer.java =================================================================== --- trunk/shale/plugins/org.jboss.tools.shale/src/org/jboss/tools/shale/model/dialog/ShaleDialogEntityRecognizer.java 2007-07-20 14:50:23 UTC (rev 2555) +++ trunk/shale/plugins/org.jboss.tools.shale/src/org/jboss/tools/shale/model/dialog/ShaleDialogEntityRecognizer.java 2007-07-20 14:50:46 UTC (rev 2556) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.tools.shale.model.dialog; -import org.eclipse.core.runtime.FileLocator; import org.jboss.tools.common.model.loaders.EntityRecognizer; import org.jboss.tools.common.xml.XMLEntityResolver; import org.jboss.tools.shale.ShaleModelPlugin; @@ -20,7 +19,7 @@ static { try { Class<?> c = ShaleDialogEntityRecognizer.class; - XMLEntityResolver.registerPublicEntity(DOC_PUBLICID, FileLocator.resolve(c.getResource("/meta/shale-dialog-config_1_0.dtd")).toString()); + XMLEntityResolver.registerPublicEntity(DOC_PUBLICID, c, "/meta/shale-dialog-config_1_0.dtd"); } catch (Exception e) { ShaleModelPlugin.getPluginLog().logError(e); } Modified: trunk/shale/plugins/org.jboss.tools.shale/src/org/jboss/tools/shale/model/spring/SpringBeansEntityRecognizer.java =================================================================== --- trunk/shale/plugins/org.jboss.tools.shale/src/org/jboss/tools/shale/model/spring/SpringBeansEntityRecognizer.java 2007-07-20 14:50:23 UTC (rev 2555) +++ trunk/shale/plugins/org.jboss.tools.shale/src/org/jboss/tools/shale/model/spring/SpringBeansEntityRecognizer.java 2007-07-20 14:50:46 UTC (rev 2556) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.tools.shale.model.spring; -import org.eclipse.core.runtime.FileLocator; import org.jboss.tools.common.model.loaders.EntityRecognizer; import org.jboss.tools.common.xml.XMLEntityResolver; import org.jboss.tools.shale.ShaleModelPlugin; @@ -20,7 +19,7 @@ static { try { Class<?> c = SpringBeansEntityRecognizer.class; - XMLEntityResolver.registerPublicEntity(DOC_PUBLICID, FileLocator.resolve(c.getResource("/meta/spring-beans.dtd")).toString()); + XMLEntityResolver.registerPublicEntity(DOC_PUBLICID, c, "/meta/spring-beans.dtd"); } catch (Exception e) { ShaleModelPlugin.getPluginLog().logError(e); }