Automated merge with http://hg.netbeans.org/main/ asynchronous_lookup_events_base
authorJun Qian <jqian@netbeans.org>
Wed, 18 Jun 2008 16:03:46 -0700
changeset 3513c12efe4d4d90
parent 3511 cb3277d0bf5a
parent 3512 7b413a045625
child 3514 28054f392432
child 3515 c29cd076daf3
child 3523 c536973e7937
child 3540 e5a3d5ba5a18
Automated merge with http://hg.netbeans.org/main/
     1.1 --- a/compapp.projects.jbi/src/org/netbeans/modules/compapp/projects/jbi/CasaHelper.java	Wed Jun 18 17:43:46 2008 +0400
     1.2 +++ b/compapp.projects.jbi/src/org/netbeans/modules/compapp/projects/jbi/CasaHelper.java	Wed Jun 18 16:03:46 2008 -0700
     1.3 @@ -298,6 +298,15 @@
     1.4              NodeList seSUs = sus.getElementsByTagName(
     1.5                      CasaConstants.CASA_SERVICE_ENGINE_SERVICE_UNIT_ELEM_NAME);
     1.6              
     1.7 +            List<Element> internalSESUs = new ArrayList<Element>();
     1.8 +            for (int i = 0; i < seSUs.getLength(); i++) {
     1.9 +                Element seSU = (Element) seSUs.item(i);
    1.10 +                String isInternal = seSU.getAttribute(CasaConstants.CASA_INTERNAL_ATTR_NAME);
    1.11 +                if (isInternal == null || "true".equalsIgnoreCase(isInternal)) {
    1.12 +                    internalSESUs.add(seSU);
    1.13 +                }
    1.14 +            }
    1.15 +            
    1.16              @SuppressWarnings("unchecked")
    1.17              List<VisualClassPathItem> newContentList = 
    1.18                      (List) properties.get(JbiProjectProperties.JBI_CONTENT_ADDITIONAL);
    1.19 @@ -311,15 +320,13 @@
    1.20              }
    1.21              
    1.22              List<String> sesuUnitNameList = new ArrayList<String>();
    1.23 -            for (int i = 0; i < seSUs.getLength(); i++) {
    1.24 -                Element seSU = (Element) seSUs.item(i);
    1.25 +            for (Element seSU : internalSESUs) {
    1.26                  String unitName = seSU.getAttribute(CasaConstants.CASA_UNIT_NAME_ATTR_NAME);
    1.27                  sesuUnitNameList.add(unitName);
    1.28              }
    1.29  
    1.30              // Remove deleted service units from casa
    1.31 -            for (int i = 0; i < seSUs.getLength(); i++) {
    1.32 -                Element seSU = (Element) seSUs.item(i);
    1.33 +            for (Element seSU : internalSESUs) {
    1.34                  String projName = seSU.getAttribute(CasaConstants.CASA_UNIT_NAME_ATTR_NAME);
    1.35                  if (!newProjectNameList.contains(projName)) {
    1.36                      sus.removeChild(seSU);