Changeset 23798

Show
Ignore:
Timestamp:
18.03.2011 10:59:53 (8 years ago)
Author:
sjm84
Message:

Fixes to Greenstone 3 after Steven's changes

Location:
main/trunk/greenstone3
Files:
1 added
1 modified
1 moved

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GS2MacroResolver.java

    r23791 r23798  
    6565    }  
    6666 
    67     Stack macros;//ArrayList macros; 
     67    Stack macros = new Stack();//ArrayList macros; 
    6868    if (scope.equals(SCOPE_TEXT)) { 
    69         macros = text_macros; 
     69        macros.addAll(text_macros); 
    7070    } else { 
    71         macros = metadata_macros; 
     71        macros.addAll(metadata_macros); 
    7272    } 
    7373    //for (int i=0; i<macros.size(); i++) {