jcommander-commit — User commit notifications

[Jcommander-commit] site/src/documentation skinconf.xml,1.5,1.6

[Robert E. <sky...@us...>]

Update of /cvsroot/jcommander/site/src/documentation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27177/src/documentation

Modified Files:
	skinconf.xml 
Log Message:
Removed EclipseCon logo

Index: skinconf.xml
===================================================================
RCS file: /cvsroot/jcommander/site/src/documentation/skinconf.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** skinconf.xml	14 Feb 2006 08:50:44 -0000	1.5
--- skinconf.xml	20 Apr 2006 10:44:13 -0000	1.6
***************
*** 53,61 ****
  			<height>31</height-->
  		</credit>
- 		<credit>
- 			<name>"Best Open Source RCP Application" Nominee</name>
- 			<url>http://www.eclipsecon.org/2006/</url>
- 			<image>http://www.eclipsecon.org/2006/images/banner125x125.gif</image>
- 		</credit>
  	</credits>
  </skinconfig>
--- 53,56 ----

[Jcommander-commit] plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/actions SimpleOpenURLAction.java,1.1,1.2

[Robert E. <sky...@us...>]

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/actions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1343/src/org/jcommander/ui/filepanel/actions

Modified Files:
	SimpleOpenURLAction.java 
Log Message:
Removed Java 1.5 annotations

Index: SimpleOpenURLAction.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/actions/SimpleOpenURLAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SimpleOpenURLAction.java	19 Apr 2006 21:35:59 -0000	1.1
--- SimpleOpenURLAction.java	20 Apr 2006 08:48:22 -0000	1.2
***************
*** 120,124 ****
  		}		
  		
! 		@Override
  		protected void okPressed() {
  	        
--- 120,124 ----
  		}		
  		
! //		@Override
  		protected void okPressed() {
  	        

[Jcommander-commit] plugins/org.jcommander.ui.help context.xml,NONE,1.1 plugin.xml,1.6,1.7

[Matthias K <mat...@us...>]

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.help
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8211

Modified Files:
	plugin.xml 
Added Files:
	context.xml 
Log Message:
- First implementation of feature request 1473247: Simplified method to enter VFS URLs
- with help link by context

Index: plugin.xml
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.help/plugin.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** plugin.xml	15 Feb 2006 10:42:59 -0000	1.6
--- plugin.xml	19 Apr 2006 21:36:03 -0000	1.7
***************
*** 30,32 ****
--- 30,36 ----
     </extension>
  
+    <extension point="org.eclipse.help.contexts">
+       <contexts file="context.xml"/>
+    </extension>
+ 
  </plugin>

--- NEW FILE: context.xml ---
<contexts>
	<context id="VFS" title="Informations about the VFS">
		<description>Informations about the Virtual File System</description>
		<topic href="html/concepts/supportedFileSystems.html" label="Supported File Systems"/>
	</context>
</contexts>

[Jcommander-commit] plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/actions SimpleOpenURLAction.java,NONE,1.1

[Matthias K <mat...@us...>]

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/actions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8111/src/org/jcommander/ui/filepanel/actions

Added Files:
	SimpleOpenURLAction.java 
Log Message:
- First implementation of feature request 1473247: Simplified method to enter VFS URLs
- with help link by context

--- NEW FILE: SimpleOpenURLAction.java ---
/**
 * 
 */
package org.jcommander.ui.filepanel.actions;

import org.apache.commons.vfs.FileObject;
import org.apache.commons.vfs.FileSystemException;
import org.apache.commons.vfs.FileType;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.dialogs.IMessageProvider;
import org.eclipse.jface.dialogs.TitleAreaDialog;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.IWorkbenchWindowActionDelegate;
import org.eclipse.ui.PlatformUI;
import org.jcommander.ui.filepanel.FilePanelManagerProvider;
import org.jcommander.ui.logger.LoggerPlugin;
import org.jcommander.vfsextensions.VfsManagerExtension;

/**
 * @author MatthiasK
 *
 */
public class SimpleOpenURLAction implements IWorkbenchWindowActionDelegate {

	private IWorkbenchWindow window;
	
	private Text protokollText;
	private Text hostText;
	private Text userNameText;
	private Text userPasswordText;
	private Text dirText;

	private String protokoll;
	private String host;
	private String userName;
	private String userPassword;
	private String dir;
	
	private Composite messageArea;
	private Text messageText;
	private boolean messageAreaVisible=false;
	
	private int messageHeight = 60;
	
	private class EnterTargetDialog extends TitleAreaDialog {
		
		protected EnterTargetDialog(Shell shell) {
			super(shell);
		}
		
		private void createMessageArea(){
			if (messageAreaVisible) return;
			messageText = new Text(messageArea,SWT.MULTI|SWT.V_SCROLL|SWT.BORDER|SWT.READ_ONLY);
			GridData messageTextData = new GridData();
			messageTextData.grabExcessHorizontalSpace=true;
			messageTextData.grabExcessVerticalSpace=true;
			messageTextData.horizontalAlignment=SWT.FILL;
			messageTextData.verticalAlignment=SWT.FILL;
			messageTextData.minimumHeight=60;
			messageText.setLayoutData(messageTextData);	
			messageArea.layout(true);
        	getShell().layout(true);
        	getShell().setSize(getShell().getSize().x, getShell().getSize().y+messageHeight);
			messageArea.layout(true);
			getShell().layout(true);			
			messageAreaVisible=true;
			//messageHeight=messageArea.getSize().y;
		}
		
//		@Override
		protected Control createDialogArea(Composite parent) {
			setTitle("Open VFS directory");
			Composite dialogAreaSub = (Composite)super.createDialogArea(parent);
			Composite dialogArea = new Composite(dialogAreaSub, SWT.NONE);
			dialogArea.setLayout(new GridLayout(2,false));
			dialogArea.setLayoutData(new GridData(SWT.FILL, SWT.FILL,true,false));
			Label protokolLabel = new Label(dialogArea, SWT.NONE);
			protokolLabel.setText("Protokoll");
			protokollText = new Text(dialogArea, SWT.BORDER);
			protokollText.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT,true,false));
			Label hostLabel = new Label(dialogArea, SWT.NONE);
			hostLabel.setText("Host");
			hostText = new Text(dialogArea, SWT.BORDER);
			hostText.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT,true,false));
			Label usernameLabel = new Label(dialogArea, SWT.NONE);
			usernameLabel.setText("Username");
			userNameText = new Text(dialogArea, SWT.BORDER);
			userNameText.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT,true,false));
			Label userPasswordLabel = new Label(dialogArea, SWT.NONE);
			userPasswordLabel.setText("Password");
			userPasswordText = new Text(dialogArea, SWT.BORDER);
			userPasswordText.setEchoChar('*');
			userPasswordText.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT,true,false));
			Label dirLabel = new Label(dialogArea, SWT.NONE);
			dirLabel.setText("Directory");
			dirText = new Text(dialogArea, SWT.BORDER);
			dirText.setText("/");
			dirText.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT,true,false));

			messageArea=new Composite(dialogArea, SWT.NONE);
			GridData messageData=new GridData();
			messageData.horizontalAlignment=SWT.FILL;
			messageData.verticalAlignment=SWT.FILL;
			messageData.horizontalSpan=2;
			messageArea.setLayoutData(messageData);
			GridLayout messageLayout = new GridLayout();
			messageLayout.marginWidth=0;
			messageArea.setLayout(messageLayout);	

			return dialogArea;
		}		
		
		@Override
		protected void okPressed() {
	        
//	        if (messageText!=null) {
//				messageText.dispose();
//				messageText=null;
//				shell.layout(true);
//				shell.setSize(shellSize.x, shellSize.y-messageHeight);
//			}
//	        else {
//	        	createMessageArea();
//			}
			
			protokoll=protokollText.getText();
			userName=userNameText.getText();
			userPassword=userPasswordText.getText();
			host=hostText.getText();
			dir=dirText.getText();	
			String userData="";
			if (userName!="") userData=userName;
			if (userPassword!="") userData=userData+":"+userPassword;
			if (userData!="") userData=userData+"@";
			String url=protokoll+"://"+userData+host+"/"+dir;
			if (performOk(url)) {
				super.okPressed();
			}
		}		
		
		private boolean performOk(final String url) {
			try {
				FileObject selectedDirectory = VfsManagerExtension.getInstance().resolveFile(url);
				
				if(selectedDirectory.getType() == FileType.FOLDER) {
					LoggerPlugin.rootLogger.debug("Changing dir to: "+ selectedDirectory.getName().getRootURI() + selectedDirectory.getName().getPath());
					
					FilePanelManagerProvider.getTabManager()
											.getActiveTabMediator()
											.getFileTab()
											.getActiveFilePanel()
											.getPanelMediator()
											.changeDirectory(selectedDirectory);
					
					// TODO Why is this required?!
					FilePanelManagerProvider.getTabManager()
											.getActiveTabMediator()
											.getFileTab()
											.getActiveFilePanel()
											.getPanelMediator()
											.refresh();
					
					//urlHistory.add(selectedDirectory);
					return true;
				} else {
					setMessage("Cannot change directory. Please specify a valid directory.",IMessageProvider.ERROR);
					return false;
				}
			} catch (FileSystemException ex) {
				String message;
				message=ex.getMessage();
				Throwable effect= ex;
				Throwable cause=ex.getCause();
				while (!(cause==null)&&!cause.equals(effect))
				{
					message=message+": \n"+cause.getMessage();
					effect=cause;
					cause=cause.getCause();
				} 
				setMessage("The directory could not be opened.", IMessageProvider.ERROR);
				setError(message);
				
				return false;
			}
		}

		private void setError(String Message){
			createMessageArea();
			messageText.setText(Message);			
		}
		
//		@Override
		public void setMessage(String newMessage, int newType) {
			super.setMessage(newMessage, newType);			
		}

	}
	
	/* (non-Javadoc)
	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose()
	 */
	public void dispose() {
	}

	/* (non-Javadoc)
	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
	 */
	public void init(IWorkbenchWindow window) {
		this.window=window;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
	 */
	public void run(IAction action) {
		EnterTargetDialog dialog = new EnterTargetDialog(window.getShell());
		dialog.setHelpAvailable(true);
		dialog.create();
		PlatformUI.getWorkbench().getHelpSystem().setHelp(window.getShell(), "org.jcommander.ui.help.VFS");
		dialog.open();
	}

	/* (non-Javadoc)
	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
	 */
	public void selectionChanged(IAction action, ISelection selection) {
	}

}

[Jcommander-commit] plugins/org.jcommander.ui.app plugin.xml,1.95,1.96

[Matthias K <mat...@us...>]

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.app
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8062

Modified Files:
	plugin.xml 
Log Message:
- First implementation of feature request 1473247: Simplified method to enter VFS URLs
- with help link by context

Index: plugin.xml
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.app/plugin.xml,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
*** plugin.xml	5 Apr 2006 20:37:38 -0000	1.95
--- plugin.xml	19 Apr 2006 21:35:55 -0000	1.96
***************
*** 286,289 ****
--- 286,298 ----
           tooltip="Open Directory URL"/>
  			<action
+          class="org.jcommander.ui.filepanel.actions.SimpleOpenURLAction"
+          definitionId="org.jcommander.ui.app.SimpleOpenUrlCommand"
+          icon="icons/openUrl.png"
+          id="org.jcommander.ui.filepanel.actions.SimpleOpenUrlAction"
+          label="Open Directory &amp;URL (Simplified)..."
+          menubarPath="jcmdfilemenu/File.groupMarker1"
+          toolbarPath="JCmdGroup/File"
+          tooltip="Open Directory URL (Simplified)"/>         
+ 			<action
           class="org.jcommander.ui.app.actions.ShowOptions"
           icon="icons/preferences.png"

[Jcommander-commit] plugins/org.jcommander.ui.compare/src/org/jcommander/compare ComparePlugin.java,1.3,1.4 CompareTest.java,1.1,NONE

[Matthias K <mat...@us...>]

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.compare/src/org/jcommander/compare
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29304/src/org/jcommander/compare

Modified Files:
	ComparePlugin.java 
Removed Files:
	CompareTest.java 
Log Message:
Now using displayablePath also in compare view and copy/move confirm dialog

