[Sblim-commit] ecute/Plugin/com/ibm/ecute/rsa/ui/internal/wizards ExportCIMMOFWizardPage.java,1.11,1.12 GenerateCMPIProvidersWizardPage.java,1.1,1.2

[Benjamin B. <bg...@us...>]

Update of /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/ui/internal/wizards
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8766/Plugin/com/ibm/ecute/rsa/ui/internal/wizards

Modified Files:
	ExportCIMMOFWizardPage.java 
	GenerateCMPIProvidersWizardPage.java 
Log Message:
ECUTE 2.1 beta 1f:
full CMPI provider generation support for RSA

Index: ExportCIMMOFWizardPage.java
===================================================================
RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/ui/internal/wizards/ExportCIMMOFWizardPage.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ExportCIMMOFWizardPage.java	31 May 2005 15:48:50 -0000	1.11
+++ ExportCIMMOFWizardPage.java	29 Jun 2005 11:24:02 -0000	1.12
@@ -40,6 +40,7 @@
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.dialogs.WizardDataTransferPage;
 import org.eclipse.uml2.Model;
+import org.eclipse.uml2.NamedElement;
 import org.eclipse.uml2.Package;
 
 import com.ibm.ecute.EcuteEclipsePlugin;
@@ -171,8 +172,22 @@
                         packageList.add(package_.getQualifiedName());
                         packageTable.put(package_.getQualifiedName(), package_);
                     }
-                }else{
+                } else if (obj instanceof Model){
                     model = (Model)obj;
+                } else {
+                	if(obj instanceof NamedElement){
+                		Object element = obj;
+                		while(!(((NamedElement)element).getOwner() instanceof Package) && element != null){
+                			element = ((NamedElement)element).getOwner();
+                		}
+                		Package package_ = (Package)((NamedElement)element).getOwner();
+                		if(model == null)
+                			model = package_.getModel();
+                        if(package_.getModel().equals(model)){
+                            packageList.add(package_.getQualifiedName());
+                            packageTable.put(package_.getQualifiedName(), package_);
+                        }
+                	}
                 }
             }
             for(int i = 0; i< packageList.size(); i++){

Index: GenerateCMPIProvidersWizardPage.java
===================================================================
RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/ui/internal/wizards/GenerateCMPIProvidersWizardPage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- GenerateCMPIProvidersWizardPage.java	23 Jun 2005 08:16:59 -0000	1.1
+++ GenerateCMPIProvidersWizardPage.java	29 Jun 2005 11:24:02 -0000	1.2
@@ -43,6 +43,7 @@
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.dialogs.WizardDataTransferPage;
 import org.eclipse.uml2.Model;
+import org.eclipse.uml2.NamedElement;
 import org.eclipse.uml2.Package;
 
 import com.ibm.ecute.EcuteEclipsePlugin;
@@ -199,8 +200,22 @@
                         packageList.add(package_.getQualifiedName());
                         packageTable.put(package_.getQualifiedName(), package_);
                     }
-                }else{
+                } else if (obj instanceof Model){
                     model = (Model)obj;
+                } else {
+                	if(obj instanceof NamedElement){
+                		Object element = obj;
+                		while(!(((NamedElement)element).getOwner() instanceof Package) && element != null){
+                			element = ((NamedElement)element).getOwner();
+                		}
+                		Package package_ = (Package)((NamedElement)element).getOwner();
+                		if(model == null)
+                			model = package_.getModel();
+                        if(package_.getModel().equals(model)){
+                            packageList.add(package_.getQualifiedName());
+                            packageTable.put(package_.getQualifiedName(), package_);
+                        }
+                	}
                 }
             }
             for(int i = 0; i< packageList.size(); i++){
@@ -405,18 +420,21 @@
         codeLabel.setText(CMPI_CODE);
                 
         codeField = new Text(group, SWT.BORDER);
+        codeField.setText("genProvider");
         codeField.addListener(SWT.Modify, this);
 
         repositoryLabel = new Label(group, 0);
         repositoryLabel.setText(CMPI_REP);
                 
         repositoryField = new Text(group, SWT.BORDER);
+        repositoryField.setText("IBMShadow/cimv2");
         repositoryField.addListener(SWT.Modify, this);
         
         cimmomLabel = new Label(group, 0);
         cimmomLabel.setText(CMPI_CIMMOM);
                 
         cimmomField = new Text(group, SWT.BORDER);
+        cimmomField.setText("root/cimv2");
         cimmomField.addListener(SWT.Modify, this);
         
         layoutDestinationGroup();