jcommander-commit — User commit notifications

[Jcommander-commit] plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel FilePanelPlugin.java, 1.19, 1.20

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

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

Modified Files:
	FilePanelPlugin.java 
Log Message:
Implementation of featuer request [ 1518678 ]: Optionally hide hidden files

Index: FilePanelPlugin.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/FilePanelPlugin.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** FilePanelPlugin.java	8 Jul 2006 22:43:01 -0000	1.19
--- FilePanelPlugin.java	9 Jul 2006 12:41:06 -0000	1.20
***************
*** 66,69 ****
--- 66,71 ----
  	public static final String HIDE_RIGHT_PANEL = "HIDE_RIGHT_PANEL";
  	
+ 	public static final String HIDE_HIDDEN_FILES = "HIDE_HIDDEN_FILES";
+ 	
  	/**
  	 * The constructor.
***************
*** 139,142 ****
--- 141,146 ----
  		store.setDefault(AUTO_REFRESH_PANEL_CONTENTS, true);
  		store.setDefault(HIDE_RIGHT_PANEL, false);
+ 		store.setDefault(ADVANCED_AUTO_REFRESH, AUTO_REFRESH_AUTOMATIC);
+ 		store.setDefault(HIDE_HIDDEN_FILES, false);
  	}
  }

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

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

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

Modified Files:
	ViewFileAction.java 
Log Message:
now using getDisplayablePath

Index: ViewFileAction.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/actions/ViewFileAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ViewFileAction.java	8 Jul 2006 17:35:20 -0000	1.5
--- ViewFileAction.java	9 Jul 2006 11:15:40 -0000	1.6
***************
*** 17,20 ****
--- 17,21 ----
  //import org.jcommander.ui.fileviewer.*;
  import org.jcommander.ui.utils.EclipseBroker;
+ import org.jcommander.vfsextensions.VfsManagerExtension;
  
  public class ViewFileAction implements IWorkbenchWindowActionDelegate {
***************
*** 50,54 ****
  					.getCurrentFile();
  			
! 			LoggerPlugin.rootLogger.debug("Viewing file " + currentFile);
  			
  			// For now we use an external viewer
--- 51,55 ----
  					.getCurrentFile();
  			
! 			LoggerPlugin.rootLogger.debug("Viewing file " + VfsManagerExtension.getDisplayablePath(currentFile));
  			
  			// For now we use an external viewer

[Jcommander-commit] plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/preferences FilePanelPreferencesPage.java, 1.4, 1.5

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

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/preferences
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv25471/src/org/jcommander/ui/filepanel/preferences

Modified Files:
	FilePanelPreferencesPage.java 
Log Message:
Implementation of feature request [1369613]: Panel auto-refresh disabling option.

Index: FilePanelPreferencesPage.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/preferences/FilePanelPreferencesPage.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FilePanelPreferencesPage.java	16 Mar 2006 18:21:19 -0000	1.4
--- FilePanelPreferencesPage.java	8 Jul 2006 22:43:01 -0000	1.5
***************
*** 4,11 ****
--- 4,14 ----
  package org.jcommander.ui.filepanel.preferences;
  
+ import java.util.List;
+ 
  import org.eclipse.jface.preference.*;
  import org.eclipse.swt.*;
  import org.eclipse.ui.*;
  import org.jcommander.ui.filepanel.*;
+ import org.jcommander.ui.filepanel.controls.FileTab;
  import org.jcommander.ui.filepanel.model.FileControlModel;
  
***************
*** 49,54 ****
  		addField(showDirectoryTree);
  
  		BooleanFieldEditor autoRefreshPanelContents = new BooleanFieldEditor(FilePanelPlugin.AUTO_REFRESH_PANEL_CONTENTS, 
! 				"Set panels to be automatically refreshed in new tabs",
  				SWT.NONE,
  				getFieldEditorParent());
--- 52,66 ----
  		addField(showDirectoryTree);
  
+ 		RadioGroupFieldEditor advancedAutoRefresh = new RadioGroupFieldEditor(FilePanelPlugin.ADVANCED_AUTO_REFRESH, "Handling of auto refresh", 1,
+ 				new String[][] {
+ 				{"Automatic (on for local files, off for remote files)", FilePanelPlugin.AUTO_REFRESH_AUTOMATIC},
+ 				{"Manual (see below and on each FilePanel)", FilePanelPlugin.AUTO_REFRESH_MANUAL}
+ 			}, getFieldEditorParent(), true
+ 		);
+ 		
+ 		addField(advancedAutoRefresh);
+ 		
  		BooleanFieldEditor autoRefreshPanelContents = new BooleanFieldEditor(FilePanelPlugin.AUTO_REFRESH_PANEL_CONTENTS, 
! 				"Set panels to be automatically refreshed",
  				SWT.NONE,
  				getFieldEditorParent());
***************
*** 83,89 ****
  		FileControlModel.setShowExtNames(prefs.getBoolean(FilePanelPlugin.SHOW_EXT_NAMES));
  		
  		return true;
  	}
  
! 
  }
--- 95,129 ----
  		FileControlModel.setShowExtNames(prefs.getBoolean(FilePanelPlugin.SHOW_EXT_NAMES));
  		
+ 		List tabMediators = filePanelManager.getTabMediators();
+ 		
+ 		if (prefs.getString(FilePanelPlugin.ADVANCED_AUTO_REFRESH).equals(FilePanelPlugin.AUTO_REFRESH_MANUAL)) {
+ 			for(int i=0;i<tabMediators.size();i++) {
+ 				TabMediator crtMed = (TabMediator)tabMediators.get(i);
+ 				
+ 				FileTab crtFileTab = crtMed.getFileTab();
+ 				
+ 				crtFileTab.getLeftFilePanel().setAutoRefresh(prefs.getBoolean(FilePanelPlugin.AUTO_REFRESH_PANEL_CONTENTS));
+ 				crtFileTab.getLeftFilePanel().updateAutoRefreshMethod();
+ 				crtFileTab.getRightFilePanel().setAutoRefresh(prefs.getBoolean(FilePanelPlugin.AUTO_REFRESH_PANEL_CONTENTS));
+ 				crtFileTab.getRightFilePanel().updateAutoRefreshMethod();
+ 			}
+ 		}else {
+ 			for(int i=0;i<tabMediators.size();i++) {
+ 				TabMediator crtMed = (TabMediator)tabMediators.get(i);
+ 				
+ 				FileTab crtFileTab = crtMed.getFileTab();
+ 				
+ 				crtFileTab.getLeftFilePanel().updateAutoRefreshMethod();
+ 				crtFileTab.getRightFilePanel().updateAutoRefreshMethod();
+ 			}			
+ 		}
+ 		
  		return true;
  	}
  
! 	protected void performDefaults() {
! 		super.performDefaults();
! 		getPreferenceStore().setDefault(FilePanelPlugin.ADVANCED_AUTO_REFRESH, FilePanelPlugin.AUTO_REFRESH_AUTOMATIC);
! 	}
! 	
  }

[Jcommander-commit] plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls FilePanel.java, 1.65, 1.66 FilePanelMediator.java, 1.50, 1.51

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

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv25471/src/org/jcommander/ui/filepanel/controls

Modified Files:
	FilePanel.java FilePanelMediator.java 
Log Message:
Implementation of feature request [1369613]: Panel auto-refresh disabling option.

Index: FilePanelMediator.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls/FilePanelMediator.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** FilePanelMediator.java	15 May 2006 18:08:50 -0000	1.50
--- FilePanelMediator.java	8 Jul 2006 22:43:00 -0000	1.51
***************
*** 126,129 ****
--- 126,130 ----
  			// transfer the info to the model
  			model.setPreviousParent(previousParent);
+ 			updateFilePanelAutoRefresh(currentFile);
  			fileControl.changeToDirectory(currentFile);
  			
***************
*** 155,158 ****
--- 156,163 ----
  		filePanel.refresh();
  	}
+ 	
+ 	public void refreshConditioned() throws FileSystemException {
+ 		filePanel.refreshConditioned();
+ 	}
  
  	/**
***************
*** 344,346 ****
--- 349,369 ----
  						+ newName;
  	}
+ 	
+ 	public void updateAutoRefresh(){
+ 		if (FilePanelPlugin.getDefault().getPreferenceStore().getString(FilePanelPlugin.ADVANCED_AUTO_REFRESH).equals(FilePanelPlugin.AUTO_REFRESH_AUTOMATIC)){
+ 			updateFilePanelAutoRefresh(model.getCurrentParent());
+ 		}
+ 	}
+ 	
+ 	private void updateFilePanelAutoRefresh(FileObject File){
+ 		try {
+ 			String protocol = File.getURL().getProtocol();
+ 			if ((protocol.compareToIgnoreCase("sftp")==0)||(protocol.compareToIgnoreCase("ftp")==0)) {
+ 				filePanel.setAutoRefresh(false);
+ 			} else {
+ 				filePanel.setAutoRefresh(true);
+ 			}
+ 		} catch (FileSystemException e) {
+ 		}
+ 	}
  }

Index: FilePanel.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls/FilePanel.java,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** FilePanel.java	17 May 2006 11:19:05 -0000	1.65
--- FilePanel.java	8 Jul 2006 22:43:00 -0000	1.66
***************
*** 88,91 ****
--- 88,93 ----
  	private Button toggleAutoRefreshButton = null;
  	
+ 	private boolean autoRefresh;
+ 	
  	public FilePanel(FileControlModel model, FileTab fileTab, SashForm sashForm, int style) {
  		super(sashForm, style);
***************
*** 261,269 ****
  		Image refreshImg = refreshImgDesc.createImage(getDisplay());
  		
! 		// TODO Temporary until feature implemented
! 		toggleAutoRefreshButton.setSelection(true);
! 		toggleAutoRefreshButton.setEnabled(false);
  		
  		toggleAutoRefreshButton.setImage(refreshImg);
  		
  		partitionInfoLabel = new Label(partitionComposite, SWT.NONE);
--- 263,283 ----
  		Image refreshImg = refreshImgDesc.createImage(getDisplay());
  		
! 		setAutoRefresh(FilePanelPlugin.getDefault().getPreferenceStore().getBoolean(FilePanelPlugin.AUTO_REFRESH_PANEL_CONTENTS));
  		
  		toggleAutoRefreshButton.setImage(refreshImg);
+ 		toggleAutoRefreshButton.addSelectionListener(new SelectionListener() {
+ 		
+ 			public void widgetSelected(SelectionEvent e) {
+ 				autoRefresh = toggleAutoRefreshButton.getSelection();		
+ 			}
+ 		
+ 			public void widgetDefaultSelected(SelectionEvent e) {
+ 				// TODO Auto-generated method stub
+ 		
+ 			}
+ 		
+ 		});
+ 		
+ 		updateAutoRefreshMethod();
  		
  		partitionInfoLabel = new Label(partitionComposite, SWT.NONE);
***************
*** 590,593 ****
--- 604,618 ----
  	}
  	
+ 	/**
+ 	 * Refreshes the contents of this file panel.
+ 	 * @throws FileSystemException 
+ 	 */
+ 	public void refreshConditioned() throws FileSystemException {
+ 		if (autoRefresh) {
+ 			fileControl.doRefresh();
+ 			refreshPartitionInfo();
+ 		}
+ 	}
+ 	
  	public StatsPanel getStatsPanel() {
  		return statsPanel;	
***************
*** 822,824 ****
--- 847,869 ----
  		this.currentDirectoryLabel.setFocus();
  	}
