Update of /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/ui/internal/wizards
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3509/Plugin/com/ibm/ecute/rsa/ui/internal/wizards
Modified Files:
ExportCIMMOFWizardPage.java
Log Message:
Complete check and repair
Index: ExportCIMMOFWizardPage.java
===================================================================
RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/ui/internal/wizards/ExportCIMMOFWizardPage.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ExportCIMMOFWizardPage.java 29 Jun 2005 11:24:02 -0000 1.12
+++ ExportCIMMOFWizardPage.java 10 Aug 2005 17:26:00 -0000 1.13
@@ -47,6 +47,7 @@
import com.ibm.ecute.EntryPoint;
import com.ibm.ecute.rsa.core.internal.dialogs.PackageSelectionDialog;
import com.ibm.ecute.rsa.core.internal.dialogs.ProgressLogDialog;
+import com.ibm.ecute.rsa.core.internal.properties.CheckAndRepair;
import com.ibm.ecute.rsa.ui.internal.wizards.command.ModelLabelProvider;
import com.ibm.ecute.rsa.ui.internal.wizards.command.ModelPackageContentProvider;
import com.ibm.ecute.utils.Constants;
@@ -610,16 +611,28 @@
return false;
}
writeConfiguration(mofOutpuConfig);
-
- EntryPoint entryPoint = new EntryPoint(mofOutpuConfig, progressLog);
- boolean result = entryPoint.returnResult();
- if(result){
- progressLog.allTasksDone();
- }else{
- progressLog.updateImage(progressLog.getErrorImage());
- progressLog.setTitle("Error");
- }
- return true;
+
+ CheckAndRepair checker = new CheckAndRepair(getModel());
+ ProgressLogDialog frame = new ProgressLogDialog(shell);
+ if(checker.checkAndRepairAll(frame, true)){
+
+ progressLog.addLine2Log("Check and Repair passed successfully");
+ progressLog.addLine2Log("");
+
+ EntryPoint entryPoint = new EntryPoint(mofOutpuConfig, progressLog);
+ boolean result = entryPoint.returnResult();
+ if(result){
+ progressLog.allTasksDone();
+ }else{
+ progressLog.updateImage(progressLog.getErrorImage());
+ progressLog.setTitle("Error");
+ }
+ return true;
+ } else {
+ progressLog.close();
+ frame.addLine2Log("--> The model contains association end errors so the export has been aborted");
+ return true;
+ }
}
protected boolean allowNewContainerName()
|