Index: ComparePlugin.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.compare/src/org/jcommander/compare/ComparePlugin.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ComparePlugin.java	17 Apr 2006 08:48:51 -0000	1.3
--- ComparePlugin.java	17 Apr 2006 21:31:07 -0000	1.4
***************
*** 27,30 ****
--- 27,31 ----
  import org.jcommander.ui.utils.EclipseBroker;
  import org.jcommander.ui.utils.ImageBroker;
+ import org.jcommander.vfsextensions.VfsManagerExtension;
  import org.osgi.framework.BundleContext;
  import org.apache.commons.vfs.*;
***************
*** 331,335 ****
  						if ((diffNode.getRight()!=null)&&(diffNode.getRight() instanceof FileInput)) {
  							FileInput file = (FileInput) diffNode.getRight();
! 							return file.file.getName().getURI();
  						}
  						return super.getRightLabel(element);
--- 332,336 ----
  						if ((diffNode.getRight()!=null)&&(diffNode.getRight() instanceof FileInput)) {
  							FileInput file = (FileInput) diffNode.getRight();
! 							return VfsManagerExtension.getDisplayablePath(file.file);
  						}
  						return super.getRightLabel(element);
***************
*** 347,351 ****
  						if ((diffNode.getLeft()!=null)&&(diffNode.getLeft() instanceof FileInput)) {
  							FileInput file = (FileInput) diffNode.getLeft();
! 							return file.file.getName().getURI();
  						}
  						return super.getLeftLabel(element);
--- 348,352 ----
  						if ((diffNode.getLeft()!=null)&&(diffNode.getLeft() instanceof FileInput)) {
  							FileInput file = (FileInput) diffNode.getLeft();
! 							return VfsManagerExtension.getDisplayablePath(file.file);
  						}
  						return super.getLeftLabel(element);

--- CompareTest.java DELETED ---

[Jcommander-commit] plugins/org.jcommander.ui.compare/META-INF MANIFEST.MF,1.2,1.3

[Matthias K <mat...@us...>]

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.compare/META-INF
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29304/META-INF

Modified Files:
	MANIFEST.MF 
Log Message:
Now using displayablePath also in compare view and copy/move confirm dialog

Index: MANIFEST.MF
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.compare/META-INF/MANIFEST.MF,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MANIFEST.MF	5 Apr 2006 20:43:01 -0000	1.2
--- MANIFEST.MF	17 Apr 2006 21:31:08 -0000	1.3
***************
*** 10,14 ****
   org.apache.commons.vfs,
   org.jcommander.eclipsepatch.compare,
!  org.jcommander.ui.utils
  Eclipse-LazyStart: true
  Export-Package: org.jcommander.compare,
--- 10,15 ----
   org.apache.commons.vfs,
   org.jcommander.eclipsepatch.compare,
!  org.jcommander.ui.utils,
!  org.jcommander.vfsextensions
  Eclipse-LazyStart: true
  Export-Package: org.jcommander.compare,

[Jcommander-commit] plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers FileCopyPerformer.java,1.33,1.34

[Matthias K <mat...@us...>]

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29200/src/org/jcommander/ui/filepanel/performers

Modified Files:
	FileCopyPerformer.java 
Log Message:
Now using displayablePath also in compare view and copy/move confirm dialog

Index: FileCopyPerformer.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers/FileCopyPerformer.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** FileCopyPerformer.java	17 Apr 2006 17:58:31 -0000	1.33
--- FileCopyPerformer.java	17 Apr 2006 21:31:00 -0000	1.34
***************
*** 525,529 ****
  		
  		//confirmDialogComposite.getCopyTarget().setText(targetDir.getName().getRootURI() + targetDir.getName().getPath());
! 		confirmDialogComposite.setCopyTarget(targetDir.getName().getRootURI() + targetDir.getName().getPath());
  
  		if(predefinedSourceFiles != null) {
--- 525,529 ----
  		
  		//confirmDialogComposite.getCopyTarget().setText(targetDir.getName().getRootURI() + targetDir.getName().getPath());
! 		confirmDialogComposite.setCopyTarget(VfsManagerExtension.getDisplayablePath(targetDir));//targetDir.getName().getRootURI() + targetDir.getName().getPath());
  
  		if(predefinedSourceFiles != null) {

[Jcommander-commit] plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/dialogs CopyConfirmDialogComposite.java,1.13,1.14 DeleteConfirmDialogComposite.java,1.12,1.13 CustomConfirmDialogComposite.java,1.3,1.4

[Matthias K <mat...@us...>]

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/dialogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23213/src/org/jcommander/ui/filepanel/dialogs

Modified Files:
	CopyConfirmDialogComposite.java 
	DeleteConfirmDialogComposite.java 
	CustomConfirmDialogComposite.java 
Log Message:
- Added support for different Buttons in CustomConfirmDialogComposite: Yes/No and Ok/Cancel
- Text in CopyConfirmDialogComposite depends of whether one is moving or copying.

Index: CopyConfirmDialogComposite.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/dialogs/CopyConfirmDialogComposite.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** CopyConfirmDialogComposite.java	17 Apr 2006 14:53:59 -0000	1.13
--- CopyConfirmDialogComposite.java	17 Apr 2006 17:58:31 -0000	1.14
***************
*** 21,24 ****
--- 21,26 ----
  public class CopyConfirmDialogComposite extends CustomConfirmDialogComposite {
  
+ 	private static String moveMsg = "Move selected files";
+ 	private static String copyMsg = "Copy selected files";
  	private Composite listComposite;
  	private Label labelConfirmQuestion;
***************
*** 27,37 ****
  	private Button deleteCheckBox;
  	private boolean delete;
  	
  	public CopyConfirmDialogComposite(Composite parent, int style) {
! 		super(parent, style);
  	}
  	
  	public CopyConfirmDialogComposite(Shell parent, int style) {
! 		super(parent,style);
  	}
  	
--- 29,40 ----
  	private Button deleteCheckBox;
  	private boolean delete;
+ 	private String target;
  	
  	public CopyConfirmDialogComposite(Composite parent, int style) {
! 		super(parent, style, OK_CANCEL);
  	}
  	
  	public CopyConfirmDialogComposite(Shell parent, int style) {
! 		super(parent,style, OK_CANCEL);
  	}
  	
***************
*** 120,124 ****
  	
  public void setCopyTarget(String target) {
! 		labelConfirmQuestion.setText("Copy selected files to "+target+"?");
  	}
  
--- 123,128 ----
  	
  public void setCopyTarget(String target) {
! 		this.target=target;
! 		updateConfirmMsg();
  	}
  
***************
*** 153,156 ****
--- 157,170 ----
  					.getSystemColor(SWT.COLOR_WIDGET_HIGHLIGHT_SHADOW));*/
  		}
+ 		delete=deleteCheckBox.getSelection();
+ 		updateConfirmMsg();
+ 	}
+ 	
+ 	private String getConfirmMsg(){
+ 		return (delete?moveMsg:copyMsg)+((target=="")?"?":" to "+target+"?");
+ 	}
+ 	
+ 	private void updateConfirmMsg(){
+ 		labelConfirmQuestion.setText(getConfirmMsg());
  	}
  	

