Author: tchemit Date: 2012-07-30 10:04:01 +0200 (Mon, 30 Jul 2012) New Revision: 2448 Url: http://nuiton.org/repositories/revision/jaxx/2448 Log: fix source loading when coming from a different package Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoSourcesHandler.java trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/ListBeanValidationDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/SimpleBeanValidationByListDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/SimpleBeanValidationByTableDemo.jaxx Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoSourcesHandler.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoSourcesHandler.java 2012-07-30 07:30:24 UTC (rev 2447) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoSourcesHandler.java 2012-07-30 08:04:01 UTC (rev 2448) @@ -68,7 +68,9 @@ if (log.isDebugEnabled()) { log.debug(name + " from " + ui.getIncomingClass()); } - String path = name.substring(ui.getIncomingClass().getPackage().getName().length() + 1); + int lastDotIndex = name.lastIndexOf("."); + String path = "/"+ name.substring(0, lastDotIndex).replaceAll("\\.", "/"); + path += name.substring(lastDotIndex); result = IOUtils.toString(ui.getIncomingClass().getResourceAsStream(path)); if (log.isDebugEnabled()) { log.debug("source [" + name + "], loaded content =\n" + result); @@ -112,7 +114,12 @@ String prefix = ui.getIncomingClass() == null ? "" : ui.getIncomingClass().getPackage().getName() + "."; for (String source : sources) { - String path = prefix + source; + String path; + if (source.startsWith("/")) { + path = source.substring(1); + } else { + path = prefix + source; + } if (log.isDebugEnabled()) { log.debug("adding resource " + path); } Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/ListBeanValidationDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/ListBeanValidationDemo.jaxx 2012-07-30 07:30:24 UTC (rev 2447) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/ListBeanValidationDemo.jaxx 2012-07-30 08:04:01 UTC (rev 2448) @@ -44,8 +44,12 @@ @Override protected String[] getSources() { return new String[]{ getDefaultSource(), "ListBeanValidationDemo.css", - "People.java", "People-error-validation.xml", "People-info-validation.xml", "People-warning-validation.xml", - "ListBeanValidationDemoHandler.java", "PeopleTableModel.java" + "/jaxx.demo.entities.People.java", + "/jaxx.demo.entities.People-error-validation.xml", + "/jaxx.demo.entities.People-info-validation.xml", + "/jaxx.demo.entities.People-warning-validation.xml", + "ListBeanValidationDemoHandler.java", + "PeopleTableModel.java" }; } ]]></script> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/SimpleBeanValidationByListDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/SimpleBeanValidationByListDemo.jaxx 2012-07-30 07:30:24 UTC (rev 2447) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/SimpleBeanValidationByListDemo.jaxx 2012-07-30 08:04:01 UTC (rev 2448) @@ -45,8 +45,14 @@ @Override protected String[] getSources() { return new String[]{ getDefaultSource(), "Validation.css", - "Identity.java", "Identity-error-validation.xml", "Identity-info-validation.xml", "Identity-warning-validation.xml", - "Model.java", "Model-error-validation.xml", "Model-info-validation.xml", "Model-warning-validation.xml" + "/jaxx.demo.entities.Identity.java", + "/jaxx.demo.entities.Identity-error-validation.xml", + "/jaxx.demo.entities.Identity-info-validation.xml", + "/jaxx.demo.entities.Identity-warning-validation.xml", + "/jaxx.demo.entities.Model.java", + "/jaxx.demo.entities.Model-error-validation.xml", + "/jaxx.demo.entities.Model-info-validation.xml", + "/jaxx.demo.entities.Model-warning-validation.xml" }; } ]]> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/SimpleBeanValidationByTableDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/SimpleBeanValidationByTableDemo.jaxx 2012-07-30 07:30:24 UTC (rev 2447) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/SimpleBeanValidationByTableDemo.jaxx 2012-07-30 08:04:01 UTC (rev 2448) @@ -46,8 +46,14 @@ @Override protected String[] getSources() { return new String[]{ getDefaultSource(), "Validation.css", - "Identity.java", "Identity-error-validation.xml", "Identity-info-validation.xml", "Identity-warning-validation.xml", - "Model.java", "Model-error-validation.xml", "Model-info-validation.xml", "Model-warning-validation.xml" + "/jaxx.demo.entities.Identity.java", + "/jaxx.demo.entities.Identity-error-validation.xml", + "/jaxx.demo.entities.Identity-info-validation.xml", + "/jaxx.demo.entities.Identity-warning-validation.xml", + "/jaxx.demo.entities.Model.java", + "/jaxx.demo.entities.Model-error-validation.xml", + "/jaxx.demo.entities.Model-info-validation.xml", + "/jaxx.demo.entities.Model-warning-validation.xml" }; } ]]></script>