Attachment 59124 Details for Bug 173631 – Patch for bugs: 174416, 173631 and 173437

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch for bugs: 174416, 173631 and 173437

Patch_174416-173631-173437.txt (text/plain), 10.91 KB, created by Nalini V

on 2007-02-16 06:05:16 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Nalini V

Created: 2007-02-16 06:05:16 EST

Size: 10.91 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.tptp.wsdm.editor
>Index: src/org/eclipse/tptp/wsdm/tooling/wizard/mrt/internal/CapabilitySelectionWizardPage.java
>===================================================================
>RCS file: /cvsroot/ganges/org.eclipse.tptp.wsdm.editor/src/org/eclipse/tptp/wsdm/tooling/wizard/mrt/internal/CapabilitySelectionWizardPage.java,v
>retrieving revision 1.1
>diff -u -r1.1 CapabilitySelectionWizardPage.java
>--- src/org/eclipse/tptp/wsdm/tooling/wizard/mrt/internal/CapabilitySelectionWizardPage.java	8 Feb 2007 19:40:12 -0000	1.1
>+++ src/org/eclipse/tptp/wsdm/tooling/wizard/mrt/internal/CapabilitySelectionWizardPage.java	16 Feb 2007 10:56:36 -0000
>@@ -13,6 +13,7 @@
> package org.eclipse.tptp.wsdm.tooling.wizard.mrt.internal;
> 
> import java.util.Arrays;
>+import java.util.Iterator;
> import java.util.LinkedList;
> import java.util.List;
> 
>@@ -101,15 +102,10 @@
> 		{
> 			public void checkStateChanged(CheckStateChangedEvent event)
> 			{
>-				_selectedCapabilities.clear();
>-				Object[] checkedElements = _capsViewer.getCheckedElements();
>-				for (int i = 0; i < checkedElements.length; i++)
>-				{
>-					if (checkedElements[i] instanceof Capability)
>-						_selectedCapabilities.add(checkedElements[i]);
>-				}
>-			}
>-		});
>+				Object selectedelement = event.getElement();
>+				setCheckStatus(selectedelement, event.getChecked());
>+		}});
>+		
> 	}
> 
> 	/*
>@@ -133,6 +129,66 @@
> 		return (Capability[]) _selectedCapabilities
> 				.toArray(new Capability[_selectedCapabilities.size()]);
> 	}
>+    private void setCheckStatus(Object selElement, boolean checkState) {
>+  		Object[] checkedElements = _capsViewer.getCheckedElements();
>+  		if(selElement instanceof Capability){
>+  			Capability selCapability = (Capability)selElement;
>+  			
>+  			// add/remove the capability from the _selectedCapabilities
>+  			boolean found = false;
>+  			for (Iterator it = _selectedCapabilities.iterator(); it.hasNext();) {
>+  				Capability cap = (Capability)it.next();
>+  				if(selCapability.equals(cap)){
>+  					found = true;
>+  					break;
>+  				}
>+  			}  
>+  			if(!found && checkState){
>+  				_selectedCapabilities.add(selCapability);
>+  			}else if(found && !checkState){
>+  				_selectedCapabilities.remove(selCapability);					
>+  			}
>+  			
>+  			Object parent = _contentProvider.getParent(selElement);
>+  			if (_capsViewer.getChecked(parent) && !checkState){
>+  				_capsViewer.setChecked(parent, false);
>+  			}
>+  			else if(!_capsViewer.getChecked(parent) && checkState && allChildrenChecked(parent)){
>+  				_capsViewer.setChecked(parent, true);
>+  			}
>+  			_capsViewer.setChecked(selElement,checkState);
>+  		}else if(selElement instanceof Category){ 
>+  			// if the Category is selected
>+  			Category selCategory = (Category) selElement;
>+  		
>+  			Object[] categoryList = _contentProvider.getChildren(_capsViewer.getInput());
>+  			for (int j=0; j< categoryList.length; j++) {
>+  				Category category = (Category) categoryList[j];
>+				if (category.getName().equals(selCategory.getName())) {
>+					Object[] capabilities = _contentProvider.getChildren(category);
>+					if (capabilities.length > 0) {
>+						for (int caps=0; caps<capabilities.length; caps++){
>+						   setCheckStatus(capabilities[caps], checkState);
>+						}
>+					} else _capsViewer.setChecked(selElement,false);
>+				}
>+			}
>+		}
>+    }
>+    
>+    private boolean allChildrenChecked(Object parent) {
>+    	boolean allChecked = true;
>+    	Object[] children = _contentProvider.getChildren(parent);
>+		if (children.length > 0) {
>+			for (int i=0; i<children.length; i++) {
>+				if (!_capsViewer.getChecked(children[i]))
>+					allChecked = false;
>+			}
>+    	}
>+		else return false;
>+		return allChecked;
>+    }
>+
> 
> } // end class NewMr3WizardPage
> 
>Index: src/org/eclipse/tptp/wsdm/tooling/wizard/mrt/internal/CapabilitySelectionDialog.java
>===================================================================
>RCS file: /cvsroot/ganges/org.eclipse.tptp.wsdm.editor/src/org/eclipse/tptp/wsdm/tooling/wizard/mrt/internal/CapabilitySelectionDialog.java,v
>retrieving revision 1.1
>diff -u -r1.1 CapabilitySelectionDialog.java
>--- src/org/eclipse/tptp/wsdm/tooling/wizard/mrt/internal/CapabilitySelectionDialog.java	8 Feb 2007 19:40:12 -0000	1.1
>+++ src/org/eclipse/tptp/wsdm/tooling/wizard/mrt/internal/CapabilitySelectionDialog.java	16 Feb 2007 10:56:36 -0000
>@@ -13,6 +13,7 @@
> package org.eclipse.tptp.wsdm.tooling.wizard.mrt.internal;
> 
> import java.util.Arrays;
>+import java.util.Iterator;
> import java.util.LinkedList;
> import java.util.List;
> 
>@@ -20,8 +21,10 @@
> import org.eclipse.jface.action.Action;
> import org.eclipse.jface.dialogs.Dialog;
> import org.eclipse.jface.dialogs.IDialogConstants;
>+import org.eclipse.jface.viewers.CheckStateChangedEvent;
> import org.eclipse.jface.viewers.CheckboxTreeViewer;
> import org.eclipse.jface.viewers.DoubleClickEvent;
>+import org.eclipse.jface.viewers.ICheckStateListener;
> import org.eclipse.jface.viewers.IDoubleClickListener;
> import org.eclipse.jface.viewers.ISelection;
> import org.eclipse.jface.viewers.IStructuredSelection;
>@@ -53,7 +56,7 @@
> 	private CheckboxTreeViewer _capsViewer;
> 	private CapsTreeContentProvider _contentProvider;
> 
>-	private List SELECTED_WSDLS = new LinkedList();
>+	private List _selectedCapabilities  = new LinkedList();
> 
> 	/*
> 	 * Constructor which sets the selected capabilities and containerName
>@@ -136,7 +139,7 @@
> 		for (int i = 0; i < checkedElements.length; i++)
> 		{
> 			if (checkedElements[i] instanceof Capability)
>-				SELECTED_WSDLS.add(checkedElements[i]);
>+				_selectedCapabilities.add(checkedElements[i]);
> 		}
> 		super.okPressed();
> 	}
>@@ -146,8 +149,8 @@
> 	 */
> 	public Capability[] getSelectedCaps()
> 	{
>-		return (Capability[]) SELECTED_WSDLS
>-				.toArray(new Capability[SELECTED_WSDLS.size()]);
>+		return (Capability[]) _selectedCapabilities 
>+				.toArray(new Capability[_selectedCapabilities .size()]);
> 	}
> 
> 	private void hookAllListeners()
>@@ -173,5 +176,68 @@
> 				doubleClickAction.run();
> 			}
> 		});
>+		
>+		_capsViewer.addCheckStateListener(new ICheckStateListener() {
>+			public void checkStateChanged(CheckStateChangedEvent event) {
>+				Object element = event.getElement();
>+				setCheckStatus(element, event.getChecked());
>+				getButton(IDialogConstants.OK_ID).setEnabled(_capsViewer.getCheckedElements().length!=0);
>+			}
>+		});
> 	}
>+	
>+    private void setCheckStatus(Object selElement, boolean checkState) {
>+		Object[] checkedElements = _capsViewer.getCheckedElements();
>+		if(selElement instanceof Capability){
>+			Capability selCapability = (Capability)selElement;
>+			// add/remove the capability from the _selectedCapabilities
>+			boolean found = false;
>+			for (Iterator it = _selectedCapabilities.iterator(); it.hasNext();) {
>+				Capability cap = (Capability)it.next();
>+				if(selCapability.equals(cap)){
>+					found = true;
>+					break;
>+				}
>+			}  
>+		
>+			Object parent = _contentProvider.getParent(selElement);
>+			if (_capsViewer.getChecked(parent) && !checkState){
>+				_capsViewer.setChecked(parent, false);
>+			}
>+			else if(!_capsViewer.getChecked(parent) && checkState && allChildrenChecked(parent)){
>+				_capsViewer.setChecked(parent, true);
>+			}
>+			_capsViewer.setChecked(selElement,checkState);
>+		}else if(selElement instanceof Category){ 
>+			// if the Category is selected
>+			Category selCategory = (Category) selElement;
>+		
>+			Object[] categoryList = _contentProvider.getChildren(_capsViewer.getInput());
>+			for (int j=0; j< categoryList.length; j++) {
>+				Category category = (Category) categoryList[j];
>+				if (category.getName().equals(selCategory.getName())) {
>+					Object[] capabilities = _contentProvider.getChildren(category);
>+					if (capabilities.length > 0) {
>+						for (int caps=0; caps<capabilities.length; caps++){
>+						   setCheckStatus(capabilities[caps], checkState);
>+						}
>+					} else _capsViewer.setChecked(selElement,false);
>+				}
>+			}
>+
>+		}
>+    }
>+    
>+    private boolean allChildrenChecked(Object parent) {
>+    	boolean allChecked = true;
>+    	Object[] children = _contentProvider.getChildren(parent);
>+		if (children.length > 0) {
>+			for (int i=0; i<children.length; i++) {
>+				if (!_capsViewer.getChecked(children[i]))
>+					allChecked = false;
>+			}
>+    	}
>+		else return false;
>+		return allChecked;
>+    }
> }
>Index: src/org/eclipse/tptp/wsdm/tooling/editor/mrt/internal/MrtPrototypeForm.java
>===================================================================
>RCS file: /cvsroot/ganges/org.eclipse.tptp.wsdm.editor/src/org/eclipse/tptp/wsdm/tooling/editor/mrt/internal/MrtPrototypeForm.java,v
>retrieving revision 1.3
>diff -u -r1.3 MrtPrototypeForm.java
>--- src/org/eclipse/tptp/wsdm/tooling/editor/mrt/internal/MrtPrototypeForm.java	15 Feb 2007 16:52:57 -0000	1.3
>+++ src/org/eclipse/tptp/wsdm/tooling/editor/mrt/internal/MrtPrototypeForm.java	16 Feb 2007 10:56:35 -0000
>@@ -310,7 +310,6 @@
> 		// Expand All Button
> 		_expandAllButton = getToolkit().createButton(_mrtSection,
> 				Messages.EXPAND_ALL, SWT.TOP);
>-		_expandAllButton.setEnabled(false);
> 		gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
> 		gd.horizontalSpan = 1;
> 		_expandAllButton.setLayoutData(gd);
>@@ -319,6 +318,7 @@
> 		_collapseAllButton = getToolkit().createButton(_mrtSection,
> 				Messages.COLLAPSE_ALL, SWT.TOP);
> 		gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
>+		_collapseAllButton.setEnabled(false);
> 		gd.horizontalSpan = 1;
> 		_collapseAllButton.setLayoutData(gd);
> 
>@@ -547,11 +547,12 @@
> 					{
> 						_selectedCapForDelete = (Capability) selected;
> 						// Default capabilities
>-						boolean _deleteableCap = true;
>+						/*boolean _deleteableCap = true;
> 						if (MrtUtils
> 								.isMandatoryCapability(_selectedCapForDelete))
> 							_deleteableCap = false;
>-						_deleteCapButton.setEnabled(_deleteableCap);
>+							*/
>+						_deleteCapButton.setEnabled(true);
> 					}
> 					else
> 					{
>@@ -618,7 +619,6 @@
> 				}
> 				// TODO
> 				// selectCaps();
>-				// _treeViewer.setInput(getAllNamespaces());
> 				_treeViewer.refresh();
> 				_treeViewer.expandAll();
> 				_expandAllButton.setEnabled(true);
>@@ -632,18 +632,11 @@
> 		{
> 			public void handleEvent(Event event)
> 			{
>-				System.out.println("Capability to delete : "
>-						+ _selectedCapForDelete.getName());
> 				DeleteCapabilityCommand delete = new DeleteCapabilityCommand(
> 						_editingDomain, _mrt, _selectedCapForDelete);
> 				delete.execute();
> 				// TODO
> 				// deleteDefinition(_selectedCapForDelete);
>-				// _allCaps.add(_selectedCapForDelete);
>-				// RemoveCommand rc = new RemoveCommand(_editingDomain, _mrt
>-				// .getImplements(), _selectedCapForDelete.getLocation());
>-				// _editingDomain.getCommandStack().execute(rc);
>-				// _treeViewer.setInput(getAllNamespaces());
> 				_treeViewer.refresh();
> 				_treeViewer.expandAll();
> 				_expandAllButton.setEnabled(true);

Actions: View | Diff

Attachments on bug 173631: 59124 | 59129