Index: CustomConfirmDialogComposite.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/dialogs/CustomConfirmDialogComposite.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CustomConfirmDialogComposite.java	17 Apr 2006 14:53:59 -0000	1.3
--- CustomConfirmDialogComposite.java	17 Apr 2006 17:58:31 -0000	1.4
***************
*** 23,26 ****
--- 23,29 ----
  public class CustomConfirmDialogComposite extends Composite {
  
+ 	public static final int YES_NO = 1;
+ 	public static final int OK_CANCEL = 2;
+ 	
  	private Composite buttonsComposite = null;
  	private Composite detailsComposite = null;
***************
*** 34,37 ****
--- 37,41 ----
  	private int detailsHeight = 0;
  
+ 	private int buttons = 0;
  	
  	/**
***************
*** 39,44 ****
  	 * @param style
  	 */
! 	public CustomConfirmDialogComposite(Composite parent, int style) {
  		super(parent, style);
  		initialize();
  	}
--- 43,49 ----
  	 * @param style
  	 */
! 	public CustomConfirmDialogComposite(Composite parent, int style, int buttons) {
  		super(parent, style);
+ 		this.buttons=buttons;
  		initialize();
  	}
***************
*** 64,72 ****
  		buttonsComposite = new Composite(this, SWT.NONE);
  		
! 		Label fillLabel = new Label(buttonsComposite, SWT.NONE);
! 		GridData gridDataFill = new GridData();
! 		gridDataFill.grabExcessHorizontalSpace=true;
! 		gridDataFill.minimumWidth=200;
! 		fillLabel.setLayoutData(gridDataFill);
  		
  		yesButton = new Button(buttonsComposite, SWT.NONE);
--- 69,77 ----
  		buttonsComposite = new Composite(this, SWT.NONE);
  		
! //		Label fillLabel = new Label(buttonsComposite, SWT.NONE);
! //		GridData gridDataFill = new GridData();
! //		gridDataFill.grabExcessHorizontalSpace=true;
! //		gridDataFill.minimumWidth=200;
! //		fillLabel.setLayoutData(gridDataFill);
  		
  		yesButton = new Button(buttonsComposite, SWT.NONE);
***************
*** 78,85 ****
  		buttonsComposite.setLayoutData(buttonsData);
  		buttonsComposite.setLayout(buttonsLayout);
! 		buttonsLayout.numColumns = 4;
  		buttonsLayout.marginHeight = 1;
  		buttonsLayout.marginWidth = 1;
! 		yesButton.setText("&Yes");
  //		GridLayout buttonLayout1 = new GridLayout();
  		GridData yesButtonData = new GridData();
--- 83,91 ----
  		buttonsComposite.setLayoutData(buttonsData);
  		buttonsComposite.setLayout(buttonsLayout);
! 		buttonsLayout.numColumns = 3;
  		buttonsLayout.marginHeight = 1;
  		buttonsLayout.marginWidth = 1;
! 		buttonsLayout.marginLeft=200;
! 
  //		GridLayout buttonLayout1 = new GridLayout();
  		GridData yesButtonData = new GridData();
***************
*** 92,100 ****
  		//l2.horizontalAlignment=SWT.FILL;
  		noButtonData.minimumWidth=75;
- 		noButton.setText("&No");
  		noButton.setLayoutData(noButtonData);
  		
  		detailsButton = new Button(buttonsComposite, SWT.NONE);
  		GridData detailsButtonData = new GridData();
  		detailsButtonData.minimumWidth=75;
  		detailsButton.setLayoutData(detailsButtonData);
--- 98,115 ----
  		//l2.horizontalAlignment=SWT.FILL;
  		noButtonData.minimumWidth=75;
  		noButton.setLayoutData(noButtonData);
  		
+ 		if (buttons==YES_NO) {
+ 			yesButton.setText("&Yes");
+ 			noButton.setText("&No");
+ 		}
+ 		else if (buttons==OK_CANCEL) {
+ 			yesButton.setText("&Ok");
+ 			noButton.setText("&Cancel");			
+ 		}
+ 		
  		detailsButton = new Button(buttonsComposite, SWT.NONE);
  		GridData detailsButtonData = new GridData();
+ 		detailsButtonData.grabExcessHorizontalSpace=true;
  		detailsButtonData.minimumWidth=75;
  		detailsButton.setLayoutData(detailsButtonData);
***************
*** 173,176 ****
--- 188,199 ----
  	
  	/**
+ 	 * Gets the Ok button.
+ 	 */
+ 	public Button getOkButton() {
+ 		return yesButton;
+ 	}
+ 	
+ 	
+ 	/**
  	 * Gets the no button.
  	 */
***************
*** 180,183 ****
--- 203,213 ----
  	
  	/**
+ 	 * Gets the Cancel button.
+ 	 */
+ 	public Button getCancelButton() {
+ 		return noButton;
+ 	}
+ 	
+ 	/**
  	 * 
  	 * @return whether the details are currently showing

Index: DeleteConfirmDialogComposite.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/dialogs/DeleteConfirmDialogComposite.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** DeleteConfirmDialogComposite.java	17 Apr 2006 14:53:59 -0000	1.12
--- DeleteConfirmDialogComposite.java	17 Apr 2006 17:58:31 -0000	1.13
***************
*** 34,38 ****
  
  	public DeleteConfirmDialogComposite(Composite parent, int style) {
! 		super(parent, style);
  	}
  	
--- 34,38 ----
  
  	public DeleteConfirmDialogComposite(Composite parent, int style) {
! 		super(parent, style, YES_NO);
  	}
  	

[Jcommander-commit] plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers FileCopyPerformer.java,1.32,1.33

[Matthias K <mat...@us...>]

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23213/src/org/jcommander/ui/filepanel/performers

Modified Files:
	FileCopyPerformer.java 
Log Message:
- Added support for different Buttons in CustomConfirmDialogComposite: Yes/No and Ok/Cancel
- Text in CopyConfirmDialogComposite depends of whether one is moving or copying.

Index: FileCopyPerformer.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers/FileCopyPerformer.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** FileCopyPerformer.java	17 Apr 2006 14:53:59 -0000	1.32
--- FileCopyPerformer.java	17 Apr 2006 17:58:31 -0000	1.33
***************
*** 486,490 ****
  		}
  		
! 		confirmDialog.setDefaultButton(confirmDialogComposite.getYesButton());
  		confirmDialog.addShellListener(new ShellAdapter() {
  			public void shellClosed(ShellEvent e) {
--- 486,490 ----
  		}
  		
! 		confirmDialog.setDefaultButton(confirmDialogComposite.getOkButton());
  		confirmDialog.addShellListener(new ShellAdapter() {
  			public void shellClosed(ShellEvent e) {
***************
*** 493,497 ****
  		});
  		
! 		confirmDialogComposite.getYesButton().addSelectionListener(new SelectionAdapter() {
  			public void widgetSelected(SelectionEvent e) {
  				keepSelected = confirmDialogComposite.isKeptSelected();
--- 493,497 ----
  		});
  		
! 		confirmDialogComposite.getOkButton().addSelectionListener(new SelectionAdapter() {
  			public void widgetSelected(SelectionEvent e) {
  				keepSelected = confirmDialogComposite.isKeptSelected();
***************
*** 507,511 ****
  		confirmDialogComposite.selectDeleteCheckBox(deleteSourceFiles);
  		
! 		confirmDialogComposite.getNoButton().addSelectionListener(cancelButtonSelectionAdapter);
  		
  		Utils.accomodateComposite(confirmDialogComposite);
--- 507,511 ----
  		confirmDialogComposite.selectDeleteCheckBox(deleteSourceFiles);
  		
! 		confirmDialogComposite.getCancelButton().addSelectionListener(cancelButtonSelectionAdapter);
  		
  		Utils.accomodateComposite(confirmDialogComposite);
***************
*** 532,536 ****
  		}
  		
! 		confirmDialog.setText("Confirm Copy Operation");
  		WindowUtils.pack(confirmDialog);
  		WindowUtils.centerRelativeTo(confirmDialog, shell);
--- 532,539 ----
  		}
  		
! 		if (deleteSourceFiles) {
! 			confirmDialog.setText("Confirm Move Operation");
! 		} 
! 		else confirmDialog.setText("Confirm Copy Operation");
  		WindowUtils.pack(confirmDialog);
  		WindowUtils.centerRelativeTo(confirmDialog, shell);

[Jcommander-commit] plugins/org.jcommander.ui.compare .cvsignore,1.1,1.2

[Matthias K <mat...@us...>]

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.compare
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10775

Modified Files:
	.cvsignore 
Log Message:
- made CopyConfirmDialogComposite subclass of CustomConfirmDialogComposite
- a lot of refractorings to make variable names more selfexplaining
- title text for DeleteConfirmDialog

Index: .cvsignore
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.compare/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** .cvsignore	28 Mar 2006 17:20:19 -0000	1.1
--- .cvsignore	17 Apr 2006 14:54:04 -0000	1.2
***************
*** 3,4 ****
--- 3,5 ----
  temp.folder
  jcmdappsrc.zip
+ .settings

[Jcommander-commit] plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/dialogs CopyConfirmDialogComposite.java,1.12,1.13 DeleteConfirmDialogComposite.java,1.11,1.12 CustomConfirmDialogComposite.java,1.2,1.3

[Matthias K <mat...@us...>]

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/dialogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10682/src/org/jcommander/ui/filepanel/dialogs

Modified Files:
	CopyConfirmDialogComposite.java 
	DeleteConfirmDialogComposite.java 
	CustomConfirmDialogComposite.java 
Log Message:
- made CopyConfirmDialogComposite subclass of CustomConfirmDialogComposite
- a lot of refractorings to make variable names more selfexplaining
- title text for DeleteConfirmDialog

Index: CopyConfirmDialogComposite.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/dialogs/CopyConfirmDialogComposite.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** CopyConfirmDialogComposite.java	1 Jan 2006 22:26:26 -0000	1.12
--- CopyConfirmDialogComposite.java	17 Apr 2006 14:53:59 -0000	1.13
***************
*** 5,11 ****
  
  import org.eclipse.jface.preference.IPreferenceStore;
- import org.eclipse.swt.*;
  import org.eclipse.swt.events.*;
- import org.eclipse.swt.layout.*;
  import org.eclipse.swt.widgets.*;
  import org.eclipse.swt.SWT;
--- 5,9 ----
***************
*** 14,20 ****
  import org.eclipse.swt.widgets.Composite;
  import org.eclipse.swt.layout.GridLayout;
- import org.eclipse.swt.widgets.Text;
  import org.eclipse.swt.widgets.Button;
- import org.eclipse.ui.dialogs.*;
  import org.jcommander.ui.filepanel.FilePanelPlugin;
  /**
--- 12,16 ----
***************
*** 23,112 ****
   * @author sky_halud
   */
! public class CopyConfirmDialogComposite extends Composite {
  
! 	private Composite infoComposite = null;
! 	private Composite listComposite = null;
! 	private Label label = null;
! 	private Text copyTarget = null;
! 	private Composite buttonsComposite = null;
! 	private Button removeFileButton = null;
! 	private Button okButton = null;
! 	private Button cancelButton = null;
! 	private List selectionList = null;
! 	private Label label1 = null;
! 	private Button keepSelectedCheckBox = null;
! 	private Button deleteCheckBox = null;
  	public CopyConfirmDialogComposite(Composite parent, int style) {
  		super(parent, style);
- 		initialize();
  	}
  	
  	public CopyConfirmDialogComposite(Shell parent, int style) {
  		super(parent,style);
- 		initialize();
  	}
  	
! 	private void initialize() {
! 		createInfoComposite();
! 		createButtonsComposite();
! 		this.setLayout(new GridLayout());
! 		setSize(new org.eclipse.swt.graphics.Point(674,285));
  	}
  	
  	private void createListComposite(Composite info) {
! 		GridData gridData = new GridData();
! 		gridData.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL;
! 		gridData.grabExcessHorizontalSpace = true;
! 		gridData.verticalAlignment = org.eclipse.swt.layout.GridData.FILL;
! 		gridData.grabExcessVerticalSpace = true;
! 		GridData gridData1 = new GridData();
! 		GridData gridData2 = new GridData();
! 		gridData1.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL;
! 		gridData1.grabExcessHorizontalSpace = true;
! 		gridData1.verticalAlignment = org.eclipse.swt.layout.GridData.FILL;
! 		gridData1.grabExcessVerticalSpace = true;
! 		gridData2.horizontalAlignment = org.eclipse.swt.layout.GridData.END;
! 		gridData2.verticalAlignment = org.eclipse.swt.layout.GridData.BEGINNING;
! 		GridLayout gridLayout = new GridLayout();
! 		gridLayout.numColumns = 2;
  		listComposite = new Composite(info, SWT.NONE);
! 		listComposite.setLayoutData(gridData);
! 		listComposite.setLayout(gridLayout);
  		selectionList = new List(listComposite, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
! 		selectionList.setLayoutData(gridData1);
! 		removeFileButton = new Button(listComposite, SWT.NONE);		
! 		removeFileButton.setLayoutData(gridData2);
! 		removeFileButton.setText("&Remove");	
! 		
! 		removeFileButton.addSelectionListener(new SelectionAdapter() {
! 			public void widgetSelected(SelectionEvent e) {
! 				int [] indices = selectionList.getSelectionIndices();
! 				selectionList.remove(indices);
! 				
! 				if(selectionList.getItemCount() == 0) {
! 					/** Nothing to copy. Disabling the controls. */
! 					okButton.setEnabled(false);
! 					keepSelectedCheckBox.setEnabled(false);
! 					deleteCheckBox.setEnabled(false);
! 					selectionList.setEnabled(false);
! 					removeFileButton.setEnabled(false);
! 				}
! 			}
! 		});
  	}
  	
! 	/**
! 	 * This method initializes composi			gridData2.grabExcessHorizontalSpace = true;
! te	
! 	 *
! 	 */    
! 	private void createInfoComposite() {
! 
! 		GridData gridData2 = new GridData();
! 		GridData gridData1 = new GridData();
! 
! 		infoComposite = new Composite(this, SWT.NONE);
! 		createListComposite(infoComposite);
! 		keepSelectedCheckBox = new Button(infoComposite, SWT.CHECK);
  		keepSelectedCheckBox.setText("&Keep files selected after copying");
  		keepSelectedCheckBox.setToolTipText("Keeps files selected after they have been copied");
--- 19,91 ----
   * @author sky_halud
   */
! public class CopyConfirmDialogComposite extends CustomConfirmDialogComposite {
  
! 	private Composite listComposite;
! 	private Label labelConfirmQuestion;
! 	private List selectionList;
! 	private Button keepSelectedCheckBox;
! 	private Button deleteCheckBox;
! 	private boolean delete;
! 	
  	public CopyConfirmDialogComposite(Composite parent, int style) {
  		super(parent, style);
  	}
  	
  	public CopyConfirmDialogComposite(Shell parent, int style) {
  		super(parent,style);
  	}
  	
! 	protected void createMainContent(Composite parent) {
! 		labelConfirmQuestion = new Label(parent, SWT.NONE);
! 		labelConfirmQuestion.setText("Copy selected files?");
! 		createListComposite(parent);		
  	}
  	
  	private void createListComposite(Composite info) {
! 		GridData listCompositeData = new GridData();
! 		listCompositeData.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL;
! 		listCompositeData.grabExcessHorizontalSpace = true;
! 		listCompositeData.verticalAlignment = org.eclipse.swt.layout.GridData.FILL;
! 		listCompositeData.grabExcessVerticalSpace = true;
! 		GridData selectionListData = new GridData();
! 		//GridData removeButtonData = new GridData();
! 		selectionListData.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL;
! 		selectionListData.grabExcessHorizontalSpace = true;
! 		selectionListData.verticalAlignment = org.eclipse.swt.layout.GridData.FILL;
! 		selectionListData.grabExcessVerticalSpace = true;
! 		//removeButtonData.horizontalAlignment = org.eclipse.swt.layout.GridData.END;
! 		//removeButtonData.verticalAlignment = org.eclipse.swt.layout.GridData.BEGINNING;
! 		GridLayout listCompositeLayout = new GridLayout();
! 		listCompositeLayout.numColumns = 1;
! 		listCompositeLayout.marginWidth=0;
  		listComposite = new Composite(info, SWT.NONE);
! 		listComposite.setLayoutData(listCompositeData);
! 		listComposite.setLayout(listCompositeLayout);
  		selectionList = new List(listComposite, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
! 		selectionList.setLayoutData(selectionListData);
! //		removeFileButton = new Button(listComposite, SWT.NONE);		
! //		removeFileButton.setLayoutData(gridData2);
! //		removeFileButton.setText("&Remove");	
! //		
! //		removeFileButton.addSelectionListener(new SelectionAdapter() {
! //			public void widgetSelected(SelectionEvent e) {
! //				int [] indices = selectionList.getSelectionIndices();
! //				selectionList.remove(indices);
! //				
! //				if(selectionList.getItemCount() == 0) {
! //					/** Nothing to copy. Disabling the controls. */
! //					getYesButton().setEnabled(false);
! //					keepSelectedCheckBox.setEnabled(false);
! //					deleteCheckBox.setEnabled(false);
! //					selectionList.setEnabled(false);
! //					removeFileButton.setEnabled(false);
! //				}
! //			}
! //		});
  	}
  	
! 	protected void createDetailsContent(Composite parent) {
! 		parent.setLayout(new GridLayout());
! 		keepSelectedCheckBox = new Button(parent, SWT.CHECK);
  		keepSelectedCheckBox.setText("&Keep files selected after copying");
  		keepSelectedCheckBox.setToolTipText("Keeps files selected after they have been copied");
***************
*** 127,137 ****
  						});
  		
! 		label = new Label(infoComposite, SWT.NONE);
! 		label1 = new Label(infoComposite, SWT.NONE);
! 		label1.setText("to:");
! 		copyTarget = new Text(infoComposite, SWT.BORDER);
! 		deleteCheckBox = new Button(infoComposite, SWT.CHECK);
  		deleteCheckBox.setText("&Move files");
  		deleteCheckBox.setToolTipText("Removes each source file as the copy progresses");
  		deleteCheckBox
  				.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() {
--- 106,114 ----
  						});
  		
! 		deleteCheckBox = new Button(parent, SWT.CHECK);
  		deleteCheckBox.setText("&Move files");
  		deleteCheckBox.setToolTipText("Removes each source file as the copy progresses");
+ 		deleteCheckBox.setSelection(delete);
+ 		updateDeleteCheckbox();
  		deleteCheckBox
  				.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() {
***************
*** 140,185 ****
  					}
  				});
- 		gridData1.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL;
- 		gridData1.verticalAlignment = org.eclipse.swt.layout.GridData.CENTER;
- 		gridData1.grabExcessHorizontalSpace = true;
- 		gridData1.grabExcessVerticalSpace = true;
- 		infoComposite.setLayoutData(gridData1);
- 		infoComposite.setLayout(new GridLayout());
- 		label.setText("Copy selected files:");
- 		copyTarget.setEditable(false);
- 		copyTarget.setLayoutData(gridData2);
- 		copyTarget.setToolTipText("Not editable yet");
- 		gridData2.grabExcessHorizontalSpace = true;
- 		gridData2.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL;
- 	}
- 	/**
- 	 * This method initializes composite	
- 	 *
- 	 */    
- 	private void createButtonsComposite() {
- 		GridLayout gridLayout4 = new GridLayout();
- 		GridData gridData3 = new GridData();
- 		buttonsComposite = new Composite(this, SWT.NONE);		   
- 		okButton = new Button(buttonsComposite, SWT.NONE);
- 		cancelButton = new Button(buttonsComposite, SWT.NONE);
- 		buttonsComposite.setLayoutData(gridData3);
- 		buttonsComposite.setLayout(gridLayout4);
- 		gridData3.horizontalAlignment = org.eclipse.swt.layout.GridData.END;
- 		gridLayout4.numColumns = 2;
- 		okButton.setText("OK");
- 		cancelButton.setText("Cancel");
  	}
  	
! 	public void setCopyTarget(String target) {
! 		copyTarget.setText(target);
! 	}
! 	public Button getOkButton() {
! 		return okButton;
! 	}
! 	public Button getCancelButton() {
! 		return cancelButton;
! 	}
! 	public Text getCopyTarget() {
! 		return copyTarget;
  	}
  
--- 117,124 ----
  					}
  				});
  	}
  	
