Author: kmorin Date: 2009-07-23 16:46:10 +0200 (Thu, 23 Jul 2009) New Revision: 1520 Modified: trunk/guix-compiler/src/main/java/org/nuiton/guix/GuixLauncher.java trunk/guix-compiler/src/main/java/org/nuiton/guix/compiler/GuixCompiler.java trunk/guix-compiler/src/main/java/org/nuiton/guix/generator/JavaFile.java Log: Add null conditions to avoid NPE Modified: trunk/guix-compiler/src/main/java/org/nuiton/guix/GuixLauncher.java =================================================================== --- trunk/guix-compiler/src/main/java/org/nuiton/guix/GuixLauncher.java 2009-07-23 13:33:45 UTC (rev 1519) +++ trunk/guix-compiler/src/main/java/org/nuiton/guix/GuixLauncher.java 2009-07-23 14:46:10 UTC (rev 1520) @@ -420,7 +420,9 @@ } return classDescriptor; } - classDescriptors.get(i).setPackageName(classDescriptor.getPackageName()); + if(classDescriptor.getPackageName() != null) { + classDescriptors.get(i).setPackageName(classDescriptor.getPackageName()); + } if (classDescriptor.getScript() != null) { if (classDescriptors.get(i).getScript() == null) { classDescriptors.get(i).setScript(classDescriptor.getScript()); Modified: trunk/guix-compiler/src/main/java/org/nuiton/guix/compiler/GuixCompiler.java =================================================================== --- trunk/guix-compiler/src/main/java/org/nuiton/guix/compiler/GuixCompiler.java 2009-07-23 13:33:45 UTC (rev 1519) +++ trunk/guix-compiler/src/main/java/org/nuiton/guix/compiler/GuixCompiler.java 2009-07-23 14:46:10 UTC (rev 1520) @@ -118,7 +118,6 @@ public GuixModelObject compile() { if ((src != null) && (launcher != null)) { try { - // Creation of the Xml parser XmlPullParserFactory factory = XmlPullParserFactory.newInstance(System.getProperty(XmlPullParserFactory.PROPERTY_NAME), null); Modified: trunk/guix-compiler/src/main/java/org/nuiton/guix/generator/JavaFile.java =================================================================== --- trunk/guix-compiler/src/main/java/org/nuiton/guix/generator/JavaFile.java 2009-07-23 13:33:45 UTC (rev 1519) +++ trunk/guix-compiler/src/main/java/org/nuiton/guix/generator/JavaFile.java 2009-07-23 14:46:10 UTC (rev 1520) @@ -189,7 +189,7 @@ public void addField(JavaField field, boolean javaBean) { addSimpleField(field); String id = field.getName(); - String capitalizedName = (id.length()>0)? Character.toUpperCase(id.charAt(0))+id.substring(1) : id; + String capitalizedName = (id != null && id.length()>0)? Character.toUpperCase(id.charAt(0))+id.substring(1) : id; // add getter file String content = (classType == INTERFACE) ? null : String.format(GETTER_PATTERN, id); addMethod(new JavaMethod(Modifier.PUBLIC, field.getType(),