Update of /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/wizard/addstage
In directory sc8-pr-cvs1:/tmp/cvs-serv19450/com/babeldoc/gui/wizard/addstage
Modified Files:
AddPipelineStageController.java AddPipelineStageModel.java
GetStageConfigWizardPanel.java
Log Message:
Lots of GUI loving! Been working on the pipeline builder tool
and getting into some shape. Now the pipeline stage configuration editing is looking a whole lot better.
Index: AddPipelineStageController.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/wizard/addstage/AddPipelineStageController.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AddPipelineStageController.java 11 Jun 2003 23:35:38 -0000 1.4
--- AddPipelineStageController.java 13 Sep 2003 15:33:11 -0000 1.5
***************
*** 91,97 ****
/**
! * TODO: DOCUMENT ME!
*
! * @param model DOCUMENT ME!
*/
public void setModel(AddPipelineStageModel model) {
--- 91,97 ----
/**
! * Set the model
*
! * @param model
*/
public void setModel(AddPipelineStageModel model) {
***************
*** 143,149 ****
public void finish(WizardPanel current) {
if (((GetStageConfigWizardPanel) current).getConfigPanel().isValid()) {
- GetStageConfigWizardPanel cfgpanel = (GetStageConfigWizardPanel) current;
- this.getModel().setPipelineStageConfiguration(cfgpanel.getConfigPanel()
- .getStageProperties());
this.getModel().setFinished(true);
closeDialog();
--- 143,146 ----
Index: AddPipelineStageModel.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/wizard/addstage/AddPipelineStageModel.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AddPipelineStageModel.java 26 Aug 2003 22:23:32 -0000 1.6
--- AddPipelineStageModel.java 13 Sep 2003 15:33:11 -0000 1.7
***************
*** 67,77 ****
import com.babeldoc.core.option.IConfigInfo;
import com.babeldoc.core.pipeline.*;
import com.babeldoc.gui.pipeline.builder.PipelineBuilderModel;
import com.babeldoc.gui.wizard.WizardModel;
- import java.util.Properties;
-
/**
--- 67,77 ----
import com.babeldoc.core.option.IConfigInfo;
+ import com.babeldoc.core.option.MutableConfigValueException;
import com.babeldoc.core.pipeline.*;
+ import com.babeldoc.core.LogService;
import com.babeldoc.gui.pipeline.builder.PipelineBuilderModel;
import com.babeldoc.gui.wizard.WizardModel;
/**
***************
*** 82,85 ****
--- 82,86 ----
private String stage;
private String stageType;
+ private IConfigInfo stageInfo;
private boolean pipelineChangeable = true;
private boolean showDefaults = true;
***************
*** 172,198 ****
* @return
*
- * @throws Exception
*/
! public IConfigInfo getPipelineStageConfigInfo() throws Exception {
! Class stage = PipelineStageType.getPipelineStageType(stageType)
! .getTypeClass();
! if (stage != null) {
! IPipelineStage pstage = (IPipelineStage) (stage.newInstance());
! return pstage.getInfo();
! } else {
! return null;
}
}
- /**
- * TODO: DOCUMENT ME!
- *
- * @param properties DOCUMENT ME!
- */
- public void setPipelineStageConfiguration(Properties properties) {
- PipelineBuilderModel.setPipelineStageProperties(pipeline, stage, properties);
- }
/**
--- 173,205 ----
* @return
*
*/
! public IConfigInfo getPipelineStageConfigInfo() {
! if(stageInfo==null) {
! Class stageClass = PipelineStageType.getPipelineStageType(stageType).getTypeClass();
! if (stage != null) {
! try {
! IPipelineStage pstage = (IPipelineStage) (stageClass.newInstance());
! // Setup the pipeline stage & the information objects
! pstage.setName(getStage());
! stageInfo = pstage.getInfo();
! stageInfo.setName(getStage());
! try {
! stageInfo.getOption("stageType").setValue(getStageType());
! } catch (MutableConfigValueException e) {
! // Should never happen with stageType
! }
!
! } catch (InstantiationException e) {
! LogService.getInstance().logError(e);
! } catch (IllegalAccessException e) {
! LogService.getInstance().logError(e);
! }
! }
}
+ return stageInfo;
}
/**
Index: GetStageConfigWizardPanel.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/wizard/addstage/GetStageConfigWizardPanel.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** GetStageConfigWizardPanel.java 26 Aug 2003 22:23:32 -0000 1.4
--- GetStageConfigWizardPanel.java 13 Sep 2003 15:33:11 -0000 1.5
***************
*** 108,117 ****
configPanel.removeAll();
configPanel.initialize(getModel().getPipelineStageConfigInfo());
!
! if (getModel().isShowDefaults()) {
! configPanel.displayDefaults();
! } else {
! configPanel.displayValues();
! }
} catch (Exception e) {
e.printStackTrace();
--- 108,112 ----
configPanel.removeAll();
configPanel.initialize(getModel().getPipelineStageConfigInfo());
! configPanel.displayValues();
} catch (Exception e) {
e.printStackTrace();
|