! public void setCopyTarget(String target) {
! 		labelConfirmQuestion.setText("Copy selected files to "+target+"?");
  	}
  
***************
*** 189,194 ****
  
  	public void selectDeleteCheckBox(boolean newValue) {
! 		deleteCheckBox.setSelection(newValue);
! 		updateDeleteCheckbox();
  	}
  
--- 128,136 ----
  
  	public void selectDeleteCheckBox(boolean newValue) {
! 		delete=newValue;
! 		if (isDetailsShowing()){
! 			deleteCheckBox.setSelection(newValue);
! 			updateDeleteCheckbox();
! 		}
  	}
  

Index: CustomConfirmDialogComposite.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/dialogs/CustomConfirmDialogComposite.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CustomConfirmDialogComposite.java	17 Apr 2006 08:48:56 -0000	1.2
--- CustomConfirmDialogComposite.java	17 Apr 2006 14:53:59 -0000	1.3
***************
*** 23,27 ****
  public class CustomConfirmDialogComposite extends Composite {
  
- 	private Composite mainComposite = null;
  	private Composite buttonsComposite = null;
  	private Composite detailsComposite = null;
--- 23,26 ----
***************
*** 34,37 ****
--- 33,37 ----
  	private GridData detailsData = null;
  	private int detailsHeight = 0;
+ 
  	
  	/**
***************
*** 55,66 ****
  		detailsData=new GridData();
  		detailsData.horizontalAlignment=SWT.FILL;
! 		//detailsData.grabExcessHorizontalSpace=true;
  		GridLayout detailsLayout = new GridLayout();
  		detailsLayout.marginWidth=0;
  		detailsComposite.setLayout(detailsLayout);
- 		detailsComposite.setLayoutData(detailsData);
  		
! 		GridLayout gridLayout3 = new GridLayout();
! 		GridData gridData2 = new GridData();
  		buttonsComposite = new Composite(this, SWT.NONE);
  		
--- 55,65 ----
  		detailsData=new GridData();
  		detailsData.horizontalAlignment=SWT.FILL;
! 		detailsComposite.setLayoutData(detailsData);
  		GridLayout detailsLayout = new GridLayout();
  		detailsLayout.marginWidth=0;
  		detailsComposite.setLayout(detailsLayout);
  		
! 		GridLayout buttonsLayout = new GridLayout();
! 		GridData buttonsData = new GridData();
  		buttonsComposite = new Composite(this, SWT.NONE);
  		
***************
*** 73,101 ****
  		yesButton = new Button(buttonsComposite, SWT.NONE);
  		noButton = new Button(buttonsComposite, SWT.NONE);
! 		gridData2.grabExcessHorizontalSpace = true;
! 		gridData2.horizontalAlignment = org.eclipse.swt.layout.GridData.END;
! 		gridData2.verticalAlignment = org.eclipse.swt.layout.GridData.END;
! 		buttonsComposite.setLayoutData(gridData2);
! 		buttonsComposite.setLayout(gridLayout3);
! 		gridLayout3.numColumns = 4;
! 		gridLayout3.marginHeight = 1;
! 		gridLayout3.marginWidth = 1;
  		yesButton.setText("&Yes");
  //		GridLayout buttonLayout1 = new GridLayout();
! 		GridData l1 = new GridData();
  		//l1.horizontalAlignment=SWT.FILL;
! 		l1.grabExcessHorizontalSpace=true;
! 		l1.minimumWidth=75;
! 		yesButton.setLayoutData(l1);
! 		GridData l2 = new GridData();
! 		l2.grabExcessHorizontalSpace=true;
  		//l2.horizontalAlignment=SWT.FILL;
! 		l2.minimumWidth=75;
  		noButton.setText("&No");
! 		noButton.setLayoutData(l2);
  		
  		detailsButton = new Button(buttonsComposite, SWT.NONE);
  		GridData detailsButtonData = new GridData();
  		detailsButtonData.minimumWidth=75;
  		detailsButton.setText(ProgressMessages.ProgressMonitorJobsDialog_DetailsTitle);
  		detailsButton.addSelectionListener(new SelectionAdapter() {
--- 72,102 ----
  		yesButton = new Button(buttonsComposite, SWT.NONE);
  		noButton = new Button(buttonsComposite, SWT.NONE);
! 		buttonsData.grabExcessHorizontalSpace = true;
! 		buttonsData.horizontalAlignment = org.eclipse.swt.layout.GridData.END;
! 		buttonsData.verticalAlignment = org.eclipse.swt.layout.GridData.END;
! 		buttonsData.minimumWidth=400;
! 		buttonsComposite.setLayoutData(buttonsData);
! 		buttonsComposite.setLayout(buttonsLayout);
! 		buttonsLayout.numColumns = 4;
! 		buttonsLayout.marginHeight = 1;
! 		buttonsLayout.marginWidth = 1;
  		yesButton.setText("&Yes");
  //		GridLayout buttonLayout1 = new GridLayout();
! 		GridData yesButtonData = new GridData();
  		//l1.horizontalAlignment=SWT.FILL;
! 		yesButtonData.grabExcessHorizontalSpace=true;
! 		yesButtonData.minimumWidth=75;
! 		yesButton.setLayoutData(yesButtonData);
! 		GridData noButtonData = new GridData();
! 		noButtonData.grabExcessHorizontalSpace=true;
  		//l2.horizontalAlignment=SWT.FILL;
! 		noButtonData.minimumWidth=75;
  		noButton.setText("&No");
! 		noButton.setLayoutData(noButtonData);
  		
  		detailsButton = new Button(buttonsComposite, SWT.NONE);
  		GridData detailsButtonData = new GridData();
  		detailsButtonData.minimumWidth=75;
+ 		detailsButton.setLayoutData(detailsButtonData);
  		detailsButton.setText(ProgressMessages.ProgressMonitorJobsDialog_DetailsTitle);
  		detailsButton.addSelectionListener(new SelectionAdapter() {
***************
*** 144,162 ****
  	}
  	
  	protected void createDetailsContent(Composite parent){
  		
  	}
  	
  	protected void createMainContent(Composite parent){
  		
  	}
! 
  	public Button getYesButton() {
  		return yesButton;
  	}
  	
  	public Button getNoButton() {
  		return noButton;
  	}
  	
  }
--- 145,189 ----
  	}
  	
+ 	/**
+ 	 * Override this method in a subclass to create the details view
+ 	 * of the dialog. The method is called every time the "Details" button
+ 	 * is clicked to show the view. Thus dialog elements created in this method
+ 	 * are available only if the dialogs are currently showing.
+ 	 * @param parent The parent composite. Make all elements children of this.
+ 	 */
  	protected void createDetailsContent(Composite parent){
  		
  	}
  	
+ 	/**
+ 	 * Override this method in a subclass to create the main
+ 	 * content of the dialog. The method is called in the constructor.
+ 	 * @param parent The parent composite. Make all elements children of this.
+ 	 */
  	protected void createMainContent(Composite parent){
  		
  	}
! 	
! 	/**
! 	 * Gets the Yes button.
! 	 */
  	public Button getYesButton() {
  		return yesButton;
  	}
  	
+ 	/**
+ 	 * Gets the no button.
+ 	 */
  	public Button getNoButton() {
  		return noButton;
  	}
  	
+ 	/**
+ 	 * 
+ 	 * @return whether the details are currently showing
+ 	 */
+ 	public boolean isDetailsShowing(){
+ 		return detailsContent!=null;
+ 	}
+ 	
  }