+ 
+ 	public boolean isAutoRefresh() {
+ 		return autoRefresh;
+ 	}
+ 
+ 	public void setAutoRefresh(boolean autoRefresh) {
+ 		this.autoRefresh = autoRefresh;
+ 		toggleAutoRefreshButton.setSelection(autoRefresh);
+ 	}
+ 	
+ 	public void updateAutoRefreshMethod(){
+ 		String method = FilePanelPlugin.getDefault().getPreferenceStore().getString(FilePanelPlugin.ADVANCED_AUTO_REFRESH);
+ 		if (method.equals(FilePanelPlugin.AUTO_REFRESH_AUTOMATIC)) {
+ 			toggleAutoRefreshButton.setEnabled(false);
+ 		}
+ 		else {
+ 			toggleAutoRefreshButton.setEnabled(true);
+ 		}
+ 		panelMediator.updateAutoRefresh();
+ 	}
   }  //  @jve:decl-index=0:visual-constraint="10,10"

[Jcommander-commit] plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel FilePanelPlugin.java, 1.18, 1.19 TabMediator.java, 1.35, 1.36

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

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

Modified Files:
	FilePanelPlugin.java TabMediator.java 
Log Message:
Implementation of feature request [1369613]: Panel auto-refresh disabling option.

Index: TabMediator.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/TabMediator.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** TabMediator.java	5 Apr 2006 20:34:32 -0000	1.35
--- TabMediator.java	8 Jul 2006 22:43:01 -0000	1.36
***************
*** 233,236 ****
--- 233,246 ----
  		tab.getInactiveFilePanel().getPanelMediator().refresh();
  	}
