AMP-30300 allow to disable aggrement code

amp/WEB-INF/src/org/dgfoundation/amp/onepager/models/AutocompleteAcronymTitleModel.java

@@ -5,33 +5,31 @@
 import org.dgfoundation.amp.onepager.yui.AmpAutocompleteFieldPanel;
 
 /**
- * 
  * @author [email protected]
  * @since Nov 14, 2012
- *
  */
 
-public class AutocompleteAcronymTitleModel extends Model<String>{
+public class AutocompleteAcronymTitleModel extends Model<String> {
     private static final long serialVersionUID = 1L;
     private IModel<String> acronymModel;
     private IModel<String> titleModel;
     private String nullText;
-    
+
     public AutocompleteAcronymTitleModel(IModel<String> acronymModel, IModel<String> titleModel, String nullText) {
         this.acronymModel = acronymModel;
         this.titleModel = titleModel;
         this.nullText = nullText;
     }
-    
+
     public String getObject() {
         String ret = "";
         if ((acronymModel == null || acronymModel.getObject() == null) && titleModel.getObject() == null) {
             return nullText;
         }
-        
-        if (acronymModel != null){
+
+        if (acronymModel != null && acronymModel.getObject() != null) {
             ret = ret + AmpAutocompleteFieldPanel.ACRONYM_DELIMITER_START +
-                    acronymModel.getObject() + 
+                    acronymModel.getObject() +
                     AmpAutocompleteFieldPanel.ACRONYM_DELIMITER_STOP;
         }
         ret = ret + titleModel.getObject();

amp/WEB-INF/src/org/digijava/module/xmlpatcher/util/XmlPatcherUtil.java

@@ -77,9 +77,9 @@ public static void recordNewPatchesInDir(String appPath, File dir,
                 }
                 continue;
             }
-            if(f.getName().endsWith(".class")){
+            /*if(f.getName().endsWith(".class")){
                 continue;
-            }
+            }*/
             if (patchNames.contains(f.getName())) {
 
                 AmpXmlPatch patch = patchesMap.get(f.getName());