Index: DeleteConfirmDialogComposite.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/dialogs/DeleteConfirmDialogComposite.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** DeleteConfirmDialogComposite.java	17 Apr 2006 08:48:56 -0000	1.11
--- DeleteConfirmDialogComposite.java	17 Apr 2006 14:53:59 -0000	1.12
***************
*** 38,53 ****
  	
  	private void createListComposite(Composite info) {
! 		GridData gridData = new GridData();
! 		gridData.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL;
! 		gridData.grabExcessHorizontalSpace = true;
! 		gridData.verticalAlignment = org.eclipse.swt.layout.GridData.FILL;
! 		gridData.grabExcessVerticalSpace = true;
! 		GridData gridData1 = new GridData();
  		GridData gridData2 = new GridData();
! 		gridData1.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL;
! 		gridData1.grabExcessHorizontalSpace = true;
! 		gridData1.verticalAlignment = org.eclipse.swt.layout.GridData.FILL;
! 		gridData1.grabExcessVerticalSpace = true;
! 		gridData1.heightHint=60;
  		gridData2.horizontalAlignment = org.eclipse.swt.layout.GridData.END;
  		gridData2.verticalAlignment = org.eclipse.swt.layout.GridData.BEGINNING;
--- 38,53 ----
  	
  	private void createListComposite(Composite info) {
! 		GridData listCompositeData = new GridData();
! 		listCompositeData.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL;
! 		listCompositeData.grabExcessHorizontalSpace = true;
! 		listCompositeData.verticalAlignment = org.eclipse.swt.layout.GridData.FILL;
! 		listCompositeData.grabExcessVerticalSpace = true;
! 		GridData deleteListData = new GridData();
  		GridData gridData2 = new GridData();
! 		deleteListData.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL;
! 		deleteListData.grabExcessHorizontalSpace = true;
! 		deleteListData.verticalAlignment = org.eclipse.swt.layout.GridData.FILL;
! 		deleteListData.grabExcessVerticalSpace = true;
! 		deleteListData.heightHint=60;
  		gridData2.horizontalAlignment = org.eclipse.swt.layout.GridData.END;
  		gridData2.verticalAlignment = org.eclipse.swt.layout.GridData.BEGINNING;
***************
*** 56,63 ****
  		gridLayout.marginWidth=0;
  		listComposite = new Composite(info, SWT.NONE);
! 		listComposite.setLayoutData(gridData);
  		listComposite.setLayout(gridLayout);
  		deleteFileList = new List(listComposite, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
! 		deleteFileList.setLayoutData(gridData1);
  //		removeFileButton = new Button(listComposite, SWT.NONE);		
  //		removeFileButton.setLayoutData(gridData2);
--- 56,63 ----
  		gridLayout.marginWidth=0;
  		listComposite = new Composite(info, SWT.NONE);
! 		listComposite.setLayoutData(listCompositeData);
  		listComposite.setLayout(gridLayout);
  		deleteFileList = new List(listComposite, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
! 		deleteFileList.setLayoutData(deleteListData);
  //		removeFileButton = new Button(listComposite, SWT.NONE);		
  //		removeFileButton.setLayoutData(gridData2);
***************
*** 81,88 ****
  //	@Override
  	protected void createMainContent(Composite parent) {
! 		GridLayout gridLayout1 = new GridLayout();
! 		gridLayout1.numColumns = 1;
! 		GridData gridData2 = new GridData();
! 		GridData gridData1 = new GridData();
  
  		label = new Label(parent, SWT.NONE);
--- 81,88 ----
  //	@Override
  	protected void createMainContent(Composite parent) {
! 		GridLayout infoCompositeLayout = new GridLayout();
! 		infoCompositeLayout.numColumns = 1;
! 		GridData infoCompositeData = new GridData();
! 		GridData labelData = new GridData();
  
  		label = new Label(parent, SWT.NONE);
***************
*** 90,111 ****
  		infoComposite = new Composite(parent, SWT.NONE);
  		//gridData1.horizontalAlignment = org.eclipse.swt.layout.GridData.CENTER;
! 		gridData1.grabExcessHorizontalSpace = true;
! 		gridData1.grabExcessVerticalSpace = true;
  		
  		label.setText("Delete selected files?");
! 		label.setLayoutData(gridData1);
  		
! 		createListComposite(infoComposite);
  		
  		moveToRecycle = ((FilePanelPlugin.getDefault().getPreferenceStore()).
  				getBoolean(FilePanelPlugin.MOVE_TO_RECYCLE_KEY));
  		
! 		gridData2.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL;
! 		gridData2.verticalAlignment = org.eclipse.swt.layout.GridData.CENTER;
! 		gridData2.grabExcessHorizontalSpace = true;
! 		gridData2.grabExcessVerticalSpace = true;
! 		gridLayout1.marginWidth=0;
! 		infoComposite.setLayoutData(gridData2);
! 		infoComposite.setLayout(gridLayout1);
  	}
  	
--- 90,111 ----
  		infoComposite = new Composite(parent, SWT.NONE);
  		//gridData1.horizontalAlignment = org.eclipse.swt.layout.GridData.CENTER;
! 		labelData.grabExcessHorizontalSpace = true;
! 		labelData.grabExcessVerticalSpace = true;
  		
  		label.setText("Delete selected files?");
! 		label.setLayoutData(labelData);
  		
! 		createListComposite(parent);
  		
  		moveToRecycle = ((FilePanelPlugin.getDefault().getPreferenceStore()).
  				getBoolean(FilePanelPlugin.MOVE_TO_RECYCLE_KEY));
  		
! 		infoCompositeData.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL;
! 		infoCompositeData.verticalAlignment = org.eclipse.swt.layout.GridData.CENTER;
! 		infoCompositeData.grabExcessHorizontalSpace = true;
! 		infoCompositeData.grabExcessVerticalSpace = true;
! 		infoCompositeLayout.marginWidth=0;
! 		infoComposite.setLayoutData(infoCompositeData);
! 		infoComposite.setLayout(infoCompositeLayout);
  	}
  	
***************
*** 119,126 ****
  		trashComposite.setLayout(trashLayout);
  		
! 		GridData trashData1 = new GridData();
! 		GridData trashData2 = new GridData();
! 		trashData1.verticalAlignment=SWT.CENTER;
! 		trashData2.verticalAlignment=SWT.CENTER;
  		trashLabel = new Label(trashComposite, SWT.NONE);
  		trashLabel.setText("");
--- 119,126 ----
  		trashComposite.setLayout(trashLayout);
  		
! 		GridData trashLabelData = new GridData();
! 		GridData moveToRecycleButtonData = new GridData();
! 		trashLabelData.verticalAlignment=SWT.CENTER;
! 		moveToRecycleButtonData.verticalAlignment=SWT.CENTER;
  		trashLabel = new Label(trashComposite, SWT.NONE);
  		trashLabel.setText("");
***************
*** 128,132 ****
  		Image trashImg = imgDesc.createImage(getDisplay());
  		trashLabel.setImage(trashImg);
! 		trashLabel.setLayoutData(trashData1);
  			
  		moveToRecycleButton = new Button(trashComposite, SWT.CHECK);
--- 128,132 ----
  		Image trashImg = imgDesc.createImage(getDisplay());
  		trashLabel.setImage(trashImg);
! 		trashLabel.setLayoutData(trashLabelData);
  			
  		moveToRecycleButton = new Button(trashComposite, SWT.CHECK);
***************
*** 153,157 ****
  							}
  						});
! 		moveToRecycleButton.setLayoutData(trashData2);
  	}
  
--- 153,157 ----
  							}
  						});
! 		moveToRecycleButton.setLayoutData(moveToRecycleButtonData);
  	}
  

[Jcommander-commit] plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers FileCopyPerformer.java,1.31,1.32 FileDeletePerformer.java,1.16,1.17

[Matthias K <mat...@us...>]

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10682/src/org/jcommander/ui/filepanel/performers

Modified Files:
	FileCopyPerformer.java FileDeletePerformer.java 
Log Message:
- made CopyConfirmDialogComposite subclass of CustomConfirmDialogComposite
- a lot of refractorings to make variable names more selfexplaining
- title text for DeleteConfirmDialog

Index: FileCopyPerformer.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers/FileCopyPerformer.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** FileCopyPerformer.java	28 Mar 2006 08:45:39 -0000	1.31
--- FileCopyPerformer.java	17 Apr 2006 14:53:59 -0000	1.32
***************
*** 486,490 ****
  		}
  		
