Changeset 25848

Show
Ignore:
Timestamp:
28.06.2012 11:14:55 (7 years ago)
Author:
sjm84
Message:

Some minor reformatting

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/TransformingReceptionist.java

    r25821 r25848  
    807807            GSXML.addDebugSpanTags(skinAndLibraryDoc); 
    808808        } 
    809         if (output.equals("skinandlibdocfinal")) { 
    810           return converter.getDOM(getStringFromDocument(skinAndLibraryDoc)); 
     809        if (output.equals("skinandlibdocfinal")) 
     810        { 
     811            return converter.getDOM(getStringFromDocument(skinAndLibraryDoc)); 
    811812        } 
    812813        return this.transformer.transform(skinAndLibraryDoc, doc, config_params, docWithDoctype); 
     
    871872            else 
    872873            { 
    873               //GSXSLT.mergeStylesheets(skinAndLibraryDoc, ((Document) result).getDocumentElement(), true); 
    874               // we just want the result of the transform to be in skinAndLibraryDoc 
    875               Element old_doc = skinAndLibraryDoc.getDocumentElement(); 
    876               skinAndLibraryDoc.removeChild(old_doc); 
    877               skinAndLibraryDoc.appendChild(skinAndLibraryDoc.importNode(((Document) result).getDocumentElement(), true)); 
     874                GSXSLT.mergeStylesheets(skinAndLibraryDoc, ((Document) result).getDocumentElement(), true); 
     875                // we just want the result of the transform to be in skinAndLibraryDoc 
     876                Element old_doc = skinAndLibraryDoc.getDocumentElement(); 
     877                skinAndLibraryDoc.removeChild(old_doc); 
     878                skinAndLibraryDoc.appendChild(skinAndLibraryDoc.importNode(((Document) result).getDocumentElement(), true)); 
    878879            } 
    879880        }