[gbif-cvs] gbifPortal/src/org/gbif/registry RegistryLoader.java,1.5,1.6

[Damian B. <dba...@us...>]

Update of /cvsroot/gbif/gbifPortal/src/org/gbif/registry
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6886

Modified Files:
	RegistryLoader.java 
Log Message:
Updated

Index: RegistryLoader.java
===================================================================
RCS file: /cvsroot/gbif/gbifPortal/src/org/gbif/registry/RegistryLoader.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** RegistryLoader.java	14 Mar 2005 03:43:37 -0000	1.5
--- RegistryLoader.java	14 Mar 2005 06:23:49 -0000	1.6
***************
*** 48,71 ****
    private RegistryTracker tracker = null;
  
!   public RegistryLoader() throws RegistryException {
      registry = new Registry();
    }
  
!   public RegistryLoader(RegistryTracker t) throws RegistryException {
      this();
      tracker = t;
    }
  
!   public RegistryLoader(Registry reg) throws RegistryException {
      registry = reg;
    }
  
!   public RegistryLoader(Registry reg, RegistryTracker t) throws
!       RegistryException {
      registry = reg;
      tracker = t;
    }
  
!   public void loadRegistry() throws RegistryException {
      try {
        if (tracker != null) {
--- 48,75 ----
    private RegistryTracker tracker = null;
  
!   public RegistryLoader()
!       throws RegistryException {
      registry = new Registry();
    }
  
!   public RegistryLoader(RegistryTracker t)
!       throws RegistryException {
      this();
      tracker = t;
    }
  
!   public RegistryLoader(Registry reg)
!       throws RegistryException {
      registry = reg;
    }
  
!   public RegistryLoader(Registry reg, RegistryTracker t)
!       throws RegistryException {
      registry = reg;
      tracker = t;
    }
  
!   public void loadRegistry()
!       throws RegistryException {
      try {
        if (tracker != null) {
***************
*** 205,209 ****
                                ProviderDataBean provider,
                                KeyedReference keyedReference,
!                               ArrayList mappings) throws RegistryException {
      boolean modified = false;
  
--- 209,214 ----
                                ProviderDataBean provider,
                                KeyedReference keyedReference,
!                               ArrayList mappings)
!       throws RegistryException {
      boolean modified = false;
  
***************
*** 270,274 ****
    public void loadServices(DataBeanFactory factory,
                             BusinessServiceArrayList businessServices,
!                            ProviderDataBean provider) throws RegistryException {
      try {
        if (businessServices != null) {
--- 275,280 ----
    public void loadServices(DataBeanFactory factory,
                             BusinessServiceArrayList businessServices,
!                            ProviderDataBean provider)
!       throws RegistryException {
      try {
        if (businessServices != null) {
***************
*** 350,355 ****
    public boolean loadServiceCategories(DataBeanFactory factory,
                                         CategoryBag categoryBag,
!                                        ServiceDataBean service) throws
!       RegistryException {
      boolean modified = false;
  
--- 356,361 ----
    public boolean loadServiceCategories(DataBeanFactory factory,
                                         CategoryBag categoryBag,
!                                        ServiceDataBean service)
!       throws RegistryException {
      boolean modified = false;
  
***************
*** 363,367 ****
          keyedReferences = categoryBag.getKeyedReferenceArrayList();
          if (keyedReferences != null) {
!           for (int idx = 0; idx < keyedReferences.size(); idx++) {
              KeyedReference keyedReference = keyedReferences.get(idx);
              TModelDataBean tModelBean = loadTModel(factory,
--- 369,373 ----
          keyedReferences = categoryBag.getKeyedReferenceArrayList();
          if (keyedReferences != null) {
!           for (int idx=0; idx<keyedReferences.size(); idx++) {
              KeyedReference keyedReference = keyedReferences.get(idx);
              TModelDataBean tModelBean = loadTModel(factory,
***************
*** 397,404 ****
  
              boolean codePresent = false;
!             for (int i = 0; !codePresent && i < mappings.size(); i++) {
!               ServiceMappingDataBean mapping = (ServiceMappingDataBean)
!                   mappings.
!                   get(i);
                ServiceCodeDataBean testCode = factory.getServiceCodeDataBean(
                    mapping.getCodeKey());
--- 403,409 ----
  
              boolean codePresent = false;
!             for (int jdx=0; !codePresent && jdx<mappings.size(); jdx++) {
!               ServiceMappingDataBean mapping =
!                   (ServiceMappingDataBean)mappings.get(jdx);
                ServiceCodeDataBean testCode = factory.getServiceCodeDataBean(
                    mapping.getCodeKey());
***************
*** 441,446 ****
    public ArrayList loadBindings(DataBeanFactory factory,
                                  BindingTemplateArrayList bindingTemplates,
!                                 ServiceDataBean service) throws
!       RegistryException {
      ArrayList tModelBeans = new ArrayList();
  
--- 446,451 ----
    public ArrayList loadBindings(DataBeanFactory factory,
                                  BindingTemplateArrayList bindingTemplates,
!                                 ServiceDataBean service)
!       throws RegistryException {
      ArrayList tModelBeans = new ArrayList();
  
***************
*** 480,485 ****
  
            if (tModels != null) {
!             for (int i = 0; tModel == null && idx < tModels.size(); i++) {
!               tModel = (TModelDataBean) tModels.get(idx);
                if (!ConnectionTool.tModelServesSOData(tModel.getName())) {
                  tModel = null;
--- 485,490 ----
  
            if (tModels != null) {
!             for (int jdx=0; tModel == null && jdx < tModels.size(); jdx++) {
!               tModel = (TModelDataBean) tModels.get(jdx);
                if (!ConnectionTool.tModelServesSOData(tModel.getName())) {
                  tModel = null;
***************
*** 532,536 ****
        if (tModelInstanceDetails != null) {
          for (int idx=0; idx<tModelInstanceDetails.size(); idx++) {
!           TModelInstanceInfo tModelInstanceInfo = tModelInstanceDetails.get(0);
            tModels.add(loadTModel(factory, tModelInstanceInfo.getTModelKey()));
          }
--- 537,541 ----
        if (tModelInstanceDetails != null) {
          for (int idx=0; idx<tModelInstanceDetails.size(); idx++) {
!           TModelInstanceInfo tModelInstanceInfo = tModelInstanceDetails.get(idx);
            tModels.add(loadTModel(factory, tModelInstanceInfo.getTModelKey()));
          }
***************
*** 644,648 ****
              AddressLineArrayList addressLines = address.getAddressLineArrayList();
              for (int idx=0; addressLines != null && idx<addressLines.size(); idx++) {
!               AddressLine addressLine = addressLines.get(0);
                if (addressString == null) {
                  addressString = addressLine.getValue().trim();
--- 649,653 ----
              AddressLineArrayList addressLines = address.getAddressLineArrayList();
              for (int idx=0; addressLines != null && idx<addressLines.size(); idx++) {
!               AddressLine addressLine = addressLines.get(idx);
                if (addressString == null) {
                  addressString = addressLine.getValue().trim();