! 		confirmDialog.setDefaultButton(confirmDialogComposite.getOkButton());
  		confirmDialog.addShellListener(new ShellAdapter() {
  			public void shellClosed(ShellEvent e) {
--- 486,490 ----
  		}
  		
! 		confirmDialog.setDefaultButton(confirmDialogComposite.getYesButton());
  		confirmDialog.addShellListener(new ShellAdapter() {
  			public void shellClosed(ShellEvent e) {
***************
*** 493,497 ****
  		});
  		
! 		confirmDialogComposite.getOkButton().addSelectionListener(new SelectionAdapter() {
  			public void widgetSelected(SelectionEvent e) {
  				keepSelected = confirmDialogComposite.isKeptSelected();
--- 493,497 ----
  		});
  		
! 		confirmDialogComposite.getYesButton().addSelectionListener(new SelectionAdapter() {
  			public void widgetSelected(SelectionEvent e) {
  				keepSelected = confirmDialogComposite.isKeptSelected();
***************
*** 507,511 ****
  		confirmDialogComposite.selectDeleteCheckBox(deleteSourceFiles);
  		
! 		confirmDialogComposite.getCancelButton().addSelectionListener(cancelButtonSelectionAdapter);
  		
  		Utils.accomodateComposite(confirmDialogComposite);
--- 507,511 ----
  		confirmDialogComposite.selectDeleteCheckBox(deleteSourceFiles);
  		
! 		confirmDialogComposite.getNoButton().addSelectionListener(cancelButtonSelectionAdapter);
  		
  		Utils.accomodateComposite(confirmDialogComposite);
***************
*** 524,528 ****
  														.getCurrentParent();
  		
! 		confirmDialogComposite.getCopyTarget().setText(targetDir.getName().getRootURI() + targetDir.getName().getPath());
  
  		if(predefinedSourceFiles != null) {
--- 524,529 ----
  														.getCurrentParent();
  		
! 		//confirmDialogComposite.getCopyTarget().setText(targetDir.getName().getRootURI() + targetDir.getName().getPath());
! 		confirmDialogComposite.setCopyTarget(targetDir.getName().getRootURI() + targetDir.getName().getPath());
  
  		if(predefinedSourceFiles != null) {

Index: FileDeletePerformer.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers/FileDeletePerformer.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** FileDeletePerformer.java	29 Dec 2005 15:07:39 -0000	1.16
--- FileDeletePerformer.java	17 Apr 2006 14:53:59 -0000	1.17
***************
*** 291,294 ****
--- 291,295 ----
  		
  		confirmDialog = Utils.createOperationDialog(shell, mediator);
+ 		confirmDialog.setText("Delete files");
  		confirmDialogComposite = new DeleteConfirmDialogComposite(confirmDialog, SWT.NONE);
  		

[Jcommander-commit] plugins/org.jcommander jcommander.product,1.33,1.34

[Robert E. <sky...@us...>]

Update of /cvsroot/jcommander/plugins/org.jcommander
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6710

Modified Files:
	jcommander.product 
Log Message:
Updated with org.jcommander.thirdparty feature

Index: jcommander.product
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander/jcommander.product,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** jcommander.product	5 Apr 2006 20:37:32 -0000	1.33
--- jcommander.product	17 Apr 2006 14:05:18 -0000	1.34
***************
*** 151,154 ****
--- 151,155 ----
        <feature id="org.jcommander" version="0.7.1"/>
        <feature id="org.jcommander.eclipseplatform" version="3.2.0"/>
+       <feature id="org.jcommander.thirdparty" version="0.7.1"/>
        <feature id="org.jcommander.ui.iconpack.eclipse" version="0.7.1"/>
     </features>

[Jcommander-commit] plugins/org.jcommander.eclipseplatform feature.xml,1.19,1.20

[Robert E. <sky...@us...>]

Update of /cvsroot/jcommander/plugins/org.jcommander.eclipseplatform
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6680

Modified Files:
	feature.xml 
Log Message:
Updated with org.jcommander.thirdparty feature

Index: feature.xml
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipseplatform/feature.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** feature.xml	5 Apr 2006 19:53:07 -0000	1.19
--- feature.xml	17 Apr 2006 14:05:15 -0000	1.20
***************
*** 185,194 ****
  
     <plugin
-          id="edu.stanford.suif.keepresident"
-          download-size="0"
-          install-size="0"
-          version="0.1.0"/>
- 
-    <plugin
           id="org.jcommander.eclipsepatch.progressview"
           download-size="0"
--- 185,188 ----
***************
*** 289,291 ****
--- 283,292 ----
           unpack="false"/>
  
+    <plugin
+          id="org.eclipse.ui.presentations.r21"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+          unpack="false"/>
+ 
  </feature>

[Jcommander-commit] plugins/org.jcommander.thirdparty feature.xml,NONE,1.1 .project,NONE,1.1 build.properties,NONE,1.1

[Robert E. <sky...@us...>]

Update of /cvsroot/jcommander/plugins/org.jcommander.thirdparty
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6238

Added Files:
	feature.xml .project build.properties 
Log Message:
First version

--- NEW FILE: feature.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<feature
      id="org.jcommander.thirdparty"
      label="Thirdparty Feature"
      version="0.7.1"
      provider-name="JCmd Dev Team">

   <description url="http://www.example.com/description">
      [Enter Feature Description here.]
   </description>

   <copyright url="http://www.example.com/copyright">
      [Enter Copyright Description here.]
   </copyright>

   <license url="http://www.example.com/license">
      [Enter License Description here.]
   </license>

   <plugin
         id="de.loskutov.eclipseskins.extvs"
         download-size="0"
         install-size="0"
         version="0.0.0"
         unpack="false"/>

   <plugin
         id="edu.stanford.suif.keepresident"
         download-size="0"
         install-size="0"
         version="0.0.0"/>

</feature>

--- NEW FILE: .project ---
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
	<name>org.jcommander.thirdparty</name>
	<comment></comment>
	<projects>
	</projects>
	<buildSpec>
		<buildCommand>
			<name>org.eclipse.pde.FeatureBuilder</name>
			<arguments>
			</arguments>
		</buildCommand>
	</buildSpec>
	<natures>
		<nature>org.eclipse.pde.FeatureNature</nature>
	</natures>
</projectDescription>

--- NEW FILE: build.properties ---
bin.includes = feature.xml

[Jcommander-commit] plugins/org.jcommander.thirdparty - New directory

[Robert E. <sky...@us...>]

Update of /cvsroot/jcommander/plugins/org.jcommander.thirdparty
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6079/org.jcommander.thirdparty

Log Message:
Directory /cvsroot/jcommander/plugins/org.jcommander.thirdparty added to the repository

[Jcommander-commit] plugins-third_party/edu.stanford.suif.keepresident_0.1.0 keepresident.jar,NONE,1.1 LICENSE.txt,NONE,1.1 plugin.xml,NONE,1.1 kernelinterface.dll,NONE,1.1

[Robert E. <sky...@us...>]

Update of /cvsroot/jcommander/plugins-third_party/edu.stanford.suif.keepresident_0.1.0
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9243/edu.stanford.suif.keepresident_0.1.0

Added Files:
	keepresident.jar LICENSE.txt plugin.xml kernelinterface.dll 
Log Message:
First version

--- NEW FILE: keepresident.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: LICENSE.txt ---
Common Public License Version 1.0

THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON
PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF
THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.

1. DEFINITIONS

"Contribution" means:

    a) in the case of the initial Contributor, the initial code and
    documentation distributed under this Agreement, and

    b) in the case of each subsequent Contributor:

    i) changes to the Program, and

    ii) additions to the Program;

    where such changes and/or additions to the Program originate from
    and are distributed by that particular Contributor. A Contribution
    'originates' from a Contributor if it was added to the Program by
    such Contributor itself or anyone acting on such Contributor's
    behalf. Contributions do not include additions to the Program
    which: (i) are separate modules of software distributed in
    conjunction with the Program under their own license agreement,
    and (ii) are not derivative works of the Program.

"Contributor" means any person or entity that distributes the Program.

"Licensed Patents " mean patent claims licensable by a Contributor
which are necessarily infringed by the use or sale of its Contribution
alone or when combined with the Program.

"Program" means the Contributions distributed in accordance with this
Agreement.

"Recipient" means anyone who receives the Program under this
Agreement, including all Contributors.

2. GRANT OF RIGHTS

    a) Subject to the terms of this Agreement, each Contributor hereby
    grants Recipient a non-exclusive, worldwide, royalty-free
    copyright license to reproduce, prepare derivative works of,
    publicly display, publicly perform, distribute and sublicense the
    Contribution of such Contributor, if any, and such derivative
    works, in source code and object code form.

    b) Subject to the terms of this Agreement, each Contributor hereby
    grants Recipient a non-exclusive, worldwide, royalty-free patent
    license under Licensed Patents to make, use, sell, offer to sell,
    import and otherwise transfer the Contribution of such
    Contributor, if any, in source code and object code form. This
    patent license shall apply to the combination of the Contribution
    and the Program if, at the time the Contribution is added by the
    Contributor, such addition of the Contribution causes such
    combination to be covered by the Licensed Patents. The patent
    license shall not apply to any other combinations which include
    the Contribution. No hardware per se is licensed hereunder.

    c) Recipient understands that although each Contributor grants the
    licenses to its Contributions set forth herein, no assurances are
    provided by any Contributor that the Program does not infringe the
    patent or other intellectual property rights of any other entity.
    Each Contributor disclaims any liability to Recipient for claims
    brought by any other entity based on infringement of intellectual
    property rights or otherwise. As a condition to exercising the
    rights and licenses granted hereunder, each Recipient hereby
    assumes sole responsibility to secure any other intellectual
    property rights needed, if any. For example, if a third party
    patent license is required to allow Recipient to distribute the
    Program, it is Recipient's responsibility to acquire that license
    before distributing the Program.

    d) Each Contributor represents that to its knowledge it has
    sufficient copyright rights in its Contribution, if any, to grant
    the copyright license set forth in this Agreement.

3. REQUIREMENTS

A Contributor may choose to distribute the Program in object code form
under its own license agreement, provided that:

    a) it complies with the terms and conditions of this Agreement;
    and

    b) its license agreement:

    i) effectively disclaims on behalf of all Contributors all
    warranties and conditions, express and implied, including
    warranties or conditions of title and non-infringement, and
    implied warranties or conditions of merchantability and fitness
    for a particular purpose;

    ii) effectively excludes on behalf of all Contributors all
    liability for damages, including direct, indirect, special,
    incidental and consequential damages, such as lost profits;

    iii) states that any provisions which differ from this Agreement
    are offered by that Contributor alone and not by any other party;
    and

    iv) states that source code for the Program is available from such
    Contributor, and informs licensees how to obtain it in a
    reasonable manner on or through a medium customarily used for
    software exchange.

When the Program is made available in source code form:

    a) it must be made available under this Agreement; and

    b) a copy of this Agreement must be included with each copy of the
    Program.

Contributors may not remove or alter any copyright notices contained
within the Program.

Each Contributor must identify itself as the originator of its
Contribution, if any, in a manner that reasonably allows subsequent
Recipients to identify the originator of the Contribution.

4. COMMERCIAL DISTRIBUTION

Commercial distributors of software may accept certain
responsibilities with respect to end users, business partners and the
like. While this license is intended to facilitate the commercial use
of the Program, the Contributor who includes the Program in a
commercial product offering should do so in a manner which does not
create potential liability for other Contributors. Therefore, if a
Contributor includes the Program in a commercial product offering,
such Contributor ("Commercial Contributor") hereby agrees to defend
and indemnify every other Contributor ("Indemnified Contributor")
against any losses, damages and costs (collectively "Losses") arising
from claims, lawsuits and other legal actions brought by a third party
against the Indemnified Contributor to the extent caused by the acts
or omissions of such Commercial Contributor in connection with its
distribution of the Program in a commercial product offering. The
obligations in this section do not apply to any claims or Losses
relating to any actual or alleged intellectual property
infringement. In order to qualify, an Indemnified Contributor must: a)
promptly notify the Commercial Contributor in writing of such claim,
and b) allow the Commercial Contributor to control, and cooperate with
the Commercial Contributor in, the defense and any related settlement
negotiations. The Indemnified Contributor may participate in any such
claim at its own expense.

For example, a Contributor might include the Program in a commercial
product offering, Product X. That Contributor is then a Commercial
Contributor. If that Commercial Contributor then makes performance
claims, or offers warranties related to Product X, those performance
claims and warranties are such Commercial Contributor's responsibility
alone. Under this section, the Commercial Contributor would have to
defend claims against the other Contributors related to those
performance claims and warranties, and if a court requires any other
Contributor to pay any damages as a result, the Commercial Contributor
must pay those damages.

5. NO WARRANTY

EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY
WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
responsible for determining the appropriateness of using and
distributing the Program and assumes all risks associated with its
exercise of rights under this Agreement, including but not limited to
the risks and costs of program errors, compliance with applicable
laws, damage to or loss of data, programs or equipment, and
unavailability or interruption of operations.

6. DISCLAIMER OF LIABILITY

EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR
ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.

7. GENERAL

If any provision of this Agreement is invalid or unenforceable under
applicable law, it shall not affect the validity or enforceability of
the remainder of the terms of this Agreement, and without further
action by the parties hereto, such provision shall be reformed to the
minimum extent necessary to make such provision valid and enforceable.

If Recipient institutes patent litigation against a Contributor with
respect to a patent applicable to software (including a cross-claim or
counterclaim in a lawsuit), then any patent licenses granted by that
Contributor to such Recipient under this Agreement shall terminate as
of the date such litigation is filed. In addition, if Recipient
institutes patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Program
itself (excluding combinations of the Program with other software or
hardware) infringes such Recipient's patent(s), then such Recipient's
rights granted under Section 2(b) shall terminate as of the date such
litigation is filed.

All Recipient's rights under this Agreement shall terminate if it
fails to comply with any of the material terms or conditions of this
Agreement and does not cure such failure in a reasonable period of
time after becoming aware of such noncompliance. If all Recipient's
rights under this Agreement terminate, Recipient agrees to cease use
and distribution of the Program as soon as reasonably
practicable. However, Recipient's obligations under this Agreement and
any licenses granted by Recipient relating to the Program shall
continue and survive.

Everyone is permitted to copy and distribute copies of this Agreement,
but in order to avoid inconsistency the Agreement is copyrighted and
may only be modified in the following manner. The Agreement Steward
reserves the right to publish new versions (including revisions) of
this Agreement from time to time. No one other than the Agreement
Steward has the right to modify this Agreement. IBM is the initial
Agreement Steward. IBM may assign the responsibility to serve as the
Agreement Steward to a suitable separate entity. Each new version of
the Agreement will be given a distinguishing version number. The
Program (including Contributions) may always be distributed subject to
the version of the Agreement under which it was received. In addition,
after a new version of the Agreement is published, Contributor may
elect to distribute the Program (including its Contributions) under
the new version. Except as expressly stated in Sections 2(a) and 2(b)
above, Recipient receives no rights or licenses to the intellectual
property of any Contributor under this Agreement, whether expressly,
by implication, estoppel or otherwise. All rights in the Program not
expressly granted under this Agreement are reserved.

This Agreement is governed by the laws of the State of New York and
the intellectual property laws of the United States of America. No
party to this Agreement will bring a legal action under this Agreement
more than one year after the cause of action arose. Each party waives
its rights to a jury trial in any resulting litigation.

--- NEW FILE: kernelinterface.dll ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: plugin.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.0"?>
<plugin
   id="edu.stanford.suif.keepresident"
   name="KeepResident Plug-in"
   version="0.1.0"
   provider-name=""
   class="edu.stanford.suif.keepresident.KeepResidentPlugin">

   <runtime>
      <library name="keepresident.jar">
         <export name="*"/>
      </library>
   </runtime>

   <requires>
      <import plugin="org.eclipse.ui"/>
      <import plugin="org.eclipse.core.runtime"/>
   </requires>

   <extension point="org.eclipse.ui.startup"/> 
   <extension
         point="org.eclipse.ui.preferencePages">
      <page
            name="KeepResident Preferences"
            class="edu.stanford.suif.keepresident.preferences.KeepResidentPreferencePage"
            id="edu.stanford.suif.keepresident.preferences.KeepResidentPreferencePage">
      </page>
   </extension>

</plugin>

[Jcommander-commit] plugins-third_party README.TXT,NONE,1.1 .cvsignore,NONE,1.1 de.loskutov.eclipseskins.extvs_1.2.4.jar,NONE,1.1

[Robert E. <sky...@us...>]

Update of /cvsroot/jcommander/plugins-third_party
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9243

Added Files:
	README.TXT .cvsignore de.loskutov.eclipseskins.extvs_1.2.4.jar 
Log Message:
First version

--- NEW FILE: de.loskutov.eclipseskins.extvs_1.2.4.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: .cvsignore ---
.project

--- NEW FILE: README.TXT ---
These are binary versions of third party plugins that JCommander uses and which should come bundled with every JCommander binary package.

The plugins need to be copied in the plugins directory of the Eclipse installation that you are using to develop JCommander.

[Jcommander-commit] plugins-third_party/edu.stanford.suif.keepresident_0.1.0 - New directory

[Robert E. <sky...@us...>]