+ 	
+ 	/**
+ 	 * Refreshes the contents of all contained file panels.
+ 	 * Each Panel refreshes only, if auto refreshing is not disabled
+ 	 * @throws FileSystemException 
+ 	 */
+ 	public void refreshAllConditioned() throws FileSystemException {
+ 		tab.getActiveFilePanel().getPanelMediator().refreshConditioned();
+ 		tab.getInactiveFilePanel().getPanelMediator().refreshConditioned();
+ 	}
  
  	public void setActiveFilePanel(FilePanel panel) {

Index: FilePanelPlugin.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/FilePanelPlugin.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** FilePanelPlugin.java	30 Apr 2006 13:10:55 -0000	1.18
--- FilePanelPlugin.java	8 Jul 2006 22:43:01 -0000	1.19
***************
*** 57,60 ****
--- 57,66 ----
  
  	public static final String AUTO_REFRESH_PANEL_CONTENTS = "AUTO_REFRESH_PANEL_CONTENTS";
+ 	
+ 	public static final String ADVANCED_AUTO_REFRESH = "ADVANCED_AUTO_REFRESH";
+ 	
+ 	public static final String AUTO_REFRESH_MANUAL = "AUTO_REFRESH_MANUAL";
+ 	
+ 	public static final String AUTO_REFRESH_AUTOMATIC = "AUTO_REFRESH_AUTOMATIC"; 
  
  	public static final String HIDE_RIGHT_PANEL = "HIDE_RIGHT_PANEL";

[Jcommander-commit] plugins/org.jcommander.ui.app/src/org/jcommander/ui/app JcmdManager.java, 1.31, 1.32

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

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

Modified Files:
	JcmdManager.java 
Log Message:
Implementation of feature request [1369613]: Panel auto-refresh disabling option.

Index: JcmdManager.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.app/src/org/jcommander/ui/app/JcmdManager.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** JcmdManager.java	6 Feb 2006 17:08:38 -0000	1.31
--- JcmdManager.java	8 Jul 2006 22:42:48 -0000	1.32
***************
*** 52,56 ****
  							activeTab.getFileTab()
  							.getTabMediator()
! 							.refreshAll();
  						} catch (FileSystemException ex) {
  							MessageDisplayer.displayException(ex);
--- 52,56 ----
  							activeTab.getFileTab()
  							.getTabMediator()
! 							.refreshAllConditioned();
  						} catch (FileSystemException ex) {
  							MessageDisplayer.displayException(ex);

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

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

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

Modified Files:
	SimpleOpenURLAction.java 
Log Message:
now using getDisplayablePath

Index: SimpleOpenURLAction.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/actions/SimpleOpenURLAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SimpleOpenURLAction.java	30 Apr 2006 13:10:55 -0000	1.7
--- SimpleOpenURLAction.java	8 Jul 2006 22:14:27 -0000	1.8
***************
*** 188,192 ****
  				
  				if(selectedDirectory.getType() == FileType.FOLDER) {
! 					LoggerPlugin.rootLogger.debug("Changing dir to: "+ selectedDirectory.getName().getRootURI() + selectedDirectory.getName().getPath());
  					
  					FilePanelManagerProvider.getTabManager()
--- 188,192 ----
  				
  				if(selectedDirectory.getType() == FileType.FOLDER) {
! 					LoggerPlugin.rootLogger.debug("Changing dir to: "+ VfsManagerExtension.getDisplayablePath(selectedDirectory));
  					
  					FilePanelManagerProvider.getTabManager()

[Jcommander-commit] plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers UiCopyListener.java, 1.13, 1.14

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

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

Modified Files:
	UiCopyListener.java 
Log Message:
now using getDisplayablePath

Index: UiCopyListener.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers/UiCopyListener.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** UiCopyListener.java	3 Jul 2006 22:10:10 -0000	1.13
--- UiCopyListener.java	8 Jul 2006 20:08:18 -0000	1.14
***************
*** 167,172 ****
  				EclipseBroker.getDisplay().syncExec(new Runnable() {
  					public void run() {
! 						UiCopyListener.this.performer.progressDialogComposite.getFromLabel().setText(sourceFile.getName().getRootURI() + sourceFile.getName().getPath());
! 	                          UiCopyListener.this.performer.progressDialogComposite.getToLabel().setText(targetFile.getName().getRootURI() + targetFile.getName().getPath());
  
  						// TODO what if overflow occurs when converting from long to int?
--- 167,172 ----
  				EclipseBroker.getDisplay().syncExec(new Runnable() {
  					public void run() {
! 						UiCopyListener.this.performer.progressDialogComposite.getFromLabel().setText(VfsManagerExtension.getDisplayablePath(sourceFile));
! 	                          UiCopyListener.this.performer.progressDialogComposite.getToLabel().setText(VfsManagerExtension.getDisplayablePath(targetFile));
  
  						// TODO what if overflow occurs when converting from long to int?

[Jcommander-commit] plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/actions OpenUrlAction.java, 1.8, 1.9

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

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

Modified Files:
	OpenUrlAction.java 
Log Message:
now using getDisplayablePath

Index: OpenUrlAction.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/actions/OpenUrlAction.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** OpenUrlAction.java	18 May 2006 10:21:26 -0000	1.8
--- OpenUrlAction.java	8 Jul 2006 20:03:43 -0000	1.9
***************
*** 93,97 ****
  			
  			if(selectedDirectory.getType() == FileType.FOLDER) {
! 				LoggerPlugin.rootLogger.debug("Changing dir to: "+ selectedDirectory.getName().getRootURI() + selectedDirectory.getName().getPath());
  
  				openUrlShell.dispose();
--- 93,97 ----
  			
  			if(selectedDirectory.getType() == FileType.FOLDER) {
! 				LoggerPlugin.rootLogger.debug("Changing dir to: "+ VfsManagerExtension.getDisplayablePath(selectedDirectory));
  
  				openUrlShell.dispose();

[Jcommander-commit] plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/actions OpenLocationAction.java, 1.7, 1.8

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

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

Modified Files:
	OpenLocationAction.java 
Log Message:
now using getDisplayablePath

Index: OpenLocationAction.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/actions/OpenLocationAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** OpenLocationAction.java	20 Mar 2006 05:49:24 -0000	1.7
--- OpenLocationAction.java	8 Jul 2006 20:02:18 -0000	1.8
***************
*** 50,54 ****
  				
  				if(selectedDirectory.getType() == FileType.FOLDER) {
! 					LoggerPlugin.rootLogger.debug("Changing dir to: "+ selectedDirectory.getName().getRootURI() + selectedDirectory.getName().getPath());
  					
  					FilePanelManagerProvider.getTabManager()
--- 50,54 ----
  				
  				if(selectedDirectory.getType() == FileType.FOLDER) {
! 					LoggerPlugin.rootLogger.debug("Changing dir to: "+ VfsManagerExtension.getDisplayablePath(selectedDirectory));
  					
  					FilePanelManagerProvider.getTabManager()

[Jcommander-commit] plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/actions ViewFileAction.java, 1.4, 1.5

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

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

Modified Files:
	ViewFileAction.java 
Log Message:
- [Feature Requests-1105827]: First implementation of simple build in editor, currently capable of highlighting html and xml
- removed compare perspective, now using edit instead
- All Editors can be closed with Esc

Index: ViewFileAction.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/actions/ViewFileAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ViewFileAction.java	20 Feb 2006 21:15:58 -0000	1.4
--- ViewFileAction.java	8 Jul 2006 17:35:20 -0000	1.5
***************
*** 4,18 ****
  package org.jcommander.ui.filepanel.actions;
  
  import org.apache.commons.vfs.*;
  import org.eclipse.jface.action.*;
  import org.eclipse.jface.viewers.*;
  import org.eclipse.ui.*;
! import org.jcommander.ui.externaltools.*;
  import org.jcommander.ui.filepanel.*;
  import org.jcommander.ui.logger.*;
  //import org.jcommander.ui.fileviewer.*;
  
  public class ViewFileAction implements IWorkbenchWindowActionDelegate {
  
  	public void dispose() {
  		// TODO Auto-generated method stub
--- 4,30 ----
  package org.jcommander.ui.filepanel.actions;
  
+ import java.text.MessageFormat;
+ 
  import org.apache.commons.vfs.*;
  import org.eclipse.jface.action.*;
+ import org.eclipse.jface.dialogs.MessageDialog;
  import org.eclipse.jface.viewers.*;
  import org.eclipse.ui.*;
! import org.jcommander.ui.editor.EditorPlugin;
! import org.jcommander.ui.editor.JCmdEditorInput;
  import org.jcommander.ui.filepanel.*;
  import org.jcommander.ui.logger.*;
  //import org.jcommander.ui.fileviewer.*;
+ import org.jcommander.ui.utils.EclipseBroker;
  
  public class ViewFileAction implements IWorkbenchWindowActionDelegate {
  
+ 	
+ 	private IWorkbenchPage workbenchPage;
+ 	
+ 	private IWorkbenchWindow fWindow;
+ 	public static final String COMPARE_PERSPECTIVE_ID = "org.jcommander.compare.Compare";
+ 		
+ 	
  	public void dispose() {
  		// TODO Auto-generated method stub
***************
*** 21,25 ****
  
  	public void init(IWorkbenchWindow window) {
! 		// TODO Auto-generated method stub
  
  	}
--- 33,37 ----
  
  	public void init(IWorkbenchWindow window) {
! 		fWindow= window;
  
  	}
***************
*** 41,45 ****
  			
  			// For now we use an external viewer
! 			ExternaltoolsPlugin.getDefault().viewFile(currentFile);
  			
  			//FileViewerPlugin.getDefault().test();
--- 53,114 ----
  			
  			// For now we use an external viewer
! 			//ExternaltoolsPlugin.getDefault().viewFile(currentFile);
! 			
! 			if (currentFile != null) {
! 				try{
! 					workbenchPage = PlatformUI.getWorkbench().showPerspective(EditorPlugin.EDIT_PERSPECTIVE_ID, EclipseBroker.getWorkbenchWindow());
! 					} catch (WorkbenchException e) {
! 						LoggerPlugin.rootLogger.error(e,e);
! 					}
! 				
! 				IEditorInput input= new JCmdEditorInput(currentFile);
! 				String editorId= getEditorId(currentFile);
! 				IWorkbenchPage page= fWindow.getActivePage();
! 		        workbenchPage.addPartListener(new IPartListener() {
! 					
! 					public void partOpened(IWorkbenchPart part) {
! 						// TODO Auto-generated method stub
! 				
! 					}
! 				
! 					public void partDeactivated(IWorkbenchPart part) {
! 						// TODO Auto-generated method stub
! 				
! 					}
! 				
! 					public void partClosed(IWorkbenchPart part) {
! 						if (workbenchPage.getEditorReferences().length==0) {
! 							try {
! 								workbenchPage.removePartListener(this);
! 								PlatformUI.getWorkbench().showPerspective("org.jcommander.ui.app.JCmdPerspective", EclipseBroker.getWorkbenchWindow());
! 							} catch (WorkbenchException e) {
! 								// TODO Auto-generated catch block
! 								e.printStackTrace();
! 							}						
! 						}
! 				
! 					}
! 				
! 					public void partBroughtToTop(IWorkbenchPart part) {
! 						// TODO Auto-generated method stub
! 				
! 					}
! 				
! 					public void partActivated(IWorkbenchPart part) {
! 						// TODO Auto-generated method stub
! 				
! 					}
! 				
! 				});
! 		        
! 				try {
! 					page.openEditor(input, editorId);
! 				} catch (PartInitException e) {
! 					e.printStackTrace();
! 				}
! 			} else if (currentFile != null) {
! 				String msg = MessageFormat.format("File is null: {0}", new String[] {currentFile.getName().getBaseName()}); //$NON-NLS-1$
! 				MessageDialog.openWarning(fWindow.getShell(), "Problem", msg); //$NON-NLS-1$
! 			}			
  			
  			//FileViewerPlugin.getDefault().test();
***************
*** 48,51 ****
--- 117,129 ----
  		}
  	}
+ 	
+ 	private String getEditorId(FileObject file) {
+ 		IWorkbench workbench= fWindow.getWorkbench();
+ 		IEditorRegistry editorRegistry= workbench.getEditorRegistry();
+ 		IEditorDescriptor descriptor= editorRegistry.getDefaultEditor(file.getName().getBaseName());
+ 		if (descriptor != null)
+ 			return descriptor.getId();
+ 		return "org.jcommander.ui.editor.JCmdEditor"; //$NON-NLS-1$
+ 	}	
  
  	public void selectionChanged(IAction action, ISelection selection) {

[Jcommander-commit] plugins/org.jcommander.ui.filepanel plugin.xml, 1.39, 1.40

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

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv3108

Modified Files:
	plugin.xml 
Log Message:
- [Feature Requests-1105827]: First implementation of simple build in editor, currently capable of highlighting html and xml
- removed compare perspective, now using edit instead
- All Editors can be closed with Esc

Index: plugin.xml
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/plugin.xml,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** plugin.xml	28 Mar 2006 17:16:40 -0000	1.39
--- plugin.xml	8 Jul 2006 17:35:20 -0000	1.40
***************
*** 26,29 ****
--- 26,30 ----
        <import plugin="org.jcommander.eclipsepatch.compare"/>
        <import plugin="org.jcommander.ui.compare"/>
+       <import plugin="org.jcommander.ui.editor"/>
     </requires>
     <extension-point id="FilePanelManager" name="A manager for file tabs." schema="schema/FilePanelManager.exsd"/>

[Jcommander-commit] plugins/org.jcommander.ui.compare/src/org/jcommander/compare/perspective ComparePerspectiveFactory.java, 1.1, NONE

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

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

Removed Files:
	ComparePerspectiveFactory.java 
Log Message:
- [Feature Requests-1105827]: First implementation of simple build in editor, currently capable of highlighting html and xml
- removed compare perspective, now using edit instead
- All Editors can be closed with Esc

--- ComparePerspectiveFactory.java DELETED ---

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

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

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

Modified Files:
	MANIFEST.MF 
Log Message:
- [Feature Requests-1105827]: First implementation of simple build in editor, currently capable of highlighting html and xml
- removed compare perspective, now using edit instead
- All Editors can be closed with Esc

Index: MANIFEST.MF
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.compare/META-INF/MANIFEST.MF,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MANIFEST.MF	25 Apr 2006 09:27:43 -0000	1.4
--- MANIFEST.MF	8 Jul 2006 17:35:15 -0000	1.5
***************
*** 12,18 ****
   org.jcommander.ui.utils,
   org.jcommander.vfsextensions,
!  org.apache.log4j
  Eclipse-LazyStart: true
  Export-Package: org.jcommander.compare,
-  org.jcommander.compare.perspective,
   org.jcommander.compare.preferences
--- 12,19 ----
   org.jcommander.ui.utils,
   org.jcommander.vfsextensions,
!  org.apache.log4j,
!  org.eclipse.jface.text,
!  org.jcommander.ui.editor
  Eclipse-LazyStart: true
  Export-Package: org.jcommander.compare,
   org.jcommander.compare.preferences

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

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

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

Modified Files:
	ComparePlugin.java 
Log Message:
- [Feature Requests-1105827]: First implementation of simple build in editor, currently capable of highlighting html and xml
- removed compare perspective, now using edit instead
- All Editors can be closed with Esc

Index: ComparePlugin.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.compare/src/org/jcommander/compare/ComparePlugin.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ComparePlugin.java	27 Jun 2006 18:46:45 -0000	1.6
--- ComparePlugin.java	8 Jul 2006 17:35:14 -0000	1.7
***************
*** 27,30 ****
--- 27,31 ----
  import org.eclipse.core.runtime.IProgressMonitor;
  import org.eclipse.jface.resource.ImageDescriptor;
+ import org.jcommander.ui.editor.EditorPlugin;
  import org.jcommander.ui.utils.EclipseBroker;
  import org.jcommander.ui.utils.ImageBroker;
***************
*** 44,49 ****
  	protected static Logger logger = Logger.getLogger(AbstractUIPlugin.class);
  	
- 	public static final String COMPARE_PERSPECTIVE_ID = "org.jcommander.compare.Compare";
- 	
  	private IWorkbenchPage workbenchPage;
  	
--- 45,48 ----
***************
*** 316,320 ****
  		
  		try{
! 			workbenchPage = PlatformUI.getWorkbench().showPerspective(COMPARE_PERSPECTIVE_ID, EclipseBroker.getWorkbenchWindow());
  			} catch (WorkbenchException e) {
  				logger.error(e,e);
--- 315,319 ----
  		
  		try{
! 			workbenchPage = PlatformUI.getWorkbench().showPerspective(EditorPlugin.EDIT_PERSPECTIVE_ID, EclipseBroker.getWorkbenchWindow());
  			} catch (WorkbenchException e) {
  				logger.error(e,e);

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

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

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

Modified Files:
	plugin.xml 
Log Message:
- [Feature Requests-1105827]: First implementation of simple build in editor, currently capable of highlighting html and xml
- removed compare perspective, now using edit instead
- All Editors can be closed with Esc

Index: plugin.xml
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.compare/plugin.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** plugin.xml	28 Mar 2006 13:54:49 -0000	1.1
--- plugin.xml	8 Jul 2006 17:35:15 -0000	1.2
***************
*** 17,28 ****
        </initializer>
     </extension>
-    <extension
-    		 point="org.eclipse.ui.perspectives">
-          <perspective
-          id="org.jcommander.compare.Compare"
-          class="org.jcommander.compare.perspective.ComparePerspectiveFactory"
-          name="Compare"
-           />
-    </extension>
  
  </plugin>
--- 17,20 ----

[Jcommander-commit] plugins/org.jcommander.ui.editor/src/org/jcommander/ui/editor/actions CloseAction.java, NONE, 1.1 SampleAction.java, 1.1, NONE

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

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.editor/src/org/jcommander/ui/editor/actions
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv2671/src/org/jcommander/ui/editor/actions

Added Files:
	CloseAction.java 
Removed Files:
	SampleAction.java 
Log Message:
- [Feature Requests-1105827]: First implementation of simple build in editor, currently capable of highlighting html and xml
- removed compare perspective, now using edit instead
- All Editors can be closed with Esc

--- NEW FILE: CloseAction.java ---
package org.jcommander.ui.editor.actions;

import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.IWorkbenchWindowActionDelegate;
import org.eclipse.ui.PlatformUI;

/**
 * Our sample action implements workbench action delegate.
 * The action proxy will be created by the workbench and
 * shown in the UI. When the user tries to use the action,
 * this delegate will be created and execution will be 
 * delegated to it.
 * @see IWorkbenchWindowActionDelegate
 */
public class CloseAction implements IWorkbenchWindowActionDelegate {
	/**
	 * The constructor.
	 */
	public CloseAction() {
	}

	/**
	 * The action has been activated. The argument of the
	 * method represents the 'real' action sitting
	 * in the workbench UI.
	 * @see IWorkbenchWindowActionDelegate#run
	 */
	public void run(IAction action) {
		IWorkbenchPage page =PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
		page.closeEditor(page.getActiveEditor(), false);
//		MessageDialog.openInformation(
//			window.getShell(),
//			"JCommander Editor Plug-in",
//			"Hello, Eclipse world");
	}

	/**
	 * Selection in the workbench has been changed. We 
	 * can change the state of the 'real' action here
	 * if we want, but this can only happen after 
	 * the delegate has been created.
	 * @see IWorkbenchWindowActionDelegate#selectionChanged
	 */
	public void selectionChanged(IAction action, ISelection selection) {
	}

	/**
	 * We can use this method to dispose of any system
	 * resources we previously allocated.
	 * @see IWorkbenchWindowActionDelegate#dispose
	 */
	public void dispose() {
	}

	/**
	 * We will cache window object in order to
	 * be able to provide parent shell for the message dialog.
	 * @see IWorkbenchWindowActionDelegate#init
	 */
	public void init(IWorkbenchWindow window) {
		
	}
}
--- SampleAction.java DELETED ---

[Jcommander-commit] plugins/org.jcommander.ui.editor/src/org/jcommander/ui/editor/xml IXMLColorConstants.java, NONE, 1.1 XMLEditor.java, NONE, 1.1 ColorManager.java, NONE, 1.1 XMLDocumentProvider.java, NONE, 1.1 XMLScanner.java, NONE, 1.1 XMLTagScanner.java, NONE, 1.1 TagRule.java, NONE, 1.1 XMLConfiguration.java, NONE, 1.1 XMLDoubleClickStrategy.java, NONE, 1.1 XMLPartitionScanner.java, NONE, 1.1 NonRuleBasedDamagerRepairer.java, NONE, 1.1 XMLWhitespaceDetector.java, NONE, 1.1

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

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.editor/src/org/jcommander/ui/editor/xml
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv2671/src/org/jcommander/ui/editor/xml

Added Files:
	IXMLColorConstants.java XMLEditor.java ColorManager.java 
	XMLDocumentProvider.java XMLScanner.java XMLTagScanner.java 
	TagRule.java XMLConfiguration.java XMLDoubleClickStrategy.java 
	XMLPartitionScanner.java NonRuleBasedDamagerRepairer.java 
	XMLWhitespaceDetector.java 
Log Message:
- [Feature Requests-1105827]: First implementation of simple build in editor, currently capable of highlighting html and xml
- removed compare perspective, now using edit instead
- All Editors can be closed with Esc

--- NEW FILE: ColorManager.java ---
package org.jcommander.ui.editor.xml;

import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;

import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.RGB;
import org.eclipse.swt.widgets.Display;

class ColorManager {

	protected Map fColorTable = new HashMap(10);

	public void dispose() {
		Iterator e = fColorTable.values().iterator();
		while (e.hasNext())
			 ((Color) e.next()).dispose();
	}
	public Color getColor(RGB rgb) {
		Color color = (Color) fColorTable.get(rgb);
		if (color == null) {
			color = new Color(Display.getCurrent(), rgb);
			fColorTable.put(rgb, color);
		}
		return color;
	}
}

--- NEW FILE: XMLDocumentProvider.java ---
package org.jcommander.ui.editor.xml;

import org.eclipse.core.runtime.CoreException;

import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IDocumentPartitioner;
import org.eclipse.jface.text.rules.FastPartitioner;
import org.eclipse.jface.text.source.IAnnotationModel;

import org.jcommander.ui.editor.JCmdDocumentProvider;

public class XMLDocumentProvider extends JCmdDocumentProvider {

	protected void setupDocument(IDocument document) {
		if (document != null) {
			IDocumentPartitioner partitioner =
				new FastPartitioner(
					new XMLPartitionScanner(),
					new String[] {
						XMLPartitionScanner.XML_TAG,
						XMLPartitionScanner.XML_COMMENT });
			partitioner.connect(document);
			document.setDocumentPartitioner(partitioner);
		}
	}

	protected IAnnotationModel createAnnotationModel(Object element) throws CoreException {
		return null;
	}
}
--- NEW FILE: XMLDoubleClickStrategy.java ---
package org.jcommander.ui.editor.xml;

import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.ITextDoubleClickStrategy;
import org.eclipse.jface.text.ITextViewer;


public class XMLDoubleClickStrategy implements ITextDoubleClickStrategy {
	protected ITextViewer fText;

	public void doubleClicked(ITextViewer part) {
		int pos = part.getSelectedRange().x;

		if (pos < 0)
			return;

		fText = part;

		if (!selectComment(pos)) {
			selectWord(pos);
		}
	}
	protected boolean selectComment(int caretPos) {
		IDocument doc = fText.getDocument();
		int startPos, endPos;

		try {
			int pos = caretPos;
			char c = ' ';

			while (pos >= 0) {
				c = doc.getChar(pos);
				if (c == '\\') {
					pos -= 2;
					continue;
				}
				if (c == Character.LINE_SEPARATOR || c == '\"')
					break;
				--pos;
			}

			if (c != '\"')
				return false;

			startPos = pos;

			pos = caretPos;
			int length = doc.getLength();
			c = ' ';

			while (pos < length) {
				c = doc.getChar(pos);
				if (c == Character.LINE_SEPARATOR || c == '\"')
					break;
				++pos;
			}
			if (c != '\"')
				return false;

			endPos = pos;

			int offset = startPos + 1;
			int len = endPos - offset;
			fText.setSelectedRange(offset, len);
			return true;
		} catch (BadLocationException x) {
		}

		return false;
	}
	protected boolean selectWord(int caretPos) {

		IDocument doc = fText.getDocument();
		int startPos, endPos;

		try {

			int pos = caretPos;
			char c;

			while (pos >= 0) {
				c = doc.getChar(pos);
				if (!Character.isJavaIdentifierPart(c))
					break;
				--pos;
			}

			startPos = pos;

			pos = caretPos;
			int length = doc.getLength();

			while (pos < length) {
				c = doc.getChar(pos);
				if (!Character.isJavaIdentifierPart(c))
					break;
				++pos;
			}

			endPos = pos;
			selectRange(startPos, endPos);
			return true;

		} catch (BadLocationException x) {
		}

		return false;
	}

	private void selectRange(int startPos, int stopPos) {
		int offset = startPos + 1;
		int length = stopPos - offset;
		fText.setSelectedRange(offset, length);
	}
}
--- NEW FILE: XMLConfiguration.java ---
package org.jcommander.ui.editor.xml;

import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.ITextDoubleClickStrategy;
import org.eclipse.jface.text.TextAttribute;
import org.eclipse.jface.text.presentation.IPresentationReconciler;
import org.eclipse.jface.text.presentation.PresentationReconciler;
import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
import org.eclipse.jface.text.rules.Token;
import org.eclipse.jface.text.source.ISourceViewer;
import org.eclipse.jface.text.source.SourceViewerConfiguration;


public class XMLConfiguration extends SourceViewerConfiguration {
	private XMLDoubleClickStrategy doubleClickStrategy;
	private XMLTagScanner tagScanner;
	private XMLScanner scanner;
	private ColorManager colorManager;

	public XMLConfiguration(ColorManager colorManager) {
		this.colorManager = colorManager;
	}
	public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
		return new String[] {
			IDocument.DEFAULT_CONTENT_TYPE,
			XMLPartitionScanner.XML_COMMENT,
			XMLPartitionScanner.XML_TAG };
	}
	public ITextDoubleClickStrategy getDoubleClickStrategy(
		ISourceViewer sourceViewer,
		String contentType) {
		if (doubleClickStrategy == null)
			doubleClickStrategy = new XMLDoubleClickStrategy();
		return doubleClickStrategy;
	}

	protected XMLScanner getXMLScanner() {
		if (scanner == null) {
			scanner = new XMLScanner(colorManager);
			scanner.setDefaultReturnToken(
				new Token(
					new TextAttribute(
						colorManager.getColor(IXMLColorConstants.DEFAULT))));
		}
		return scanner;
	}
	protected XMLTagScanner getXMLTagScanner() {
		if (tagScanner == null) {
			tagScanner = new XMLTagScanner(colorManager);
			tagScanner.setDefaultReturnToken(
				new Token(
					new TextAttribute(
						colorManager.getColor(IXMLColorConstants.TAG))));
		}
		return tagScanner;
	}

	public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) {
		PresentationReconciler reconciler = new PresentationReconciler();

		DefaultDamagerRepairer dr =
			new DefaultDamagerRepairer(getXMLTagScanner());
		reconciler.setDamager(dr, XMLPartitionScanner.XML_TAG);
		reconciler.setRepairer(dr, XMLPartitionScanner.XML_TAG);

		dr = new DefaultDamagerRepairer(getXMLScanner());
		reconciler.setDamager(dr, IDocument.DEFAULT_CONTENT_TYPE);
		reconciler.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE);

		NonRuleBasedDamagerRepairer ndr =
			new NonRuleBasedDamagerRepairer(
				new TextAttribute(
					colorManager.getColor(IXMLColorConstants.XML_COMMENT)));
		reconciler.setDamager(ndr, XMLPartitionScanner.XML_COMMENT);
		reconciler.setRepairer(ndr, XMLPartitionScanner.XML_COMMENT);

		return reconciler;
	}

}
--- NEW FILE: IXMLColorConstants.java ---
package org.jcommander.ui.editor.xml;

import org.eclipse.swt.graphics.RGB;

public interface IXMLColorConstants {
	RGB XML_COMMENT = new RGB(128, 0, 0);
	RGB PROC_INSTR = new RGB(128, 128, 128);
	RGB STRING = new RGB(0, 128, 0);
	RGB DEFAULT = new RGB(0, 0, 0);
	RGB TAG = new RGB(0, 0, 128);
}

--- NEW FILE: XMLPartitionScanner.java ---
package org.jcommander.ui.editor.xml;

import org.eclipse.jface.text.rules.IPredicateRule;
import org.eclipse.jface.text.rules.IToken;
import org.eclipse.jface.text.rules.MultiLineRule;
import org.eclipse.jface.text.rules.RuleBasedPartitionScanner;
import org.eclipse.jface.text.rules.Token;



public class XMLPartitionScanner extends RuleBasedPartitionScanner {
	public final static String XML_DEFAULT = "__xml_default"; //$NON-NLS-1$
	public final static String XML_COMMENT = "__xml_comment"; //$NON-NLS-1$
	public final static String XML_TAG = "__xml_tag"; //$NON-NLS-1$

	public XMLPartitionScanner() {

		IToken xmlComment = new Token(XML_COMMENT);
		IToken tag = new Token(XML_TAG);

		IPredicateRule[] rules = new IPredicateRule[2];

		rules[0] = new MultiLineRule("<!--", "-->", xmlComment);  //$NON-NLS-1$//$NON-NLS-2$
		rules[1] = new TagRule(tag);

		setPredicateRules(rules);
	}
}

--- NEW FILE: TagRule.java ---
package org.jcommander.ui.editor.xml;

import org.eclipse.jface.text.rules.ICharacterScanner;
import org.eclipse.jface.text.rules.IToken;
import org.eclipse.jface.text.rules.MultiLineRule;


public class TagRule extends MultiLineRule {

	public TagRule(IToken token) {
		super("<", ">", token);  //$NON-NLS-1$//$NON-NLS-2$
	}
	protected boolean sequenceDetected(
		ICharacterScanner scanner,
		char[] sequence,
		boolean eofAllowed) {
		int c = scanner.read();
		if (sequence[0] == '<') {
			if (c == '?') {
				// processing instruction - abort
				scanner.unread();
				return false;
			}
			if (c == '!') {
				scanner.unread();
				// comment - abort
				return false;
			}
		} else if (sequence[0] == '>') {
			scanner.unread();
		}
		return super.sequenceDetected(scanner, sequence, eofAllowed);
	}
}

--- NEW FILE: XMLEditor.java ---
package org.jcommander.ui.editor.xml;

import org.jcommander.ui.editor.JCmdEditor;


public class XMLEditor extends JCmdEditor {

	private ColorManager colorManager;

	protected void internal_init() {
		configureInsertMode(SMART_INSERT, false);
		colorManager = new ColorManager();
		setSourceViewerConfiguration(new XMLConfiguration(colorManager));
		setDocumentProvider(new XMLDocumentProvider());
	}
	
	public void dispose() {
		colorManager.dispose();
		super.dispose();
	}
}

--- NEW FILE: NonRuleBasedDamagerRepairer.java ---
package org.jcommander.ui.editor.xml;

import org.eclipse.swt.custom.StyleRange;

import org.eclipse.jface.util.Assert;

import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.DocumentEvent;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.ITypedRegion;
import org.eclipse.jface.text.Region;
import org.eclipse.jface.text.TextAttribute;
import org.eclipse.jface.text.TextPresentation;
import org.eclipse.jface.text.presentation.IPresentationDamager;
import org.eclipse.jface.text.presentation.IPresentationRepairer;

public class NonRuleBasedDamagerRepairer
	implements IPresentationDamager, IPresentationRepairer {

	/** The document this object works on */
	protected IDocument fDocument;
	/** The default text attribute if non is returned as data by the current token */
	protected TextAttribute fDefaultTextAttribute;
	
	/**
	 * Constructor for NonRuleBasedDamagerRepairer.
	 * @param defaultTextAttribute
	 */
	public NonRuleBasedDamagerRepairer(TextAttribute defaultTextAttribute) {
		Assert.isNotNull(defaultTextAttribute);

		fDefaultTextAttribute = defaultTextAttribute;
	}

	/**
	 * @see IPresentationRepairer#setDocument(IDocument)
	 */
	public void setDocument(IDocument document) {
		fDocument = document;
	}

	/**
	 * Returns the end offset of the line that contains the specified offset or
	 * if the offset is inside a line delimiter, the end offset of the next line.
	 *
	 * @param offset the offset whose line end offset must be computed
	 * @return the line end offset for the given offset
	 * @exception BadLocationException if offset is invalid in the current document
	 */
	protected int endOfLineOf(int offset) throws BadLocationException {

		IRegion info = fDocument.getLineInformationOfOffset(offset);
		if (offset <= info.getOffset() + info.getLength())
			return info.getOffset() + info.getLength();

		int line = fDocument.getLineOfOffset(offset);
		try {
			info = fDocument.getLineInformation(line + 1);
			return info.getOffset() + info.getLength();
		} catch (BadLocationException x) {
			return fDocument.getLength();
		}
	}

	/**
	 * @see IPresentationDamager#getDamageRegion(ITypedRegion, DocumentEvent, boolean)
	 */
	public IRegion getDamageRegion(
		ITypedRegion partition,
		DocumentEvent event,
		boolean documentPartitioningChanged) {
		if (!documentPartitioningChanged) {
			try {

				IRegion info =
					fDocument.getLineInformationOfOffset(event.getOffset());
				int start = Math.max(partition.getOffset(), info.getOffset());

				int end =
					event.getOffset()
						+ (event.getText() == null
							? event.getLength()
							: event.getText().length());

				if (info.getOffset() <= end
					&& end <= info.getOffset() + info.getLength()) {
					// optimize the case of the same line
					end = info.getOffset() + info.getLength();
				} else
					end = endOfLineOf(end);

				end =
					Math.min(
						partition.getOffset() + partition.getLength(),
						end);
				return new Region(start, end - start);

			} catch (BadLocationException x) {
			}
		}

		return partition;
	}

	/**
	 * @see IPresentationRepairer#createPresentation(TextPresentation, ITypedRegion)
	 */
	public void createPresentation(
		TextPresentation presentation,
		ITypedRegion region) {
		addRange(
			presentation,
			region.getOffset(),
			region.getLength(),
			fDefaultTextAttribute);
	}

	/**
	 * Adds style information to the given text presentation.
	 *
	 * @param presentation the text presentation to be extended
	 * @param offset the offset of the range to be styled
	 * @param length the length of the range to be styled
	 * @param attr the attribute describing the style of the range to be styled
	 */
	protected void addRange(
		TextPresentation presentation,
		int offset,
		int length,
		TextAttribute attr) {
		if (attr != null)
			presentation.addStyleRange(
				new StyleRange(
					offset,
					length,
					attr.getForeground(),
					attr.getBackground(),
					attr.getStyle()));
	}
}
--- NEW FILE: XMLWhitespaceDetector.java ---
package org.jcommander.ui.editor.xml;

import org.eclipse.jface.text.rules.IWhitespaceDetector;


public class XMLWhitespaceDetector implements IWhitespaceDetector {

	public boolean isWhitespace(char c) {
		return (c == ' ' || c == '\t' || c == '\n' || c == '\r');
	}
}

--- NEW FILE: XMLScanner.java ---
package org.jcommander.ui.editor.xml;

import org.eclipse.jface.text.TextAttribute;
import org.eclipse.jface.text.rules.IRule;
import org.eclipse.jface.text.rules.IToken;
import org.eclipse.jface.text.rules.RuleBasedScanner;
import org.eclipse.jface.text.rules.SingleLineRule;
import org.eclipse.jface.text.rules.Token;
import org.eclipse.jface.text.rules.WhitespaceRule;


public class XMLScanner extends RuleBasedScanner {

	public XMLScanner(ColorManager manager) {
		IToken procInstr =
			new Token(
				new TextAttribute(
					manager.getColor(IXMLColorConstants.PROC_INSTR)));

		IRule[] rules = new IRule[2];
		//Add rule for processing instructions
		rules[0] = new SingleLineRule("<?", "?>", procInstr); //$NON-NLS-1$ //$NON-NLS-2$
		// Add generic whitespace rule.
		rules[1] = new WhitespaceRule(new XMLWhitespaceDetector());

		setRules(rules);
	}
}

--- NEW FILE: XMLTagScanner.java ---
package org.jcommander.ui.editor.xml;

import org.eclipse.jface.text.TextAttribute;
import org.eclipse.jface.text.rules.IRule;
import org.eclipse.jface.text.rules.IToken;
import org.eclipse.jface.text.rules.RuleBasedScanner;
import org.eclipse.jface.text.rules.SingleLineRule;
import org.eclipse.jface.text.rules.Token;
import org.eclipse.jface.text.rules.WhitespaceRule;


public class XMLTagScanner extends RuleBasedScanner {

	public XMLTagScanner(ColorManager manager) {
		IToken string =
			new Token(
				new TextAttribute(manager.getColor(IXMLColorConstants.STRING)));

		IRule[] rules = new IRule[3];

		// Add rule for double quotes
		rules[0] = new SingleLineRule("\"", "\"", string, '\\'); //$NON-NLS-1$ //$NON-NLS-2$
		// Add a rule for single quotes
		rules[1] = new SingleLineRule("'", "'", string, '\\'); //$NON-NLS-1$ //$NON-NLS-2$
		// Add generic whitespace rule.
		rules[2] = new WhitespaceRule(new XMLWhitespaceDetector());

		setRules(rules);
	}
}

[Jcommander-commit] plugins/org.jcommander.ui.editor plugin.xml, 1.5, 1.6

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

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.editor
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv2671

Modified Files:
	plugin.xml 
Log Message:
- [Feature Requests-1105827]: First implementation of simple build in editor, currently capable of highlighting html and xml
- removed compare perspective, now using edit instead
- All Editors can be closed with Esc

Index: plugin.xml
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.editor/plugin.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** plugin.xml	2 Mar 2006 09:31:50 -0000	1.5
--- plugin.xml	8 Jul 2006 17:35:05 -0000	1.6
***************
*** 2,71 ****
  <?eclipse version="3.0"?>
  <plugin
!    id="org.jcommander.ui.editor"
!    name="JCommander Editor Plug-in"
!    version="0.7.1"
!    provider-name="JCmd Dev Team"
!    class="org.jcommander.ui.editor.EditorPlugin">
  
!    <runtime>
!       <library name="jcmd-editor.jar">
!          <export name="*"/>
!       </library>
!    </runtime>
  
!    <requires>
!       <import plugin="org.eclipse.ui"/>
!       <import plugin="org.eclipse.core.runtime"/>
!       <import plugin="org.eclipse.core.resources"/>
!       <import plugin="org.jcommander.ui.utils"/>
!       <import plugin="org.eclipse.jface.text"/>
!       <import plugin="org.jcommander.vfsextensions"/>
!       <import plugin="org.apache.commons.vfs"/>
!    </requires>
!    <extension
!          point="org.eclipse.ui.perspectives">
  		<perspective
!         icon="icons/editor.gif"
!         class="org.jcommander.ui.editor.EditPerspectiveFactory"
!         name="Edit"
!         id="org.jcommander.ui.editor.Edit"/>
!    </extension>
!    <extension
!          id="org.jcommander.edit.EditorPerspectiveExtension"
!          name="Editor Perspective Extension"
!          point="org.eclipse.ui.perspectiveExtensions">
!       <perspectiveExtension targetID="org.jcommander.ui.app.Edit">
!          <actionSet id="org.jcommander.ui.editor.actionSet"/>
!       </perspectiveExtension>
!    </extension>
!    <extension
!          point="org.eclipse.ui.actionSets">
!       <actionSet
!             label="JCmd Editor Action Set"
!             id="org.jcommander.ui.editor.actionSet">
!          <menu
!                label="&amp;File"
!                id="file">
!             <separator name="group1"/>
!          </menu>
!          <action
!                toolbarPath="sampleGroup"
!                label="&amp;Sample Action"
!                class="org.jcommander.ui.editor.actions.SampleAction"
!                tooltip="Hello, Eclipse world"
!                icon="icons/editor.gif"
!                menubarPath="file/group1"
!                id="org.jcommander.ui.editor.actions.SampleAction"/>
!       </actionSet>
!    </extension>
!    <extension
!          point="org.eclipse.ui.editors">
!       <editor
!             class="org.jcommander.ui.editor.JCmdEditorPart"
!             icon="icons/file.gif"
!             default="true"
!             name="JCommander&apos;s Editor"
!             id="org.jcommander.ui.editor.JCmdEditor"/>
!    </extension>
  
  </plugin>
--- 2,112 ----
  <?eclipse version="3.0"?>
  <plugin
! 	id="org.jcommander.ui.editor"
! 	name="JCommander Editor Plug-in"
! 	version="0.7.1"
! 	provider-name="JCmd Dev Team"
! 	class="org.jcommander.ui.editor.EditorPlugin">
  
! 	<runtime>
! 		<library name="jcmd-editor.jar">
! 			<export name="*"/>
! 		</library>
! 	</runtime>
  
! 	<requires>
! 		<import plugin="org.eclipse.ui"/>
! 		<import plugin="org.eclipse.core.runtime"/>
! 		<import plugin="org.eclipse.core.resources"/>
! 		<import plugin="org.jcommander.ui.utils"/>
! 		<import plugin="org.eclipse.jface.text"/>
! 		<import plugin="org.jcommander.vfsextensions"/>
! 		<import plugin="org.apache.commons.vfs"/>
! 		<import plugin="org.eclipse.ui.workbench.texteditor"/>
! 	</requires>
! 	
! 	<extension
! 		point="org.eclipse.ui.perspectives">
  		<perspective
! 			icon="icons/editor.gif"
! 			class="org.jcommander.ui.editor.EditPerspectiveFactory"
! 			name="Edit"
! 			id="org.jcommander.ui.editor.Edit"/>
! 	</extension>
! 	
! 	<extension
! 		id="org.jcommander.edit.EditorPerspectiveExtension"
! 		name="Editor Perspective Extension"
!  		point="org.eclipse.ui.perspectiveExtensions">
! 		<perspectiveExtension targetID="org.jcommander.ui.app.Edit">
! 			<actionSet id="org.jcommander.ui.editor.actionSet"/>
! 		</perspectiveExtension>
! 	</extension>
! 	
! 	<extension
!  		point="org.eclipse.ui.actionSets">
! 		<actionSet
! 			label="JCmd Editor Action Set"
! 			id="org.jcommander.ui.editor.actionSet">
! 		<menu
! 			id="org_jcommander_ui_editor_file"
! 			label="&amp;File">
! 			<separator name="group1"/>
! 		</menu>
! 		<action
! 			toolbarPath="sampleGroup"
! 			label="&amp;Sample Action"
! 			class="org.jcommander.ui.editor.actions.CloseAction"
! 			definitionId="org.jcommander.ui.editor.close"
! 			tooltip="Close active Editor"
! 			icon="icons/editor.gif"
! 			menubarPath="org_jcommander_ui_editor_file/group1"
! 			id="org.jcommander.ui.editor.actions.SampleAction"/>
! 		</actionSet>
! 	</extension>
! 
! 	<extension
! 		point="org.eclipse.ui.editors">
! 		<editor
! 			id="org.jcommander.ui.editor.XMLEditor"
! 			icon="icons/text.gif"
! 			name="Sample XML Editor"
! 			class="org.jcommander.ui.editor.xml.XMLEditor"
! 			contributorClass="org.eclipse.ui.texteditor.BasicTextEditorActionContributor"
! 			extensions="xml,html"/>
! 		<editor
! 			id="org.jcommander.ui.editor.JCmdEditor"
! 			icon="icons/text.gif"
! 			name="Sample Editor"
! 			class="org.jcommander.ui.editor.JCmdEditor"
! 			contributorClass="org.eclipse.ui.texteditor.BasicTextEditorActionContributor"
! 			default="true"/>
! 	</extension>
! 
! 	<extension point="org.eclipse.ui.actionSetPartAssociations">
! 		<actionSetPartAssociation 
! 			targetID="org.jcommander.ui.editor.actionSet">
! 			<part id="org.jcommander.ui.editor.JCmdEditor"/>
! 			<part id="org.jcommander.ui.editor.XMLEditor"/>
! 			<part id="org.jcommander.eclipsepatch.compare.CompareEditor"/>
! 		</actionSetPartAssociation>
! 	</extension>
! 
! 	<extension
! 		point="org.eclipse.ui.commands">
! 		<command
! 			name="Close editor"
! 			description="Close editor"
! 			id="org.jcommander.ui.editor.close">
! 		</command>
! 	</extension>   
! 
! 	<extension
! 		point="org.eclipse.ui.bindings">
! 		<key
! 			sequence="Esc"
! 			commandId="org.jcommander.ui.editor.close"
! 			schemeId="org.jcommander.ui.app.JCmdKeyConfiguration">
! 		</key>
! 	</extension>
  
  </plugin>

[Jcommander-commit] plugins/org.jcommander.ui.editor/src/org/jcommander/ui/editor JCmdDocumentProvider.java, NONE, 1.1 JCmdEditor.java, NONE, 1.1

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

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.editor/src/org/jcommander/ui/editor
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv2671/src/org/jcommander/ui/editor

Added Files:
	JCmdDocumentProvider.java JCmdEditor.java 
Log Message:
- [Feature Requests-1105827]: First implementation of simple build in editor, currently capable of highlighting html and xml
- removed compare perspective, now using edit instead
- All Editors can be closed with Esc

--- NEW FILE: JCmdDocumentProvider.java ---
package org.jcommander.ui.editor;

import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Reader;
import java.io.Writer;

import org.apache.commons.vfs.FileSystemException;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;

import org.eclipse.jface.operation.IRunnableContext;

import org.eclipse.jface.text.Document;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.source.IAnnotationModel;

import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IPathEditorInput;
import org.eclipse.ui.texteditor.AbstractDocumentProvider;

/**
 * A document provider that reads can handle <code>IPathEditorInput</code>
 * editor inputs. Documents are created by reading them in from the file that
 * the <code>IPath</code> contained in the editor input points to.
 * 
 * @since 3.0
 */
public class JCmdDocumentProvider extends AbstractDocumentProvider {

	/*
	 * @see org.eclipse.ui.texteditor.AbstractDocumentProvider#createDocument(java.lang.Object)
	 */
	protected IDocument createDocument(Object element) throws CoreException {
		if (element instanceof IEditorInput) {
			IDocument document= new Document();
			if (setDocumentContent(document, (IEditorInput) element)) {
				setupDocument(document);
			}
			return document;
		}
	
		return null;
	}
	
	/**
	 * Tries to read the file pointed at by <code>input</code> if it is an
	 * <code>IPathEditorInput</code>. If the file does not exist, <code>true</code>
	 * is returned.
	 *  
	 * @param document the document to fill with the contents of <code>input</code>
	 * @param input the editor input
	 * @return <code>true</code> if setting the content was successful or no file exists, <code>false</code> otherwise
	 * @throws CoreException if reading the file fails
	 */
	private boolean setDocumentContent(IDocument document, IEditorInput input) throws CoreException {
		// XXX handle encoding
		Reader reader=null;
		try {
			if (input instanceof JCmdEditorInput)
				reader= new InputStreamReader(((JCmdEditorInput)input).getFile().getContent().getInputStream());
			else
				return false;
		} catch (FileSystemException e) {
			// TODO Auto-generated catch block
			e.printStackTrace();
		}
		
		try {
			setDocumentContent(document, reader);
			return true;
		} catch (IOException e) {
			throw new CoreException(new Status(IStatus.ERROR, "org.eclipse.ui.examples.rcp.texteditor", IStatus.OK, "error reading file", e)); //$NON-NLS-1$ //$NON-NLS-2$
		}
	}

	/**
	 * Reads in document content from a reader and fills <code>document</code>
	 * 
	 * @param document the document to fill
	 * @param reader the source
	 * @throws IOException if reading fails
	 */
	private void setDocumentContent(IDocument document, Reader reader) throws IOException {
		Reader in= new BufferedReader(reader);
		try {
			
			StringBuffer buffer= new StringBuffer(512);
			char[] readBuffer= new char[512];
			int n= in.read(readBuffer);
			while (n > 0) {
				buffer.append(readBuffer, 0, n);
				n= in.read(readBuffer);
			}
			
			document.set(buffer.toString());
		
		} finally {
			in.close();
		}
	}

	/**
	 * Set up the document - default implementation does nothing.
	 * 
	 * @param document the new document
	 */
	protected void setupDocument(IDocument document) {
	}

	/*
	 * @see org.eclipse.ui.texteditor.AbstractDocumentProvider#createAnnotationModel(java.lang.Object)
	 */
	protected IAnnotationModel createAnnotationModel(Object element) throws CoreException {
		return null;
	}

	/*
	 * @see org.eclipse.ui.texteditor.AbstractDocumentProvider#doSaveDocument(org.eclipse.core.runtime.IProgressMonitor, java.lang.Object, org.eclipse.jface.text.IDocument, boolean)
	 */
	protected void doSaveDocument(IProgressMonitor monitor, Object element, IDocument document, boolean overwrite) throws CoreException {
		if (element instanceof IPathEditorInput) {
			IPathEditorInput pei= (IPathEditorInput) element;
			IPath path= pei.getPath();
			File file= path.toFile();
			
			try {
				file.createNewFile();

				if (file.exists()) {
					if (file.canWrite()) {
						Writer writer= new FileWriter(file);
						writeDocumentContent(document, writer, monitor);
					} else {
						// XXX prompt to SaveAs
						throw new CoreException(new Status(IStatus.ERROR, "org.eclipse.ui.examples.rcp.texteditor", IStatus.OK, "file is read-only", null)); //$NON-NLS-1$ //$NON-NLS-2$
					}
				} else {
					throw new CoreException(new Status(IStatus.ERROR, "org.eclipse.ui.examples.rcp.texteditor", IStatus.OK, "error creating file", null)); //$NON-NLS-1$ //$NON-NLS-2$
				}
			} catch (IOException e) {
				throw new CoreException(new Status(IStatus.ERROR, "org.eclipse.ui.examples.rcp.texteditor", IStatus.OK, "error when saving file", e)); //$NON-NLS-1$ //$NON-NLS-2$
			}

		}
	}

	/**
	 * Saves the document contents to a stream.
	 * 
	 * @param document the document to save
	 * @param writer the stream to save it to
	 * @param monitor a progress monitor to report progress
	 * @throws IOException if writing fails
	 */
	private void writeDocumentContent(IDocument document, Writer writer, IProgressMonitor monitor) throws IOException {
		Writer out= new BufferedWriter(writer);
		try {
			out.write(document.get());
		} finally {
			out.close();
		}
	}

	/*
	 * @see org.eclipse.ui.texteditor.AbstractDocumentProvider#getOperationRunner(org.eclipse.core.runtime.IProgressMonitor)
	 */
	protected IRunnableContext getOperationRunner(IProgressMonitor monitor) {
		return null;
	}
	
	/*
	 * @see org.eclipse.ui.texteditor.IDocumentProviderExtension#isModifiable(java.lang.Object)
	 */
	public boolean isModifiable(Object element) {
		if (element instanceof IPathEditorInput) {
			IPathEditorInput pei= (IPathEditorInput) element;
			File file= pei.getPath().toFile();
			return file.canWrite() || !file.exists(); // Allow to edit new files
		}
		return false;
	}
	
	/*
	 * @see org.eclipse.ui.texteditor.IDocumentProviderExtension#isReadOnly(java.lang.Object)
	 */
	public boolean isReadOnly(Object element) {
		return !isModifiable(element);
	}
	
	/*
	 * @see org.eclipse.ui.texteditor.IDocumentProviderExtension#isStateValidated(java.lang.Object)
	 */
	public boolean isStateValidated(Object element) {
		return true;
	}
}
--- NEW FILE: JCmdEditor.java ---
package org.jcommander.ui.editor;

import org.eclipse.ui.texteditor.AbstractTextEditor;


/**
 * A simple text editor.
 * 
 * Source from org.eclipse.ui.examples.rcp.texteditor
 * 
 * @see org.jcommander.ui.editor.JCmdDocumentProvider
 * @since 3.0
 */
public class JCmdEditor extends AbstractTextEditor {

	public JCmdEditor() {
		super();
		// make sure we inherit all the text editing commands (delete line etc).
		setKeyBindingScopes(new String[] { "org.eclipse.ui.textEditorScope" });  //$NON-NLS-1$
		internal_init();
	}

	/**
	 * Initializes the document provider and source viewer configuration.
	 * Called by the constructor. Subclasses may replace this method.
	 */
	protected void internal_init() {
		configureInsertMode(SMART_INSERT, false);
		setDocumentProvider(new JCmdDocumentProvider());
	}
	
}

[Jcommander-commit] plugins/org.jcommander.ui.editor/src/org/jcommander/ui/editor/xml - New directory

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

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.editor/src/org/jcommander/ui/editor/xml
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv2646/src/org/jcommander/ui/editor/xml

Log Message:
Directory /cvsroot/jcommander/plugins/org.jcommander.ui.editor/src/org/jcommander/ui/editor/xml added to the repository

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

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

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

Modified Files:
	jcommander.product 
Log Message:
Updated credits

Index: jcommander.product
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander/jcommander.product,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** jcommander.product	17 Apr 2006 14:05:18 -0000	1.34
--- jcommander.product	7 Jul 2006 22:16:22 -0000	1.35
***************
*** 20,32 ****
  Lead Developers:
  - Robert Enyedi (Founder)
! - Marius Hanganu (Founder)
  
  Developers:
  - Michael Smith
! - Michael Borodkin
  
  Graphical Design: Adrian Chromenko
  
  
  Credits:
  
--- 20,36 ----
  Lead Developers:
  - Robert Enyedi (Founder)
! - Marius Hanganu (Founder and initial contributor)
  
  Developers:
  - Michael Smith
! - Mike Grigorov
! - Matthias Kümmerer
! - Edgar Poce 
  
  Graphical Design: Adrian Chromenko
  
  
+ 
+ 
  Credits:
  
***************
*** 74,85 ****
        <plugin id="org.eclipse.core.expressions"/>
        <plugin id="org.eclipse.core.filesystem"/>
!       <plugin id="org.eclipse.core.filesystem.win32.x86"/>
        <plugin id="org.eclipse.core.jobs"/>
        <plugin id="org.eclipse.core.resources"/>
!       <plugin id="org.eclipse.core.resources.compatibility"/>
!       <plugin id="org.eclipse.core.resources.win32"/>
        <plugin id="org.eclipse.core.runtime"/>
        <plugin id="org.eclipse.core.runtime.compatibility"/>
!       <plugin id="org.eclipse.core.runtime.compatibility.registry"/>
        <plugin id="org.eclipse.core.variables"/>
        <plugin id="org.eclipse.equinox.common"/>
--- 78,89 ----
        <plugin id="org.eclipse.core.expressions"/>
        <plugin id="org.eclipse.core.filesystem"/>
!       <plugin id="org.eclipse.core.filesystem.win32.x86" fragment="true"/>
        <plugin id="org.eclipse.core.jobs"/>
        <plugin id="org.eclipse.core.resources"/>
!       <plugin id="org.eclipse.core.resources.compatibility" fragment="true"/>
!       <plugin id="org.eclipse.core.resources.win32" fragment="true"/>
        <plugin id="org.eclipse.core.runtime"/>
        <plugin id="org.eclipse.core.runtime.compatibility"/>
!       <plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>
        <plugin id="org.eclipse.core.variables"/>
        <plugin id="org.eclipse.equinox.common"/>
***************
*** 96,100 ****
        <plugin id="org.eclipse.swt"/>
        <plugin id="org.eclipse.swt.win32"/>
!       <plugin id="org.eclipse.swt.win32.win32.x86"/>
        <plugin id="org.eclipse.text"/>
        <plugin id="org.eclipse.tomcat"/>
--- 100,104 ----
        <plugin id="org.eclipse.swt"/>
        <plugin id="org.eclipse.swt.win32"/>
!       <plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/>
        <plugin id="org.eclipse.text"/>
        <plugin id="org.eclipse.tomcat"/>
***************
*** 103,111 ****
        <plugin id="org.eclipse.ui.intro"/>
        <plugin id="org.eclipse.ui.workbench"/>
!       <plugin id="org.eclipse.ui.workbench.compatibility"/>
        <plugin id="org.eclipse.ui.workbench.texteditor"/>
        <plugin id="org.eclipse.update.configurator"/>
        <plugin id="org.eclipse.update.core"/>
!       <plugin id="org.eclipse.update.core.win32"/>
        <plugin id="org.eclipse.update.scheduler"/>
        <plugin id="org.eclipse.update.ui"/>
--- 107,115 ----
        <plugin id="org.eclipse.ui.intro"/>
        <plugin id="org.eclipse.ui.workbench"/>
!       <plugin id="org.eclipse.ui.workbench.compatibility" fragment="true"/>
        <plugin id="org.eclipse.ui.workbench.texteditor"/>
        <plugin id="org.eclipse.update.configurator"/>
        <plugin id="org.eclipse.update.core"/>
!       <plugin id="org.eclipse.update.core.win32" fragment="true"/>
        <plugin id="org.eclipse.update.scheduler"/>
        <plugin id="org.eclipse.update.ui"/>
***************
*** 125,142 ****
        <plugin id="org.jcommander.phileas.zip"/>
        <plugin id="org.jcommander.systemshell"/>
!       <plugin id="org.jcommander.systemshell.win32"/>
        <plugin id="org.jcommander.tools.nativemanager"/>
        <plugin id="org.jcommander.tools.nativemanager.ui"/>
        <plugin id="org.jcommander.ui.app"/>
!       <plugin id="org.jcommander.ui.app.iconpack.eclipse"/>
        <plugin id="org.jcommander.ui.compare"/>
        <plugin id="org.jcommander.ui.editor"/>
!       <plugin id="org.jcommander.ui.editor.iconpack.eclipse"/>
        <plugin id="org.jcommander.ui.externaltools"/>
        <plugin id="org.jcommander.ui.filepanel"/>
!       <plugin id="org.jcommander.ui.filepanel.iconpack.eclipse"/>
        <plugin id="org.jcommander.ui.fileviewer"/>
        <plugin id="org.jcommander.ui.findfiles"/>
!       <plugin id="org.jcommander.ui.findfiles.iconpack.eclipse"/>
        <plugin id="org.jcommander.ui.help"/>
        <plugin id="org.jcommander.ui.intro"/>
--- 129,146 ----
        <plugin id="org.jcommander.phileas.zip"/>
        <plugin id="org.jcommander.systemshell"/>
!       <plugin id="org.jcommander.systemshell.win32" fragment="true"/>
        <plugin id="org.jcommander.tools.nativemanager"/>
        <plugin id="org.jcommander.tools.nativemanager.ui"/>
        <plugin id="org.jcommander.ui.app"/>
!       <plugin id="org.jcommander.ui.app.iconpack.eclipse" fragment="true"/>
        <plugin id="org.jcommander.ui.compare"/>
        <plugin id="org.jcommander.ui.editor"/>
!       <plugin id="org.jcommander.ui.editor.iconpack.eclipse" fragment="true"/>
        <plugin id="org.jcommander.ui.externaltools"/>
        <plugin id="org.jcommander.ui.filepanel"/>
!       <plugin id="org.jcommander.ui.filepanel.iconpack.eclipse" fragment="true"/>
        <plugin id="org.jcommander.ui.fileviewer"/>
        <plugin id="org.jcommander.ui.findfiles"/>
!       <plugin id="org.jcommander.ui.findfiles.iconpack.eclipse" fragment="true"/>
        <plugin id="org.jcommander.ui.help"/>
        <plugin id="org.jcommander.ui.intro"/>

[Jcommander-commit] plugins/org.jcommander.ui.app plugin.xml, 1.99, 1.100

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

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

Modified Files:
	plugin.xml 
Log Message:
Updated credits

Index: plugin.xml
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.app/plugin.xml,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -d -r1.99 -r1.100
*** plugin.xml	29 May 2006 16:10:11 -0000	1.99
--- plugin.xml	7 Jul 2006 22:16:19 -0000	1.100
***************
*** 61,65 ****
       <property
             name="aboutText"
!            value="JCommander - The Next Generation File Manager&#x0A;&#x0A;Version: 0.7.1&#x0A;Product Home Page: http://jcommander.sourceforge.net/&#x0A;&#x0A;This product is distributed freely under the Eclipse Public License 1.0.&#x0A;http://www.opensource.org/licenses/eclipse-1.0.php&#x0A;&#x0A;&#x0A;The Team&#x0A;&#x0A;Lead Developers:&#x0A;- Robert Enyedi (Founder)&#x0A;- Marius Hanganu (Founder)&#x0A;&#x0A;Developers:&#x0A;- Michael Smith&#x0A;- Michael Borodkin&#x0A;&#x0A;Graphical Design: Adrian Chromenko&#x0A;&#x0A;&#x0A;Credits:&#x0A;&#x0A;JCommander is built on top of the Eclipse Rich Client Platform (RCP).&#x0A;http://www.eclipse.org/rcp/&#x0A;&#x0A;This product includes software developed by the Apache Software Foundation.&#x0A;http://www.apache.org/"/>
       <property
             name="startupForegroundColor"
--- 61,65 ----
       <property
             name="aboutText"
!            value="JCommander - The Next Generation File Manager&#x0D;&#x0A;&#x0D;&#x0A;Version: 0.7.1&#x0D;&#x0A;Product Home Page: http://jcommander.sourceforge.net/&#x0D;&#x0A;&#x0D;&#x0A;This product is distributed freely under the Eclipse Public License 1.0.&#x0D;&#x0A;http://www.opensource.org/licenses/eclipse-1.0.php&#x0D;&#x0A;&#x0D;&#x0A;&#x0D;&#x0A;The Team&#x0D;&#x0A;&#x0D;&#x0A;Lead Developers:&#x0D;&#x0A;- Robert Enyedi (Founder)&#x0D;&#x0A;- Marius Hanganu (Founder and initial contributor)&#x0D;&#x0A;&#x0D;&#x0A;Developers:&#x0D;&#x0A;- Michael Smith&#x0D;&#x0A;- Mike Grigorov&#x0D;&#x0A;- Matthias Kümmerer&#x0D;&#x0A;- Edgar Poce &#x0D;&#x0A;&#x0D;&#x0A;Graphical Design: Adrian Chromenko&#x0D;&#x0A;&#x0D;&#x0A;&#x0D;&#x0A;&#x0D;&#x0A;&#x0D;&#x0A;Credits:&#x0D;&#x0A;&#x0D;&#x0A;JCommander is built on top of the Eclipse Rich Client Platform (RCP).&#x0D;&#x0A;http://www.eclipse.org/rcp/&#x0D;&#x0A;&#x0D;&#x0A;This product includes software developed by the Apache Software Foundation.&#x0D;&#x0A;http://www.apache.org/"/>
       <property
             name="startupForegroundColor"

[Jcommander-commit] plugins/org.jcommander.eclipseplatform feature.xml, 1.24, 1.25

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

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

Modified Files:
	feature.xml 
Log Message:
Updated to Eclipse RCP 3.2 final

Index: feature.xml
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipseplatform/feature.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** feature.xml	12 Jun 2006 09:34:31 -0000	1.24
--- feature.xml	7 Jul 2006 02:20:45 -0000	1.25
***************
*** 57,61 ****
           download-size="0"
           install-size="0"
!          version="3.2.0.I20060511-2000"
           fragment="true"/>
  
--- 57,61 ----
           download-size="0"
           install-size="0"
!          version="3.2.0.I20060605-1400"
           fragment="true"/>
  
***************
*** 64,68 ****
           download-size="0"
           install-size="0"
!          version="3.1.100.v20060601a"
           unpack="false"/>
  
--- 64,68 ----
           download-size="0"
           install-size="0"
!          version="3.1.100.v20060603"
           unpack="false"/>
  
***************
*** 78,82 ****
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060510b"/>
  
     <plugin
--- 78,82 ----
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060602"/>
  
     <plugin
***************
*** 90,94 ****
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060530"
           unpack="false"/>
  
--- 90,94 ----
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060602"
           unpack="false"/>
  
***************
*** 97,101 ****
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060511"
           unpack="false"/>
  
--- 97,101 ----
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060605"
           unpack="false"/>
  
***************
*** 106,110 ****
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060511"
           fragment="true"
           unpack="false"/>
--- 106,110 ----
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060605"
           fragment="true"
           unpack="false"/>
***************
*** 114,118 ****
           download-size="0"
           install-size="0"
!          version="3.1.100.v20060510b"
           unpack="false"/>
  
--- 114,118 ----
           download-size="0"
           install-size="0"
!          version="3.1.100.v20060602"
           unpack="false"/>
  
***************
*** 121,125 ****
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060601a"
           fragment="true"
           unpack="false"/>
--- 121,125 ----
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060603"
           fragment="true"
           unpack="false"/>
***************
*** 131,135 ****
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060601a"
           fragment="true"
           unpack="false"/>
--- 131,135 ----
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060603"
           fragment="true"
           unpack="false"/>
***************
*** 146,150 ****
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060601a"
           unpack="false"/>
  
--- 146,150 ----
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060603"
           unpack="false"/>
  
***************
*** 153,157 ****
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060602-0010"
           unpack="false"/>
  
--- 153,157 ----
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060605-1400"
           unpack="false"/>
  
***************
*** 160,164 ****
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060602-0010"
           unpack="false"/>
  
--- 160,164 ----
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060605-1400"
           unpack="false"/>
  
***************
*** 167,171 ****
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060602"
           unpack="false"/>
  
--- 167,171 ----
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060605"
           unpack="false"/>
  
***************
*** 174,178 ****
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060601"
           unpack="false"/>
  
--- 174,178 ----
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060605"
           unpack="false"/>
  
***************
*** 181,185 ****
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060510b"
           unpack="false"/>
  
--- 181,185 ----
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060602"
           unpack="false"/>
  
***************
*** 209,213 ****
           download-size="0"
           install-size="0"
!          version="1.0.0.v20060601a"
           unpack="false"/>
  
--- 209,213 ----
           download-size="0"
           install-size="0"
!          version="1.0.0.v20060603"
           unpack="false"/>
  
***************
*** 258,262 ****
           download-size="0"
           install-size="0"
!          version="1.0.0.v20060601a"
           fragment="true"
           unpack="false"/>
--- 258,262 ----
           download-size="0"
           install-size="0"
!          version="1.0.0.v20060603"
           fragment="true"
           unpack="false"/>
***************
*** 273,277 ****
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060602-0010"
           unpack="false"/>
  
--- 273,277 ----
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060605-1400"
           unpack="false"/>
  
***************
*** 280,284 ****
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060601a"
           unpack="false"/>
  
--- 280,284 ----
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060603"
           unpack="false"/>
  
***************
*** 287,291 ****
           download-size="0"
           install-size="0"
!          version="3.2.0.I20060511-2000"
           unpack="false"/>
  
--- 287,291 ----
           download-size="0"
           install-size="0"
!          version="3.2.0.I20060605-1400"
           unpack="false"/>
  

[Jcommander-commit] plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers FileCopyPerformer.java, 1.37, 1.38 UiCopyListener.java, 1.12, 1.13

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

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

Modified Files:
	FileCopyPerformer.java UiCopyListener.java 
Log Message:
-New CopyProgressDialog. Less important things moved to the details.
-A lot of renaming (lots of GridDatas and GridLayouts)

Index: UiCopyListener.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers/UiCopyListener.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** UiCopyListener.java	30 Apr 2006 13:10:55 -0000	1.12
--- UiCopyListener.java	3 Jul 2006 22:10:10 -0000	1.13
***************
*** 47,52 ****
  		EclipseBroker.getDisplay().syncExec(new Runnable() {
  			public void run() {
! 				guiForceSkip = performer.getProgressDialogComposite().getOverwirteSkipRadio().getSelection();
! 				guiForceOverwrite = performer.getProgressDialogComposite().getOverwriteProceedRadio().getSelection();
  			}
  		});
--- 47,52 ----
  		EclipseBroker.getDisplay().syncExec(new Runnable() {
  			public void run() {
! 				guiForceSkip = performer.getProgressDialogComposite().isOverwriteSkip();
! 				guiForceOverwrite = performer.getProgressDialogComposite().isOverwriteProceed();
  			}
  		});
***************
*** 110,129 ****
  						if(source.getType() == FileType.FOLDER) {
  							// No exact computation possible in the current architecture
! 							progressComposite.getTotalDirsLabel().setText(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL);
! 							progressComposite.getTotalFilesLabel().setText(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL);
! 							progressComposite.getTotalSizeLabel().setText(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL);
! 							progressComposite.getAvgSpeedLabel().setText(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL);
! 							progressComposite.getPercentDoneLabel().setText(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL);
! 							progressComposite.getRemainingTimeLabel().setText(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL);
  						} else {
  							// totalfiles --
! 							if(!progressComposite.getTotalFilesLabel().equals(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL)) {
! 								progressComposite.getTotalFilesLabel().setText(
! 									Integer.toString(Integer.parseInt(progressComposite.getTotalFilesLabel().getText()) - 1));
  							}
  							
  							// decrease total size
! 							if(!progressComposite.getTotalSizeLabel().equals(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL)) {
! 								progressComposite.getTotalSizeLabel().setText(
  									FormatUtils.getFullyFormattedSize(
  											UiCopyListener.this.performer.currentStats.getTotalSize() - source.getContent().getSize()));
--- 110,129 ----
  						if(source.getType() == FileType.FOLDER) {
  							// No exact computation possible in the current architecture
! 							progressComposite.setTotalDirs(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL);
! 							progressComposite.setTotalFiles(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL);
! 							progressComposite.setTotalSize(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL);
! 							progressComposite.setAvgSpeed(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL);
! 							progressComposite.setPercentDone(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL);
! 							progressComposite.setRemainingTime(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL);
  						} else {
  							// totalfiles --
! 							if(!progressComposite.getTotalFiles().equals(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL)) {
! 								progressComposite.setTotalFiles(
! 									Integer.toString(Integer.parseInt(progressComposite.getTotalFiles()) - 1));
  							}
  							
  							// decrease total size
! 							if(!progressComposite.getTotalSize().equals(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL)) {
! 								progressComposite.setTotalSize(
  									FormatUtils.getFullyFormattedSize(
  											UiCopyListener.this.performer.currentStats.getTotalSize() - source.getContent().getSize()));
***************
*** 195,212 ****
  					CopyProgressDialogComposite progressComposite = UiCopyListener.this.performer.progressDialogComposite;
  					
! 					if(!progressComposite.getPercentDoneLabel().getText().equals(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL)){
! 						progressComposite.getPercentDoneLabel()
! 										.setText(FormatUtils.getPercent(UiCopyListener.this.performer.totalCopiedSize, UiCopyListener.this.performer.currentStats.getTotalSize()));
  					}
  					
! 					progressComposite.getSizeDoneLabel()
! 									.setText(FormatUtils.getFullyFormattedSize(UiCopyListener.this.performer.totalCopiedSize));
  					
  					long elapsedTime = System.currentTimeMillis() - UiCopyListener.this.performer.operationStartTime;
  					
! 					progressComposite.getElapsedTimeLabel().setText(FormatUtils.formatTime(elapsedTime));
  					
! 					if(!progressComposite.getAvgSpeedLabel().getText().equals(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL)){
! 						progressComposite.getAvgSpeedLabel().setText(FormatUtils.formatTransferSpeed(UiCopyListener.this.performer.totalCopiedSize, elapsedTime));
  					}
  					
--- 195,210 ----
  					CopyProgressDialogComposite progressComposite = UiCopyListener.this.performer.progressDialogComposite;
  					
! 					if(!progressComposite.getPercentDone().equals(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL)){
! 						progressComposite.setPercentDone(FormatUtils.getPercent(UiCopyListener.this.performer.totalCopiedSize, UiCopyListener.this.performer.currentStats.getTotalSize()));
  					}
  					
! 					progressComposite.setSizeDone(FormatUtils.getFullyFormattedSize(UiCopyListener.this.performer.totalCopiedSize));
  					
  					long elapsedTime = System.currentTimeMillis() - UiCopyListener.this.performer.operationStartTime;
  					
! 					progressComposite.setElapsedTime(FormatUtils.formatTime(elapsedTime));
  					
! 					if(!progressComposite.getAvgSpeed().equals(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL)){
! 						progressComposite.setAvgSpeed(FormatUtils.formatTransferSpeed(UiCopyListener.this.performer.totalCopiedSize, elapsedTime));
  					}
  					
***************
*** 216,221 ****
  						UiCopyListener.this.performer.totalCopiedSize;
  						
! 						if(!progressComposite.getRemainingTimeLabel().equals(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL)){
! 							progressComposite.getRemainingTimeLabel().setText(FormatUtils.formatTime(remainingTime));
  						}
  					}
--- 214,219 ----
  						UiCopyListener.this.performer.totalCopiedSize;
  						
! 						if(!progressComposite.getRemainingTime().equals(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL)){
! 							progressComposite.setRemainingTime(FormatUtils.formatTime(remainingTime));
  						}
  					}

Index: FileCopyPerformer.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers/FileCopyPerformer.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** FileCopyPerformer.java	17 May 2006 11:19:47 -0000	1.37
--- FileCopyPerformer.java	3 Jul 2006 22:10:10 -0000	1.38
***************
*** 169,173 ****
  				EclipseBroker.getDisplay().syncExec(new Runnable() {
  					public void run() {
! 						if(!progressDialogComposite.getKeepOpenCheckBox().getSelection()) {
  							progressDialog.setVisible(false);
  						}
--- 169,173 ----
  				EclipseBroker.getDisplay().syncExec(new Runnable() {
  					public void run() {
! 						if(!progressDialogComposite.isKeepOpen()) {
  							progressDialog.setVisible(false);
  						}
***************
*** 181,188 ****
  						progressDialogComposite.getTotalProgressBar()
  									.setSelection(progressDialogComposite.getTotalProgressBar().getMaximum());
! 						progressDialogComposite.getPercentDoneLabel().setText("100%");
  						
! 						progressDialogComposite.getPercentDoneLabel()
! 									.setBackground(progressDialogComposite.getDisplay().getSystemColor(SWT.COLOR_GREEN));
  						progressDialogComposite.getPauseButton().setEnabled(false);
  						progressDialogComposite.getAbortButton().setEnabled(false);
--- 181,187 ----
  						progressDialogComposite.getTotalProgressBar()
  									.setSelection(progressDialogComposite.getTotalProgressBar().getMaximum());
! 						progressDialogComposite.setPercentDone("100%");
  						
! 						progressDialogComposite.setPercentDoneColor(progressDialogComposite.getDisplay().getSystemColor(SWT.COLOR_GREEN));
  						progressDialogComposite.getPauseButton().setEnabled(false);
  						progressDialogComposite.getAbortButton().setEnabled(false);
***************
*** 307,316 ****
  					progressDialogComposite.getTotalProgressBar()
  								.setMaximum((int)currentStats.getTotalSize());
! 					progressDialogComposite.getTotalSizeLabel()
! 								.setText(FormatUtils.getFullyFormattedSize(currentStats.getTotalSize()));
! 					progressDialogComposite.getTotalDirsLabel()
! 								.setText(FormatUtils.getFormattedNumber(currentStats.getDirectoryCount()));
! 					progressDialogComposite.getTotalFilesLabel()
! 								.setText(FormatUtils.getFormattedNumber(currentStats.getFileCount()));
  				}
  			});
--- 306,312 ----
  					progressDialogComposite.getTotalProgressBar()
  								.setMaximum((int)currentStats.getTotalSize());
! 					progressDialogComposite.setTotalSize(FormatUtils.getFullyFormattedSize(currentStats.getTotalSize()));
! 					progressDialogComposite.setTotalDirs(FormatUtils.getFormattedNumber(currentStats.getDirectoryCount()));
! 					progressDialogComposite.setTotalFiles(FormatUtils.getFormattedNumber(currentStats.getFileCount()));
  				}
  			});