[Babeldoc-devel] babeldoc/modules/core/src/com/babeldoc/core/pipeline PipelineFactory.java,1.8,1.9

[<tr...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline
In directory sc8-pr-cvs1:/tmp/cvs-serv23472/pipeline

Modified Files:
	PipelineFactory.java 
Log Message:
now use the TieredConfigurationHelper in PIpelineFactory.

Index: PipelineFactory.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/PipelineFactory.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** PipelineFactory.java	27 Jun 2003 02:19:58 -0000	1.8
--- PipelineFactory.java	16 Jul 2003 05:46:01 -0000	1.9
***************
*** 68,73 ****
  import com.babeldoc.core.I18n;
  import com.babeldoc.core.LogService;
  import com.babeldoc.core.config.ConfigService;
- import com.babeldoc.core.config.IConfig;
  import com.babeldoc.core.journal.IJournalTicket;
  import com.babeldoc.core.pipeline.compiler.PipelineStageCompiler;
--- 68,73 ----
  import com.babeldoc.core.I18n;
  import com.babeldoc.core.LogService;
+ import com.babeldoc.core.TieredConfigurationHelper;
  import com.babeldoc.core.config.ConfigService;
  import com.babeldoc.core.journal.IJournalTicket;
  import com.babeldoc.core.pipeline.compiler.PipelineStageCompiler;
***************
*** 106,110 ****
    PipelineFactory() {
      pipelines = new HashMap();
!     pipelineConfig = loadConfigurationData();
    }
  
--- 106,110 ----
    PipelineFactory() {
      pipelines = new HashMap();
!     pipelineConfig = loadConfigurationData();  // TODO:  Lazy initialize in the getPipelineConfig method
    }
  
***************
*** 134,159 ****
     */
    public static Map loadConfigurationData() {
!     HashMap pipelineConfig = new HashMap();
! 
!     IConfig config = ConfigService.getInstance().getConfig(CONFIG_NAME);
! 
!     for (Iterator keys = config.keys().iterator(); keys.hasNext();) {
!       String key = (String) keys.next();
!       String value = config.getString(key);
!       int dot = key.indexOf('.');
!       String name = key.substring(0, dot);
!       String option = key.substring(dot + 1);
! 
!       HashMap pipeConfig = (HashMap) pipelineConfig.get(name);
! 
!       if (pipeConfig == null) {
!         pipeConfig = new HashMap();
!         pipelineConfig.put(name, pipeConfig);
!       }
! 
!       pipeConfig.put(option, value);
!     }
! 
!     return pipelineConfig;
    }
  
--- 134,138 ----
     */
    public static Map loadConfigurationData() {
!     return new TieredConfigurationHelper(CONFIG_NAME).getNamedConfigs();
    }
  
***************
*** 167,175 ****
  
      try {
!       names = new String[pipelineConfig.size()];
  
        int i = 0;
  
!       for (Iterator keys = pipelineConfig.keySet().iterator(); keys.hasNext();) {
          names[i++] = (String) keys.next();
        }
--- 146,154 ----
  
      try {
!       names = new String[getPipelineConfig().size()];
  
        int i = 0;
  
!       for (Iterator keys = getPipelineConfig().keySet().iterator(); keys.hasNext();) {
          names[i++] = (String) keys.next();
        }
***************
*** 195,200 ****
        throws PipelineException {
      IPipelineStageFactory pipelineStageFactory = PipelineStageCompiler.getInstance()
!                                                                       .getPipelineStageFactory(this,
!         pname);
  
      if (pipelineStageFactory != null) {
--- 174,178 ----
        throws PipelineException {
      IPipelineStageFactory pipelineStageFactory = PipelineStageCompiler.getInstance()
!                                                                       .getPipelineStageFactory(this, pname);
  
      if (pipelineStageFactory != null) {
***************
*** 221,228 ****
  
      // Now get it from the factory.
!     pipelineStageFactory = (IPipelineStageFactory) pipelines.get(pname);
  
      if (pipelineStageFactory == null) {
!       Map config = (Map) pipelineConfig.get(pname);
  
        if (config == null) {
--- 199,206 ----
  
      // Now get it from the factory.
!     pipelineStageFactory = (IPipelineStageFactory) getPipelines().get(pname);
  
      if (pipelineStageFactory == null) {
!       Map config = (Map) getPipelineConfig().get(pname);
  
        if (config == null) {
***************
*** 232,237 ****
        try {
          String type = (String) config.get(TYPE);
!         Class factoryClass = PipelineStageFactoryType.getPipelineStageFactory(type)
!                                                      .getTypeClass();
  
          if (factoryClass != null) {
--- 210,214 ----
        try {
          String type = (String) config.get(TYPE);
!         Class factoryClass = PipelineStageFactoryType.getPipelineStageFactory(type).getTypeClass();
  
          if (factoryClass != null) {
***************
*** 239,243 ****
            pipelineStageFactory.setName(pname);
            pipelineStageFactory.setOptions(config);
!           pipelines.put(pname, pipelineStageFactory);
          } else {
            throw new PipelineException(I18n.get("019010", type));
--- 216,220 ----
            pipelineStageFactory.setName(pname);
            pipelineStageFactory.setOptions(config);
!           getPipelines().put(pname, pipelineStageFactory);
          } else {
            throw new PipelineException(I18n.get("019010", type));
***************
*** 342,346 ****
     */
    public void clearCache() {
!     pipelines.clear();
      LogService.getInstance().logDebug("Clearing Entire Pipeline Cache");
      ConfigService.clearCache();
--- 319,323 ----
     */
    public void clearCache() {
!     getPipelines().clear();
      LogService.getInstance().logDebug("Clearing Entire Pipeline Cache");
      ConfigService.clearCache();
***************
*** 354,358 ****
     */
    public void clearCache(String name) {
!     pipelines.remove(name);
      LogService.getInstance().logDebug("Clearing Pipeline Cache for " + name);
      ConfigService.clearCache(name);
--- 331,335 ----
     */
    public void clearCache(String name) {
!     getPipelines().remove(name);
      LogService.getInstance().logDebug("Clearing Pipeline Cache for " + name);
      ConfigService.clearCache(name);