Update of /cvsroot/jcommander/plugins-third_party/edu.stanford.suif.keepresident_0.1.0
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9169/edu.stanford.suif.keepresident_0.1.0

Log Message:
Directory /cvsroot/jcommander/plugins-third_party/edu.stanford.suif.keepresident_0.1.0 added to the repository

[Jcommander-commit] plugins-third_party - New directory

[Robert E. <sky...@us...>]

Update of /cvsroot/jcommander/plugins-third_party
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8689/plugins-third_party

Log Message:
Directory /cvsroot/jcommander/plugins-third_party added to the repository

[Jcommander-commit] plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers Utils.java,1.5,1.6

[Robert E. <sky...@us...>]

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31428/src/org/jcommander/ui/filepanel/performers

Modified Files:
	Utils.java 
Log Message:
Changed confirmation and perform dialog types to normal child window trims according to the discussions from feature request [1457808 ] "Common Dialog design rules"

Index: Utils.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers/Utils.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Utils.java	13 Apr 2006 07:55:09 -0000	1.5
--- Utils.java	17 Apr 2006 08:54:28 -0000	1.6
***************
*** 21,26 ****
  	 */
  	public static Shell createOperationDialog(Shell parent, TabMediator mediator) {
! 		Shell tmpShell = new Shell(parent, SWT.TOOL | SWT.RESIZE | SWT.TITLE | SWT.CLOSE); 
! //				SWT.TITLE | SWT.CLOSE | SWT.MIN | SWT.MAX | SWT.BORDER | SWT.RESIZE);
  		
  		GridLayout layout = new GridLayout();
--- 21,27 ----
  	 */
  	public static Shell createOperationDialog(Shell parent, TabMediator mediator) {
! 		Shell tmpShell = new Shell(parent, SWT.DIALOG_TRIM | SWT.RESIZE);
! //		SWT.TOOL | SWT.RESIZE | SWT.TITLE | SWT.CLOSE); 
! //		SWT.TITLE | SWT.CLOSE | SWT.MIN | SWT.MAX | SWT.BORDER | SWT.RESIZE);
  		
  		GridLayout layout = new GridLayout();

[Jcommander-commit] plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/dialogs DeleteConfirmDialogComposite.java,1.10,1.11 CustomConfirmDialogComposite.java,1.1,1.2

[Robert E. <sky...@us...>]

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/dialogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27311/src/org/jcommander/ui/filepanel/dialogs

Modified Files:
	DeleteConfirmDialogComposite.java 
	CustomConfirmDialogComposite.java 
Log Message:
Removed Java 1.5 annotations. Sources should be Java 1.4 compatible.

Index: CustomConfirmDialogComposite.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/dialogs/CustomConfirmDialogComposite.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CustomConfirmDialogComposite.java	16 Apr 2006 21:45:38 -0000	1.1
--- CustomConfirmDialogComposite.java	17 Apr 2006 08:48:56 -0000	1.2
***************
*** 100,104 ****
  		detailsButton.setText(ProgressMessages.ProgressMonitorJobsDialog_DetailsTitle);
  		detailsButton.addSelectionListener(new SelectionAdapter() {
! 			@Override
  			public void widgetSelected(SelectionEvent e) {
  				super.widgetSelected(e);
--- 100,104 ----
  		detailsButton.setText(ProgressMessages.ProgressMonitorJobsDialog_DetailsTitle);
  		detailsButton.addSelectionListener(new SelectionAdapter() {
! //			@Override
  			public void widgetSelected(SelectionEvent e) {
  				super.widgetSelected(e);

Index: DeleteConfirmDialogComposite.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/dialogs/DeleteConfirmDialogComposite.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** DeleteConfirmDialogComposite.java	16 Apr 2006 21:45:38 -0000	1.10
--- DeleteConfirmDialogComposite.java	17 Apr 2006 08:48:56 -0000	1.11
***************
*** 79,83 ****
  	}
  
! 	@Override
  	protected void createMainContent(Composite parent) {
  		GridLayout gridLayout1 = new GridLayout();
--- 79,83 ----
  	}
  
! //	@Override
  	protected void createMainContent(Composite parent) {
  		GridLayout gridLayout1 = new GridLayout();
***************
*** 110,114 ****
  	}
  	
! 	@Override
  	protected void createDetailsContent(Composite parent) {
  		//Button b = new Button(parent, SWT.NONE);
--- 110,114 ----
  	}
  	
! //	@Override
  	protected void createDetailsContent(Composite parent) {
  		//Button b = new Button(parent, SWT.NONE);

[Jcommander-commit] plugins/org.jcommander.ui.compare/src/org/jcommander/compare ComparePlugin.java,1.2,1.3

[Robert E. <sky...@us...>]

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.compare/src/org/jcommander/compare
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27081/src/org/jcommander/compare

Modified Files:
	ComparePlugin.java 
Log Message:
Removed Java 1.5 annotations. Sources should be Java 1.4 compatible.

Index: ComparePlugin.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.compare/src/org/jcommander/compare/ComparePlugin.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ComparePlugin.java	5 Apr 2006 21:36:02 -0000	1.2
--- ComparePlugin.java	17 Apr 2006 08:48:51 -0000	1.3
***************
*** 325,329 ****
  				 * @see org.eclipse.compare.CompareConfiguration#getRightLabel(java.lang.Object)
  				 */
! 				@Override
  				public String getRightLabel(Object element) {
  					if (element!=null) {
--- 325,329 ----
  				 * @see org.eclipse.compare.CompareConfiguration#getRightLabel(java.lang.Object)
  				 */
! //				@Override
  				public String getRightLabel(Object element) {
  					if (element!=null) {
***************
*** 341,345 ****
  				 * @see org.eclipse.compare.CompareConfiguration#getLeftLabel(java.lang.Object)
  				 */
! 				@Override
  				public String getLeftLabel(Object element) {
  					if (element!=null) {
--- 341,345 ----
  				 * @see org.eclipse.compare.CompareConfiguration#getLeftLabel(java.lang.Object)
  				 */
! //				@Override
  				public String getLeftLabel(Object element) {
  					if (element!=null) {

[Jcommander-commit] plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/dialogs CustomConfirmDialogComposite.java,NONE,1.1 DeleteConfirmDialogComposite.java,1.9,1.10

[Matthias K <mat...@us...>]

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/dialogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4069/src/org/jcommander/ui/filepanel/dialogs

Modified Files:
	DeleteConfirmDialogComposite.java 
Added Files:
	CustomConfirmDialogComposite.java 
Log Message:
Changed Layout, added details view.

--- NEW FILE: CustomConfirmDialogComposite.java ---
/**
 * 
 */
package org.jcommander.ui.filepanel.dialogs;

import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.layout.RowLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.internal.progress.ProgressMessages;

/**
 * @author MatthiasK
 *
 */
public class CustomConfirmDialogComposite extends Composite {

	private Composite mainComposite = null;
	private Composite buttonsComposite = null;
	private Composite detailsComposite = null;
	private Composite detailsContent = null;
	
	private Button yesButton = null;
	private Button noButton = null;
	private Button detailsButton = null;
	
	private GridData detailsData = null;
	private int detailsHeight = 0;
	
	/**
	 * @param parent
	 * @param style
	 */
	public CustomConfirmDialogComposite(Composite parent, int style) {
		super(parent, style);
		initialize();
	}
	
	private void initialize(){
		createMainContent(this);
		createButtonsComposite();
		//mainComposite.setLayout(new GridLayout());
		this.setLayout(new GridLayout());
	}
	
	private void createButtonsComposite(){
		detailsComposite = new Composite(this, SWT.NONE);
		detailsData=new GridData();
		detailsData.horizontalAlignment=SWT.FILL;
		//detailsData.grabExcessHorizontalSpace=true;
		GridLayout detailsLayout = new GridLayout();
		detailsLayout.marginWidth=0;
		detailsComposite.setLayout(detailsLayout);
		detailsComposite.setLayoutData(detailsData);
		
		GridLayout gridLayout3 = new GridLayout();
		GridData gridData2 = new GridData();
		buttonsComposite = new Composite(this, SWT.NONE);
		
		Label fillLabel = new Label(buttonsComposite, SWT.NONE);
		GridData gridDataFill = new GridData();
		gridDataFill.grabExcessHorizontalSpace=true;
		gridDataFill.minimumWidth=200;
		fillLabel.setLayoutData(gridDataFill);
		
		yesButton = new Button(buttonsComposite, SWT.NONE);
		noButton = new Button(buttonsComposite, SWT.NONE);
		gridData2.grabExcessHorizontalSpace = true;
		gridData2.horizontalAlignment = org.eclipse.swt.layout.GridData.END;
		gridData2.verticalAlignment = org.eclipse.swt.layout.GridData.END;
		buttonsComposite.setLayoutData(gridData2);
		buttonsComposite.setLayout(gridLayout3);
		gridLayout3.numColumns = 4;
		gridLayout3.marginHeight = 1;
		gridLayout3.marginWidth = 1;
		yesButton.setText("&Yes");
//		GridLayout buttonLayout1 = new GridLayout();
		GridData l1 = new GridData();
		//l1.horizontalAlignment=SWT.FILL;
		l1.grabExcessHorizontalSpace=true;
		l1.minimumWidth=75;
		yesButton.setLayoutData(l1);
		GridData l2 = new GridData();
		l2.grabExcessHorizontalSpace=true;
		//l2.horizontalAlignment=SWT.FILL;
		l2.minimumWidth=75;
		noButton.setText("&No");
		noButton.setLayoutData(l2);
		
		detailsButton = new Button(buttonsComposite, SWT.NONE);
		GridData detailsButtonData = new GridData();
		detailsButtonData.minimumWidth=75;
		detailsButton.setText(ProgressMessages.ProgressMonitorJobsDialog_DetailsTitle);
		detailsButton.addSelectionListener(new SelectionAdapter() {
			@Override
			public void widgetSelected(SelectionEvent e) {
				super.widgetSelected(e);
		        Shell shell = getShell();
		        Point shellSize = shell.getSize();
		        Composite composite = buttonsComposite.getParent();
		        if (detailsContent != null) {
		        	detailsContent.dispose();
		        	detailsContent = null;
		            composite.layout();
		            shell.setSize(shellSize.x, shellSize.y -detailsHeight);
		            detailsButton.setText(ProgressMessages.ProgressMonitorJobsDialog_DetailsTitle);
		        } else {
		            //Abort if there are no jobs visible
		            /*if (ProgressManager.getInstance().getRootElements(Policy.DEBUG_SHOW_SYSTEM_JOBS).length == 0) {
		                detailsButton.setEnabled(false);
		                return;
		            }*/
		        	
		        	detailsContent = new Composite(detailsComposite, SWT.NONE|SWT.BORDER);
		        	//detailsContent.setBackground(getDisplay().getSystemColor(SWT.COLOR_WHITE));
		        	GridData detailsCData = new GridData();
		        	detailsCData.horizontalAlignment=SWT.FILL;
		        	detailsCData.grabExcessHorizontalSpace=true;
		        	//detailsCData.height=200;
		        	detailsContent.setLayoutData(detailsCData);
		        	detailsContent.setLayout(new RowLayout());
		        	createDetailsContent(detailsContent);
		        	/*Button b = new Button(detailsContent, SWT.NONE);
		        	b.setText("b");*/
		        	detailsComposite.layout(true);
		        	detailsContent.setVisible(true);
		        	detailsButton.setText(ProgressMessages.ProgressMonitorJobsDialog_HideTitle);
		        	//b.setVisible(true);
		        	composite.layout(true);
		        	Point p = detailsContent.getSize();
		        	detailsHeight = p.y;
		        	shell.setSize(shellSize.x, shellSize.y+detailsHeight);
		        	shell.pack();
			}
		}
		});
	}
	
	protected void createDetailsContent(Composite parent){
		
	}
	
	protected void createMainContent(Composite parent){
		
	}

	public Button getYesButton() {
		return yesButton;
	}
	
	public Button getNoButton() {
		return noButton;
	}
	
}

Index: DeleteConfirmDialogComposite.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/dialogs/DeleteConfirmDialogComposite.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DeleteConfirmDialogComposite.java	3 Jan 2006 17:57:59 -0000	1.9
--- DeleteConfirmDialogComposite.java	16 Apr 2006 21:45:38 -0000	1.10
***************
*** 7,15 ****
  import org.eclipse.jface.preference.IPreferenceStore;
  import org.eclipse.jface.resource.*;
- import org.eclipse.swt.*;
  import org.eclipse.swt.events.SelectionAdapter;
  import org.eclipse.swt.events.SelectionEvent;
  import org.eclipse.swt.graphics.*;
- import org.eclipse.swt.layout.*;
  import org.eclipse.swt.widgets.*;
  import org.eclipse.swt.SWT;
--- 7,13 ----
***************
*** 24,50 ****
   * @author sky_halud
   */
! public class DeleteConfirmDialogComposite extends Composite {
  
  	private Label label = null;
  	private Composite infoComposite = null;
  	private Composite listComposite = null;
! 	private Composite buttonsComposite = null;
! 	private Button removeFileButton = null;
! 	private Button yesButton = null;
! 	private Button noButton = null;
! 	private List deleteFileList = null;
! 	private Button moveToRecycle = null;
  	private Label trashLabel = null;
  
  	public DeleteConfirmDialogComposite(Composite parent, int style) {
  		super(parent, style);
- 		initialize();
- 	}
- 
- 	private void initialize() {
- 		createInfoComposite();
- 		createButtonsComposite();
- 		this.setLayout(new GridLayout());
- 		setSize(new org.eclipse.swt.graphics.Point(314, 172));
  	}
  	
--- 22,38 ----
   * @author sky_halud
   */
! public class DeleteConfirmDialogComposite extends CustomConfirmDialogComposite{
  
  	private Label label = null;
  	private Composite infoComposite = null;
  	private Composite listComposite = null;
! 	private List deleteFileList;
! 	private Button moveToRecycleButton = null;
  	private Label trashLabel = null;
+ 	private boolean moveToRecycle;
+ 	
  
  	public DeleteConfirmDialogComposite(Composite parent, int style) {
  		super(parent, style);
  	}
  	
***************
*** 61,68 ****
--- 49,58 ----
  		gridData1.verticalAlignment = org.eclipse.swt.layout.GridData.FILL;
  		gridData1.grabExcessVerticalSpace = true;
+ 		gridData1.heightHint=60;
  		gridData2.horizontalAlignment = org.eclipse.swt.layout.GridData.END;
  		gridData2.verticalAlignment = org.eclipse.swt.layout.GridData.BEGINNING;
  		GridLayout gridLayout = new GridLayout();
  		gridLayout.numColumns = 2;
+ 		gridLayout.marginWidth=0;
  		listComposite = new Composite(info, SWT.NONE);
  		listComposite.setLayoutData(gridData);
***************
*** 70,93 ****
  		deleteFileList = new List(listComposite, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
  		deleteFileList.setLayoutData(gridData1);
! 		removeFileButton = new Button(listComposite, SWT.NONE);		
! 		removeFileButton.setLayoutData(gridData2);
! 		removeFileButton.setText("&Remove");	
! 		
! 		removeFileButton.addSelectionListener(new SelectionAdapter() {
! 			public void widgetSelected(SelectionEvent e) {
! 				int [] indices = deleteFileList.getSelectionIndices();
! 				deleteFileList.remove(indices);
! 				
! 				if(deleteFileList.getItemCount() == 0) {
! 					/** Nothing to delete. Disabling controls */
! 					removeFileButton.setEnabled(false);
! 					yesButton.setEnabled(false);
! 					deleteFileList.setEnabled(false);
! 				}
! 			}
! 		});
  	}
  
! 	private void createInfoComposite() {
  		GridLayout gridLayout1 = new GridLayout();
  		gridLayout1.numColumns = 1;
--- 60,84 ----
  		deleteFileList = new List(listComposite, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
  		deleteFileList.setLayoutData(gridData1);
! //		removeFileButton = new Button(listComposite, SWT.NONE);		
! //		removeFileButton.setLayoutData(gridData2);
! //		removeFileButton.setText("&Remove");	
! //		
! //		removeFileButton.addSelectionListener(new SelectionAdapter() {
! //			public void widgetSelected(SelectionEvent e) {
! //				int [] indices = deleteFileList.getSelectionIndices();
! //				deleteFileList.remove(indices);
! //				
! //				if(deleteFileList.getItemCount() == 0) {
! //					/** Nothing to delete. Disabling controls */
! //					removeFileButton.setEnabled(false);
! //					yesButton.setEnabled(false);
! //					deleteFileList.setEnabled(false);
! //				}
! //			}
! //		});
  	}
  
! 	@Override
! 	protected void createMainContent(Composite parent) {
  		GridLayout gridLayout1 = new GridLayout();
  		gridLayout1.numColumns = 1;
***************
*** 95,103 ****
  		GridData gridData1 = new GridData();
  
! 		infoComposite = new Composite(this, SWT.NONE);
! 		gridData1.horizontalAlignment = org.eclipse.swt.layout.GridData.CENTER;
  		gridData1.grabExcessHorizontalSpace = true;
  		gridData1.grabExcessVerticalSpace = true;
! 		label = new Label(this, SWT.NONE);
  		label.setText("Delete selected files?");
  		label.setLayoutData(gridData1);
--- 86,96 ----
  		GridData gridData1 = new GridData();
  
! 		label = new Label(parent, SWT.NONE);
! 		
! 		infoComposite = new Composite(parent, SWT.NONE);
! 		//gridData1.horizontalAlignment = org.eclipse.swt.layout.GridData.CENTER;
  		gridData1.grabExcessHorizontalSpace = true;
  		gridData1.grabExcessVerticalSpace = true;
! 		
  		label.setText("Delete selected files?");
  		label.setLayoutData(gridData1);
***************
*** 105,111 ****
  		createListComposite(infoComposite);
  		
! 		Composite trashComposite = new Composite(infoComposite, SWT.NONE);
! 		trashComposite.setLayout(new RowLayout());
  		
  		trashLabel = new Label(trashComposite, SWT.NONE);
  		trashLabel.setText("");
--- 98,126 ----
  		createListComposite(infoComposite);
  		
! 		moveToRecycle = ((FilePanelPlugin.getDefault().getPreferenceStore()).
! 				getBoolean(FilePanelPlugin.MOVE_TO_RECYCLE_KEY));
! 		
! 		gridData2.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL;
! 		gridData2.verticalAlignment = org.eclipse.swt.layout.GridData.CENTER;
! 		gridData2.grabExcessHorizontalSpace = true;
! 		gridData2.grabExcessVerticalSpace = true;
! 		gridLayout1.marginWidth=0;
! 		infoComposite.setLayoutData(gridData2);
! 		infoComposite.setLayout(gridLayout1);
! 	}
! 	
! 	@Override
! 	protected void createDetailsContent(Composite parent) {
! 		//Button b = new Button(parent, SWT.NONE);
! 		Composite trashComposite = new Composite(parent, SWT.NONE);
! 		GridLayout trashLayout = new GridLayout();
  		
+ 		trashLayout.numColumns=2;
+ 		trashComposite.setLayout(trashLayout);
+ 		
+ 		GridData trashData1 = new GridData();
+ 		GridData trashData2 = new GridData();
+ 		trashData1.verticalAlignment=SWT.CENTER;
+ 		trashData2.verticalAlignment=SWT.CENTER;
  		trashLabel = new Label(trashComposite, SWT.NONE);
  		trashLabel.setText("");
***************
*** 113,130 ****
  		Image trashImg = imgDesc.createImage(getDisplay());
  		trashLabel.setImage(trashImg);
! 		
! 		moveToRecycle = new Button(trashComposite, SWT.CHECK);
  		if(Platform.getOS().equals(Platform.OS_WIN32)) {
! 			moveToRecycle.setText("&Move to the recycle bin");
! 			moveToRecycle.setToolTipText("Moved deleted files to the recycle bin");
  		}
  		else {
! 			moveToRecycle.setText("&Move to the trash");
! 			moveToRecycle.setToolTipText("Moved deleted files to the trash");
  		}
  					
! 		moveToRecycle.setSelection((FilePanelPlugin.getDefault().getPreferenceStore()).
! 											getBoolean(FilePanelPlugin.MOVE_TO_RECYCLE_KEY));
! 		moveToRecycle.
  						addSelectionListener(new SelectionAdapter() {
  							public void widgetSelected(SelectionEvent e) {
--- 128,145 ----
  		Image trashImg = imgDesc.createImage(getDisplay());
  		trashLabel.setImage(trashImg);
! 		trashLabel.setLayoutData(trashData1);
! 			
! 		moveToRecycleButton = new Button(trashComposite, SWT.CHECK);
  		if(Platform.getOS().equals(Platform.OS_WIN32)) {
! 			moveToRecycleButton.setText("&Move to the recycle bin");
! 			moveToRecycleButton.setToolTipText("Moved deleted files to the recycle bin");
  		}
  		else {
! 			moveToRecycleButton.setText("&Move to the trash");
! 			moveToRecycleButton.setToolTipText("Moved deleted files to the trash");
  		}
  					
! 		moveToRecycleButton.setSelection(moveToRecycle);
! 		moveToRecycleButton.
  						addSelectionListener(new SelectionAdapter() {
  							public void widgetSelected(SelectionEvent e) {
***************
*** 138,175 ****
  							}
  						});
! 		gridData2.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL;
! 		gridData2.verticalAlignment = org.eclipse.swt.layout.GridData.CENTER;
! 		gridData2.grabExcessHorizontalSpace = true;
! 		gridData2.grabExcessVerticalSpace = true;
! 		infoComposite.setLayoutData(gridData2);
! 		infoComposite.setLayout(gridLayout1);
! 	}
! 	/**
! 	 * This method initializes composite
! 	 */
! 	private void createButtonsComposite() {
! 		GridLayout gridLayout3 = new GridLayout();
! 		GridData gridData2 = new GridData();
! 		buttonsComposite = new Composite(this, SWT.NONE);
! 		yesButton = new Button(buttonsComposite, SWT.NONE);
! 		noButton = new Button(buttonsComposite, SWT.NONE);
! 		gridData2.grabExcessHorizontalSpace = true;
! 		gridData2.horizontalAlignment = org.eclipse.swt.layout.GridData.CENTER;
! 		gridData2.verticalAlignment = org.eclipse.swt.layout.GridData.END;
! 		buttonsComposite.setLayoutData(gridData2);
! 		buttonsComposite.setLayout(gridLayout3);
! 		gridLayout3.numColumns = 2;
! 		gridLayout3.marginHeight = 1;
! 		gridLayout3.marginWidth = 1;
! 		yesButton.setText("&Yes");
! 		noButton.setText("&No");
! 	}
! 
! 	public Button getNoButton() {
! 		return noButton;
! 	}
! 
! 	public Button getYesButton() {
! 		return yesButton;
  	}
  
--- 153,157 ----
  							}
  						});
! 		moveToRecycleButton.setLayoutData(trashData2);
  	}
  
***************
*** 179,187 ****
  	
  	private void toggleEnableMoveToRecycle(boolean value) {
! 		moveToRecycle.setEnabled(value);
  	}
  	
  	private void setMoveToRecycle(boolean value) {
! 		moveToRecycle.setSelection(value);
  	}
  	
--- 161,177 ----
  	
  	private void toggleEnableMoveToRecycle(boolean value) {
! 		if (moveToRecycleButton!=null)
! 		{
! 			moveToRecycleButton.setEnabled(value);
! 		}
  	}
  	
  	private void setMoveToRecycle(boolean value) {
! 		IPreferenceStore store = FilePanelPlugin.getDefault().getPreferenceStore();
! 		store.setValue(FilePanelPlugin.MOVE_TO_RECYCLE_KEY,value);
! 		if (moveToRecycleButton!=null)
! 		{
! 			moveToRecycleButton.setSelection(value);
! 		}
  	}
  	
***************
*** 192,196 ****
  	
  	public boolean getMoveToRecycle() {
! 		return moveToRecycle.getSelection();
  	}
  } //  @jve:decl-index=0:visual-constraint="10,10"
--- 182,186 ----
  	
  	public boolean getMoveToRecycle() {
! 		return moveToRecycle;
  	}
  } //  @jve:decl-index=0:visual-constraint="10,10"