jcommander-commit — User commit notifications

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

[Dan C. <cor...@us...>]

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.app/src/org/jcommander/ui/app/actions
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv11561/src/org/jcommander/ui/app/actions

Modified Files:
	ChooseProfile.java 
Log Message:
Added support for a new cmd line parameter:
-profile nc/wc
and a new property definition
-Dorg.jcommander.profile nc/wc
This was needed for bypassing the first dialog when starting the application with an empty workspace. SWTBot can not handle the dialog until the workbench is fully started.
See  ID: 2932702

Index: ChooseProfile.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.app/src/org/jcommander/ui/app/actions/ChooseProfile.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ChooseProfile.java	6 Aug 2006 09:11:26 -0000	1.5
--- ChooseProfile.java	17 Jan 2010 17:12:06 -0000	1.6
***************
*** 1,27 ****
  package org.jcommander.ui.app.actions;
  
! import org.eclipse.core.runtime.*;
! import org.eclipse.jface.action.*;
! import org.eclipse.jface.preference.*;
! import org.eclipse.jface.resource.*;
! import org.eclipse.jface.viewers.*;
! import org.eclipse.swt.*;
! import org.eclipse.swt.events.*;
! import org.eclipse.swt.layout.*;
! import org.eclipse.swt.widgets.*;
! import org.eclipse.ui.*;
! import org.jcommander.ui.app.*;
! import org.jcommander.ui.app.dialogs.*;
! import org.jcommander.ui.filepanel.*;
! import org.jcommander.ui.logger.*;
! import org.jcommander.ui.utils.*;
  
  public class ChooseProfile implements IWorkbenchWindowActionDelegate {
  
  	protected IWorkbenchWindow window;
  
  	public void dispose() {
  		// TODO Auto-generated method stub
- 
  	}
  
--- 1,45 ----
  package org.jcommander.ui.app.actions;
  
! import org.eclipse.core.runtime.Platform;
! import org.eclipse.jface.action.IAction;
! import org.eclipse.jface.preference.IPreferenceStore;
! import org.eclipse.jface.resource.ImageDescriptor;
! import org.eclipse.jface.viewers.ISelection;
! import org.eclipse.swt.SWT;
! import org.eclipse.swt.events.SelectionAdapter;
! import org.eclipse.swt.events.SelectionEvent;
! import org.eclipse.swt.layout.FillLayout;
! import org.eclipse.swt.widgets.Shell;
! import org.eclipse.ui.IWorkbenchWindow;
! import org.eclipse.ui.IWorkbenchWindowActionDelegate;
! import org.jcommander.ui.app.AppPlugin;
! import org.jcommander.ui.app.dialogs.ProfileChooserComposite;
! import org.jcommander.ui.filepanel.FilePanelPlugin;
! import org.jcommander.ui.logger.LoggerPlugin;
! import org.jcommander.ui.utils.WindowUtils;
  
  public class ChooseProfile implements IWorkbenchWindowActionDelegate {
  
  	protected IWorkbenchWindow window;
+ 	private String profileToUse;
  
+ 	/**
+ 	 * Do not show the dialog box, just select the specified profile.
+ 	 * @param profileToUse use one of {@link FilePanelPlugin#PROFILE_NORTON_COMMANDER} or
+ 	 * {@link FilePanelPlugin#PROFILE_WINDOWS_EXPLORER}
+ 	 */
+ 	public ChooseProfile(String profileToUse) {
+ 		this.profileToUse = profileToUse;
+ 	}
+ 	
+ 	/**
+ 	 * Show a dialog and let the user select the profile to use.
+ 	 */
+ 	public ChooseProfile() {
+ 		
+ 	}
+ 	
  	public void dispose() {
  		// TODO Auto-generated method stub
  	}
  
***************
*** 31,34 ****
--- 49,66 ----
  
  	public void run(IAction action) {
+ 		if(null != profileToUse) {
+ 			if(FilePanelPlugin.PROFILE_NORTON_COMMANDER.equalsIgnoreCase(profileToUse)) {
+ 				configureStoreForNc();
+ 			} else if(FilePanelPlugin.PROFILE_WINDOWS_EXPLORER.equalsIgnoreCase(profileToUse)) {
+ 				configureStoreForWe();
+ 			} else {
+ 				showDialog();
+ 			}
+ 		} else {
+ 			showDialog();
+ 		}
+ 	}
+ 
+ 	private void showDialog() {
  		int shellStyle = SWT.TITLE | SWT.CLOSE | SWT.BORDER | SWT.RESIZE | SWT.APPLICATION_MODAL;
  		
***************
*** 39,43 ****
  		ImageDescriptor imgDesc = AppPlugin.imageDescriptorFromPlugin(AppPlugin.PLUGIN_ID, "icons/small_icon.png");
  		dialog.setImage(imgDesc.createImage(dialog.getDisplay()));
! 	
  		dialog.setText("Choose Layout Profile");
  		dialog.setLayout(new FillLayout());
--- 71,75 ----
  		ImageDescriptor imgDesc = AppPlugin.imageDescriptorFromPlugin(AppPlugin.PLUGIN_ID, "icons/small_icon.png");
  		dialog.setImage(imgDesc.createImage(dialog.getDisplay()));
! 
  		dialog.setText("Choose Layout Profile");
  		dialog.setLayout(new FillLayout());
***************
*** 62,83 ****
  		composite.getOkButton().addSelectionListener(new SelectionAdapter() {
  			public void widgetSelected(SelectionEvent e) {
- 				IPreferenceStore store = FilePanelPlugin.getDefault().getPreferenceStore();
- 				
  				if(composite.getWeRadioButton().getSelection()) {
! 					store.setValue(FilePanelPlugin.SHOW_FUNCTION_BAR_KEY, false);
! 					store.setValue(FilePanelPlugin.SHOW_FILE_DETAILS, false);
! 					store.setValue(FilePanelPlugin.SHOW_DIRECTORY_TREE, true);
! 					store.setValue(FilePanelPlugin.HIDE_RIGHT_PANEL, true);
! 					store.setValue(FilePanelPlugin.SHOW_EXT_NAMES, true);
  				} else {
! 					store.setValue(FilePanelPlugin.SHOW_FUNCTION_BAR_KEY, true);
! 					store.setValue(FilePanelPlugin.SHOW_FILE_DETAILS, true);
! 					store.setValue(FilePanelPlugin.SHOW_DIRECTORY_TREE, false);
! 					store.setValue(FilePanelPlugin.HIDE_RIGHT_PANEL, false);
! 					store.setValue(FilePanelPlugin.SHOW_EXT_NAMES, false);
  				}
  				
  				dialog.dispose();
! 			}
  		});
  		
--- 94,105 ----
  		composite.getOkButton().addSelectionListener(new SelectionAdapter() {
  			public void widgetSelected(SelectionEvent e) {
  				if(composite.getWeRadioButton().getSelection()) {
! 					configureStoreForWe();
  				} else {
! 					configureStoreForNc();
  				}
  				
  				dialog.dispose();
! 			}			
  		});
  		
***************
*** 102,105 ****
--- 124,151 ----
  	}
  
+ 	/**
+ 	 * Configure the store for Norton Commander use style.
+ 	 */
+ 	private void configureStoreForNc() {
+ 		IPreferenceStore store = FilePanelPlugin.getDefault().getPreferenceStore();
+ 		store.setValue(FilePanelPlugin.SHOW_FUNCTION_BAR_KEY, true);
+ 		store.setValue(FilePanelPlugin.SHOW_FILE_DETAILS, true);
+ 		store.setValue(FilePanelPlugin.SHOW_DIRECTORY_TREE, false);
+ 		store.setValue(FilePanelPlugin.HIDE_RIGHT_PANEL, false);
+ 		store.setValue(FilePanelPlugin.SHOW_EXT_NAMES, false);
+ 	}
+ 
+ 	/**
+ 	 * Configure the store for Windows Explorer use style.
+ 	 */
+ 	private void configureStoreForWe() {
+ 		IPreferenceStore store = FilePanelPlugin.getDefault().getPreferenceStore();
+ 		store.setValue(FilePanelPlugin.SHOW_FUNCTION_BAR_KEY, false);
+ 		store.setValue(FilePanelPlugin.SHOW_FILE_DETAILS, false);
+ 		store.setValue(FilePanelPlugin.SHOW_DIRECTORY_TREE, true);
+ 		store.setValue(FilePanelPlugin.HIDE_RIGHT_PANEL, true);
+ 		store.setValue(FilePanelPlugin.SHOW_EXT_NAMES, true);
+ 	}
+ 	
  	public void selectionChanged(IAction action, ISelection selection) {
  		// TODO Auto-generated method stub

[Jcommander-commit] plugins/org.jcommander.ui.app/src/org/jcommander/ui/app JCmdWorkbenchAdvisor.java, 1.39, 1.40 StartupParameters.java, 1.2, 1.3

[Dan C. <cor...@us...>]

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.app/src/org/jcommander/ui/app
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv11561/src/org/jcommander/ui/app

Modified Files:
	JCmdWorkbenchAdvisor.java StartupParameters.java 
Log Message:
Added support for a new cmd line parameter:
-profile nc/wc
and a new property definition
-Dorg.jcommander.profile nc/wc
This was needed for bypassing the first dialog when starting the application with an empty workspace. SWTBot can not handle the dialog until the workbench is fully started.
See  ID: 2932702

Index: StartupParameters.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.app/src/org/jcommander/ui/app/StartupParameters.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** StartupParameters.java	6 Aug 2006 10:32:17 -0000	1.2
--- StartupParameters.java	17 Jan 2010 17:12:06 -0000	1.3
***************
*** 6,9 ****
--- 6,10 ----
  import org.apache.commons.cli.*;
  import org.apache.commons.vfs.*;
+ import org.jcommander.ui.filepanel.FilePanelPlugin;
  import org.jcommander.vfsextensions.*;
  
***************
*** 16,19 ****
--- 17,21 ----
  
  public class StartupParameters {
+ 	public final ProfileSettings PROFILE = new ProfileSettings();
  	public final CompareFileSettings COMPARE = new CompareFileSettings(); 
  	public final CopyDefaultTargetSettings COPY_TARGET 	= new CopyDefaultTargetSettings(); 
***************
*** 24,28 ****
  	public final SingletonPortSettings SINGLETON_PORT 	= new SingletonPortSettings(); 
  	
! 	private final AbstractSettings[] ALL_SETTINGS = {COMPARE, COPY_TARGET, COPY, 
  			NEW_TAB, NEW_WINDOW, SINGLETON_INSTANCE, SINGLETON_PORT};
  	
--- 26,30 ----
  	public final SingletonPortSettings SINGLETON_PORT 	= new SingletonPortSettings(); 
  	
! 	private final AbstractSettings[] ALL_SETTINGS = {PROFILE, COMPARE, COPY_TARGET, COPY, 
  			NEW_TAB, NEW_WINDOW, SINGLETON_INSTANCE, SINGLETON_PORT};
  	
***************
*** 250,253 ****
--- 252,292 ----
  	}
  	
+ 	public static class ProfileSettings extends AbstractSettings {
+ 
+ 		private String profile = "";
+ 
+ 		protected void fillFrom(CommandLine commandLine) {
+ 			String[] str = commandLine.getOptionValues("profile");
+ 			if ((str == null) || (str.length < 1)) {
+ 				return;
+ 			}
+ 			if (str[0]
+ 					.equalsIgnoreCase(FilePanelPlugin.PROFILE_NORTON_COMMANDER)) {
+ 				this.profile = FilePanelPlugin.PROFILE_NORTON_COMMANDER;
+ 				raiseConfigured();
+ 			} else if (str[0]
+ 					.equalsIgnoreCase(FilePanelPlugin.PROFILE_WINDOWS_EXPLORER)) {
+ 				this.profile = FilePanelPlugin.PROFILE_WINDOWS_EXPLORER;
+ 				raiseConfigured();
+ 			}
+ 		}
+ 
+ 		protected Option getOption() {
+ 			OptionBuilder.withArgName("profile");
+ 			OptionBuilder.hasArg();
+ 			OptionBuilder.withDescription("Default profile to be used. Values can be 'we' for windows explorer or 'nc' for norton commander");
+ 			return OptionBuilder.create("profile");
+ 		}
+ 
+ 		/**
+ 		 * 
+ 		 * @return One of {@link FilePanelPlugin#PROFILE_NORTON_COMMANDER} or {@link FilePanelPlugin#PROFILE_WINDOWS_EXPLORER}
+ 		 */
+ 		public String getProfile() {
+ 			return profile;
+ 		}
+ 		
+ 	}
+ 	
  	public static class CompareFileSettings extends AbstractSettings{
  		private FileObject left;

Index: JCmdWorkbenchAdvisor.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.app/src/org/jcommander/ui/app/JCmdWorkbenchAdvisor.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** JCmdWorkbenchAdvisor.java	14 Dec 2009 11:30:17 -0000	1.39
--- JCmdWorkbenchAdvisor.java	17 Jan 2010 17:12:06 -0000	1.40
***************
*** 79,84 ****
  		IPreferenceStore appPrefStore = AppPlugin.getDefault().getPreferenceStore();
  
! 		if(appPrefStore.getBoolean(AppPlugin.FIRST_STARTUP_KEY)) {
! 			new ChooseProfile().run(null);
  		}
  	}
--- 79,100 ----
  		IPreferenceStore appPrefStore = AppPlugin.getDefault().getPreferenceStore();
  
! 		String requestedProfile = null;
! 		boolean profileRequestedByUser = startupParameters.PROFILE.configured();
! 		if(profileRequestedByUser) {
! 			requestedProfile = startupParameters.PROFILE.getProfile();
! 		} else {
! 			// try the java properties
! 			requestedProfile = System.getProperty("org.jcommander.profile");
! 		}
! 		
! 		if(appPrefStore.getBoolean(AppPlugin.FIRST_STARTUP_KEY) 
! 				|| null != requestedProfile) {
! 			ChooseProfile chooseProfileAction = null;
! 			if(null != requestedProfile) {
! 				chooseProfileAction = new ChooseProfile(requestedProfile);
! 			} else {
! 				chooseProfileAction = new ChooseProfile();
! 			}
! 			chooseProfileAction.run(null);
  		}
  	}

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

[Dan C. <cor...@us...>]

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv11523/src/org/jcommander/ui/filepanel

Modified Files:
	FilePanelPlugin.java 
Log Message:
Added support for a new cmd line parameter:
-profile nc/wc
and a new property definition
-Dorg.jcommander.profile nc/wc
This was needed for bypassing the first dialog when starting the application with an empty workspace. SWTBot can not handle the dialog until the workbench is fully started.
See  ID: 2932702

Index: FilePanelPlugin.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/FilePanelPlugin.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** FilePanelPlugin.java	6 Aug 2006 10:33:25 -0000	1.21
--- FilePanelPlugin.java	17 Jan 2010 17:12:03 -0000	1.22
***************
*** 18,21 ****
--- 18,26 ----
  	private static FilePanelPlugin plugin;
  	
+ 	//Constants used for selecting the look and feel of the application
+ 	//TODO Change the project's java compiler to 1.5 and replace these with an enumeration
+ 	public static final String PROFILE_NORTON_COMMANDER = "nc";
+ 	public static final String PROFILE_WINDOWS_EXPLORER = "we";
+ 	
  	//Resource bundle.
  	private ResourceBundle resourceBundle;

[Jcommander-commit] plugins/org.jcommander.ui.app/src/org/jcommander/ui/app PlatformRunnable.java, 1.11, 1.12

[Dan C. <cor...@us...>]

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.app/src/org/jcommander/ui/app
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv30451/src/org/jcommander/ui/app

Modified Files:
	PlatformRunnable.java 
Log Message:
IPlatformRunnable is deprecated and was replaced by IApplication.
For SWTBot to be able to find our plugin, we must make it implement IApplication.
See  ID: 2932702

Index: PlatformRunnable.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.app/src/org/jcommander/ui/app/PlatformRunnable.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** PlatformRunnable.java	6 Aug 2006 10:32:17 -0000	1.11
--- PlatformRunnable.java	17 Jan 2010 16:33:18 -0000	1.12
***************
*** 4,13 ****
  package org.jcommander.ui.app;
  
! import org.eclipse.core.runtime.*;
! import org.eclipse.osgi.service.datalocation.*;
! import org.eclipse.swt.widgets.*;
! import org.eclipse.ui.*;
! import org.jcommander.ui.app.singleton.*;
! import org.jcommander.ui.logger.*;
  
  /**
--- 4,16 ----
  package org.jcommander.ui.app;
  
! import org.eclipse.core.runtime.Platform;
! import org.eclipse.equinox.app.IApplication;
! import org.eclipse.equinox.app.IApplicationContext;
! import org.eclipse.osgi.service.datalocation.Location;
! import org.eclipse.swt.widgets.Display;
! import org.eclipse.ui.PlatformUI;
! import org.jcommander.ui.app.singleton.ApplicationEntryPoint;
! import org.jcommander.ui.app.singleton.SingletonAppLauncher;
! import org.jcommander.ui.logger.LoggerPlugin;
  
  /**
***************
*** 16,20 ****
   * @author sky_halud
   */
! public class PlatformRunnable implements IPlatformRunnable {
  
  	// TODO Implement support for command line parameters
--- 19,23 ----
   * @author sky_halud
   */
! public class PlatformRunnable implements IApplication {
  
  	// TODO Implement support for command line parameters
***************
*** 25,30 ****
  	 * 			those running stand-alone.
  	 */
! 	public Object run(Object args) throws Exception {		
  		String[] strArgs = null;
  		if(args instanceof String[]){
  			strArgs = (String[])args;
--- 28,34 ----
  	 * 			those running stand-alone.
  	 */
! 	public Object start(IApplicationContext context) throws Exception {		
  		String[] strArgs = null;
+ 		Object args = context.getArguments().get(IApplicationContext.APPLICATION_ARGS);
  		if(args instanceof String[]){
  			strArgs = (String[])args;
***************
*** 48,52 ****
  			if(!first){
  				LoggerPlugin.rootLogger.info("Exitting from duplicate instance");
! 				return IPlatformRunnable.EXIT_OK;
  			}
  		}
--- 52,56 ----
  			if(!first){
  				LoggerPlugin.rootLogger.info("Exitting from duplicate instance");
! 				return IApplication.EXIT_OK;
  			}
  		}
***************
*** 54,60 ****
  		
  		if(returnCode == PlatformUI.RETURN_RESTART){
! 			return IPlatformRunnable.EXIT_RESTART;
  		}else{
! 			return IPlatformRunnable.EXIT_OK;
  		}
  	}
--- 58,64 ----
  		
  		if(returnCode == PlatformUI.RETURN_RESTART){
! 			return IApplication.EXIT_RESTART;
  		}else{
! 			return IApplication.EXIT_OK;
  		}
  	}
***************
*** 111,114 ****
--- 115,123 ----
  		}
  	}
+ 
+ 	public void stop() {
+ 		// TODO Auto-generated method stub
+ 		
+ 	}
  	
  }

[Jcommander-commit] plugins/org.jcommander.vfsextensions/src/org/jcommander/vfsextensions VfsManagerExtension.java, 1.22, 1.23

[Dan C. <cor...@us...>]

Update of /cvsroot/jcommander/plugins/org.jcommander.vfsextensions/src/org/jcommander/vfsextensions
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv29689/src/org/jcommander/vfsextensions

Modified Files:
	VfsManagerExtension.java 
Log Message:
The attribute fileSystemManager is not used any more.

Index: VfsManagerExtension.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.vfsextensions/src/org/jcommander/vfsextensions/VfsManagerExtension.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** VfsManagerExtension.java	20 Nov 2006 06:01:24 -0000	1.22
--- VfsManagerExtension.java	17 Jan 2010 16:28:11 -0000	1.23
***************
*** 19,23 ****
  	protected static final String LOCAL_FILE_URI = "file:/";
  	protected static VfsManagerExtension instance;
- 	protected FileSystemManager fileSystemManager;
  	protected static FileUtil fileUtil;
  	protected static FileSystemOptions defaultFsOpts;
--- 19,22 ----

[Jcommander-commit] plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/model IFileControlModelListener.java, 1.1, 1.2 FileControlModel.java, 1.58, 1.59

[Dan C. <cor...@us...>]

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/model
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv2040/src/org/jcommander/ui/filepanel/model

Modified Files:
	FileControlModel.java 
Added Files:
	IFileControlModelListener.java 
Log Message:
Temporary workaround: do not use SWT.VIRTUAL and the 

--- NEW FILE: IFileControlModelListener.java ---
package org.jcommander.ui.filepanel.model;

public interface IFileControlModelListener {

	void contentChanged();
	
}

Index: FileControlModel.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/model/FileControlModel.java,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** FileControlModel.java	6 Aug 2006 10:33:25 -0000	1.58
--- FileControlModel.java	10 Jan 2010 11:48:56 -0000	1.59
***************
*** 7,24 ****
  package org.jcommander.ui.filepanel.model;
  
! import java.text.*;
! import java.util.*;
  
! import org.apache.commons.vfs.*;
! import org.apache.log4j.*;
! import org.eclipse.jface.resource.*;
! import org.eclipse.jface.viewers.deferred.*;
! import org.eclipse.swt.graphics.*;
! import org.eclipse.swt.program.*;
! import org.eclipse.swt.widgets.*;
! import org.jcommander.ui.filepanel.*;
! import org.jcommander.ui.filepanel.controls.*;
! import org.jcommander.ui.utils.*;
! import org.jcommander.vfsextensions.*;
  
  /**
--- 7,40 ----
  package org.jcommander.ui.filepanel.model;
  
! import java.text.DateFormat;
! import java.util.Date;
! import java.util.Enumeration;
! import java.util.HashMap;
! import java.util.Hashtable;
! import java.util.Iterator;
! import java.util.LinkedList;
! import java.util.List;
! import java.util.Vector;
  
! import org.apache.commons.vfs.Capability;
! import org.apache.commons.vfs.FileObject;
! import org.apache.commons.vfs.FileSystemException;
! import org.apache.commons.vfs.FileType;
! import org.apache.log4j.Logger;
! import org.eclipse.jface.resource.ImageRegistry;
! import org.eclipse.swt.graphics.Color;
! import org.eclipse.swt.graphics.Image;
! import org.eclipse.swt.graphics.ImageData;
! import org.eclipse.swt.program.Program;
! import org.eclipse.swt.widgets.Display;
! import org.jcommander.ui.filepanel.FilePanelPlugin;
! import org.jcommander.ui.filepanel.TabMediator;
! import org.jcommander.ui.filepanel.controls.FileTableControl;
! import org.jcommander.ui.filepanel.controls.MarkerInfo;
! import org.jcommander.ui.utils.FixedSizeQueue;
! import org.jcommander.ui.utils.FormatUtils;
! import org.jcommander.ui.utils.ImageBroker;
! import org.jcommander.ui.utils.MessageDisplayer;
! import org.jcommander.vfsextensions.VfsManagerExtension;
  
  /**
***************
*** 27,31 ****
   * This is the model for the file control.
   */
! public class FileControlModel extends SetModel{
  	
  	Logger logger = Logger.getLogger(getClass());
--- 43,47 ----
   * This is the model for the file control.
   */
! public class FileControlModel {
  	
  	Logger logger = Logger.getLogger(getClass());
***************
*** 35,43 ****
  	private static final int MAX_NAVIGATION_HISTORY_SIZE = 20; 
      
  	protected Hashtable markedContents;
  	protected Hashtable highlightedContents;
  	protected FileObject currentParent;
  	protected FileObject[] contents;
! 	protected FileDetails[] sortedDetails;
  	
  	/** Should this be made static? */
--- 51,63 ----
  	private static final int MAX_NAVIGATION_HISTORY_SIZE = 20; 
      
+ 	/**
+ 	 *  A list of {@link IFileControlModelListener}
+ 	 */
+ 	protected List listeners = new LinkedList();
  	protected Hashtable markedContents;
  	protected Hashtable highlightedContents;
  	protected FileObject currentParent;
  	protected FileObject[] contents;
! 	protected FileDetails[] sortedDetails = new FileDetails[]{};
  	
  	/** Should this be made static? */
***************
*** 599,603 ****
  			
  			entered = 0;
! 			set(sortedDetails);
  		}
  	}
--- 619,623 ----
  			
  			entered = 0;
! 			fireContentChanged(sortedDetails);
  		}
  	}
***************
*** 626,630 ****
  			((FileDetails)sortedDetails[index]).getDetails()[FileTableControl.FLAG_COLUMN] = flag;
  		}
! 		set(sortedDetails);
  	}
  	
--- 646,650 ----
  			((FileDetails)sortedDetails[index]).getDetails()[FileTableControl.FLAG_COLUMN] = flag;
  		}
! 		fireContentChanged(sortedDetails);
  	}
  	
***************
*** 644,648 ****
  					}
  					entered++;
! 					set(sortedDetails);
  				}
  			}
--- 664,668 ----
  					}
  					entered++;
! 					fireContentChanged(sortedDetails);
  				}
  			}
***************
*** 752,756 ****
  		}
  
! 		set(sortedDetails);
  	}
  	
--- 772,776 ----
  		}
  
! 		fireContentChanged(sortedDetails);
  	}
  	
***************
*** 772,784 ****
  			}
  		}
! 		set(sortedDetails);		
  	}
  	
- 	public void requestUpdate(IConcurrentModelListener listener) {
- 		
- 
- 		super.requestUpdate(listener);
- 	}
- 
  	public FileTableControl getControl() {
  		return control;
--- 792,798 ----
  			}
  		}
! 		fireContentChanged(sortedDetails);		
  	}
  	
  	public FileTableControl getControl() {
  		return control;
***************
*** 899,902 ****
  		return sortedContents;
  	}
! 		
  }
\ No newline at end of file
--- 913,939 ----
  		return sortedContents;
  	}
! 
! 	private void fireUpdate(FileObject[] files) {
! 		// TODO Auto-generated method stub
! 	}
! 	
! 	private void fireContentChanged(FileDetails[] sortedDetails) {
! 		Iterator it = listeners.iterator();
! 		while (it.hasNext()) {
! 			IFileControlModelListener listener = (IFileControlModelListener) it.next();
! 			listener.contentChanged();
! 		}
! 	}
! 	
! 	public FileDetails[] getElements() {
! 		return sortedDetails;
! 	}
! 	
! 	public void addListener(IFileControlModelListener controlModelListener) {
! 		this.listeners.add(controlModelListener);
! 	}
! 	
! 	public void removeListener(IFileControlModelListener controlModelListener) {
! 		this.listeners.remove(controlModelListener);
! 	}
  }
\ No newline at end of file

[Jcommander-commit] plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls FileTableContentProvider.java, 1.1, 1.2 FileTableControl.java, 1.91, 1.92

[Dan C. <cor...@us...>]

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv2040/src/org/jcommander/ui/filepanel/controls

Modified Files:
	FileTableControl.java 
Added Files:
	FileTableContentProvider.java 
Log Message:
Temporary workaround: do not use SWT.VIRTUAL and the 

--- NEW FILE: FileTableContentProvider.java ---
package org.jcommander.ui.filepanel.controls;

import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.Viewer;
import org.jcommander.ui.filepanel.model.FileControlModel;
import org.jcommander.ui.filepanel.model.IFileControlModelListener;

public class FileTableContentProvider implements IStructuredContentProvider,
		IFileControlModelListener {

	private FileControlModel model;
	private TableViewer viewer;

	public Object[] getElements(Object inputElement) {
		if (null != this.model) {
			return this.model.getElements();
		}
		return new Object[] {};
	}

	public void dispose() {
		// TODO Auto-generated method stub

	}

	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
		if (null != oldInput) {
			((FileControlModel) oldInput).removeListener(this);
		}
		if (null != newInput) {
			((FileControlModel) newInput).addListener(this);
		}
		this.model = ((FileControlModel) newInput);
		this.viewer = (TableViewer) viewer;
	}

	public void contentChanged() {
		viewer.refresh();
	}

}

Index: FileTableControl.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls/FileTableControl.java,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -d -r1.91 -r1.92
*** FileTableControl.java	6 Aug 2006 10:33:26 -0000	1.91
--- FileTableControl.java	10 Jan 2010 11:48:56 -0000	1.92
***************
*** 93,97 ****
  	protected Image COLUMN_SORT_DESCENDING_IMAGE;
  	
! 	IContentProvider contentProvider = new DeferredContentProvider(sortedColumnComparator);
  
  	class FileTableLabelProvider implements ITableLabelProvider, ITableColorProvider {
--- 93,97 ----
  	protected Image COLUMN_SORT_DESCENDING_IMAGE;
  	
! 	IContentProvider contentProvider = new FileTableContentProvider();
  
  	class FileTableLabelProvider implements ITableLabelProvider, ITableColorProvider {
***************
*** 256,261 ****
  									| SWT.H_SCROLL
  									| SWT.SINGLE 
! 									| SWT.FULL_SELECTION 
! 									| SWT.VIRTUAL);
  		
  		table.setFont(JFaceResources.getDialogFont());
--- 256,261 ----
  									| SWT.H_SCROLL
  									| SWT.SINGLE 
! 									| SWT.FULL_SELECTION); 
! //									| SWT.VIRTUAL);
  		
  		table.setFont(JFaceResources.getDialogFont());
***************
*** 720,723 ****
--- 720,724 ----
  	public void setModel(FileControlModel model) {
  		this.model = model;
+ 		tableViewer.setInput(this.model);
  		model.setControl(this);
  	}
***************
*** 835,839 ****
  		}
  		
! 		((DeferredContentProvider)contentProvider).setSortOrder(sortedColumnComparator);
  		
  		updateColumnTitles(absoluteColumnIndex);
--- 836,840 ----
  		}
  		
! //		((DeferredContentProvider)contentProvider).setSortOrder(sortedColumnComparator);
  		
  		updateColumnTitles(absoluteColumnIndex);

[Jcommander-commit] CVSROOT avail,1.22,1.23

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

Update of /cvsroot/jcommander/CVSROOT
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv28953

Modified Files:
	avail 
Log Message:
Refined Dan's rights

Index: avail
===================================================================
RCS file: /cvsroot/jcommander/CVSROOT/avail,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** avail	6 Jan 2010 15:22:07 -0000	1.22
--- avail	8 Jan 2010 19:11:10 -0000	1.23
***************
*** 3,7 ****
  avail|mhanganu
  avail|renyedi
! avail|corneanu_dan
  avail|crazzycloe|plugins
  avail|mikesg|plugins
--- 3,7 ----
  avail|mhanganu
  avail|renyedi
! avail|corneanu_dan|plugins
  avail|crazzycloe|plugins
  avail|mikesg|plugins

[Jcommander-commit] plugins/org.jcommander.ui.app/src/org/jcommander/ui/app/singleton SingletonAppLauncher.java, 1.3, 1.4

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

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.app/src/org/jcommander/ui/app/singleton
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv28895/src/org/jcommander/ui/app/singleton

Modified Files:
	SingletonAppLauncher.java 
Log Message:
Improved logging

Index: SingletonAppLauncher.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.app/src/org/jcommander/ui/app/singleton/SingletonAppLauncher.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SingletonAppLauncher.java	15 Dec 2009 20:01:28 -0000	1.3
--- SingletonAppLauncher.java	8 Jan 2010 19:10:20 -0000	1.4
***************
*** 111,114 ****
--- 111,115 ----
  		}
  		catch(IOException ex){
+ 			LOG.warn(ex, ex);
  			return false;
  		}
***************
*** 119,125 ****
  			return new ServerSocket(port);
  		} catch (IOException e) {
  			return null;
  		} catch(Throwable t){
! 			t.printStackTrace();
  			return null;
  		}
--- 120,127 ----
  			return new ServerSocket(port);
  		} catch (IOException e) {
+ 			LOG.warn(e, e);
  			return null;
  		} catch(Throwable t){
! 			LOG.warn(t, t);
  			return null;
  		}
***************
*** 176,180 ****
  				}
  				catch(Throwable t){
! 					t.printStackTrace();
  				}
  			}
--- 178,182 ----
  				}
  				catch(Throwable t){
! 					LOG.warn(t, t);
  				}
  			}

[Jcommander-commit] plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls FileTableContentProvider.java, NONE, 1.1.2.1 FileTableControl.java, 1.91, 1.91.2.1

[Dan C. <cor...@us...>]

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv7462/src/org/jcommander/ui/filepanel/controls

Modified Files:
      Tag: no_VIRTUAL
	FileTableControl.java 
Added Files:
      Tag: no_VIRTUAL
	FileTableContentProvider.java 
Log Message:
do not use SWT.VIRTUAL tables because of the multiple bugs found in the eclipse code.
See issue ID: 2915373

--- NEW FILE: FileTableContentProvider.java ---
package org.jcommander.ui.filepanel.controls;

import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.Viewer;
import org.jcommander.ui.filepanel.model.FileControlModel;
import org.jcommander.ui.filepanel.model.IFileControlModelListener;

public class FileTableContentProvider implements IStructuredContentProvider,
		IFileControlModelListener {

	private FileControlModel model;
	private TableViewer viewer;

	public Object[] getElements(Object inputElement) {
		if (null != this.model) {
			return this.model.getElements();
		}
		return new Object[] {};
	}

	public void dispose() {
		// TODO Auto-generated method stub

	}

	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
		if (null != oldInput) {
			((FileControlModel) oldInput).removeListener(this);
		}
		if (null != newInput) {
			((FileControlModel) newInput).addListener(this);
		}
		this.model = ((FileControlModel) newInput);
		this.viewer = (TableViewer) viewer;
	}

	public void contentChanged() {
		viewer.refresh();
	}

}

Index: FileTableControl.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls/FileTableControl.java,v
retrieving revision 1.91
retrieving revision 1.91.2.1
diff -C2 -d -r1.91 -r1.91.2.1
*** FileTableControl.java	6 Aug 2006 10:33:26 -0000	1.91
--- FileTableControl.java	6 Jan 2010 19:14:11 -0000	1.91.2.1
***************
*** 93,97 ****
  	protected Image COLUMN_SORT_DESCENDING_IMAGE;
  	
! 	IContentProvider contentProvider = new DeferredContentProvider(sortedColumnComparator);
  
  	class FileTableLabelProvider implements ITableLabelProvider, ITableColorProvider {
--- 93,97 ----
  	protected Image COLUMN_SORT_DESCENDING_IMAGE;
  	
! 	IContentProvider contentProvider = new FileTableContentProvider();
  
  	class FileTableLabelProvider implements ITableLabelProvider, ITableColorProvider {
***************
*** 256,261 ****
  									| SWT.H_SCROLL
  									| SWT.SINGLE 
! 									| SWT.FULL_SELECTION 
! 									| SWT.VIRTUAL);
  		
  		table.setFont(JFaceResources.getDialogFont());
--- 256,261 ----
  									| SWT.H_SCROLL
  									| SWT.SINGLE 
! 									| SWT.FULL_SELECTION); 
! //									| SWT.VIRTUAL);
  		
  		table.setFont(JFaceResources.getDialogFont());
***************
*** 720,723 ****
--- 720,724 ----
  	public void setModel(FileControlModel model) {
  		this.model = model;
+ 		tableViewer.setInput(this.model);
  		model.setControl(this);
  	}
***************
*** 835,839 ****
  		}
  		
! 		((DeferredContentProvider)contentProvider).setSortOrder(sortedColumnComparator);
  		
  		updateColumnTitles(absoluteColumnIndex);
--- 836,840 ----
  		}
  		
! //		((DeferredContentProvider)contentProvider).setSortOrder(sortedColumnComparator);
  		
  		updateColumnTitles(absoluteColumnIndex);

[Jcommander-commit] plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/model IFileControlModelListener.java, NONE, 1.1.2.1 FileControlModel.java, 1.58, 1.58.2.1

[Dan C. <cor...@us...>]

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/model
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv7462/src/org/jcommander/ui/filepanel/model

Modified Files:
      Tag: no_VIRTUAL
	FileControlModel.java 
Added Files:
      Tag: no_VIRTUAL
	IFileControlModelListener.java 
Log Message:
do not use SWT.VIRTUAL tables because of the multiple bugs found in the eclipse code.
See issue ID: 2915373

--- NEW FILE: IFileControlModelListener.java ---
package org.jcommander.ui.filepanel.model;

public interface IFileControlModelListener {

	void contentChanged();
	
}

Index: FileControlModel.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/model/FileControlModel.java,v
retrieving revision 1.58
retrieving revision 1.58.2.1
diff -C2 -d -r1.58 -r1.58.2.1
*** FileControlModel.java	6 Aug 2006 10:33:25 -0000	1.58
--- FileControlModel.java	6 Jan 2010 19:14:11 -0000	1.58.2.1
***************
*** 7,24 ****
  package org.jcommander.ui.filepanel.model;
  
! import java.text.*;
! import java.util.*;
  
! import org.apache.commons.vfs.*;
! import org.apache.log4j.*;
! import org.eclipse.jface.resource.*;
! import org.eclipse.jface.viewers.deferred.*;
! import org.eclipse.swt.graphics.*;
! import org.eclipse.swt.program.*;
! import org.eclipse.swt.widgets.*;
! import org.jcommander.ui.filepanel.*;
! import org.jcommander.ui.filepanel.controls.*;
! import org.jcommander.ui.utils.*;
! import org.jcommander.vfsextensions.*;
  
  /**
--- 7,40 ----
  package org.jcommander.ui.filepanel.model;
  
! import java.text.DateFormat;
! import java.util.Date;
! import java.util.Enumeration;
! import java.util.HashMap;
! import java.util.Hashtable;
! import java.util.Iterator;
! import java.util.LinkedList;
! import java.util.List;
! import java.util.Vector;
  
! import org.apache.commons.vfs.Capability;
! import org.apache.commons.vfs.FileObject;
! import org.apache.commons.vfs.FileSystemException;
! import org.apache.commons.vfs.FileType;
! import org.apache.log4j.Logger;
! import org.eclipse.jface.resource.ImageRegistry;
! import org.eclipse.swt.graphics.Color;
! import org.eclipse.swt.graphics.Image;
! import org.eclipse.swt.graphics.ImageData;
! import org.eclipse.swt.program.Program;
! import org.eclipse.swt.widgets.Display;
! import org.jcommander.ui.filepanel.FilePanelPlugin;
! import org.jcommander.ui.filepanel.TabMediator;
! import org.jcommander.ui.filepanel.controls.FileTableControl;
! import org.jcommander.ui.filepanel.controls.MarkerInfo;
! import org.jcommander.ui.utils.FixedSizeQueue;
! import org.jcommander.ui.utils.FormatUtils;
! import org.jcommander.ui.utils.ImageBroker;
! import org.jcommander.ui.utils.MessageDisplayer;
! import org.jcommander.vfsextensions.VfsManagerExtension;
  
  /**
***************
*** 27,31 ****
   * This is the model for the file control.
   */
! public class FileControlModel extends SetModel{
  	
  	Logger logger = Logger.getLogger(getClass());
--- 43,47 ----
   * This is the model for the file control.
   */
! public class FileControlModel {
  	
  	Logger logger = Logger.getLogger(getClass());
***************
*** 35,43 ****
  	private static final int MAX_NAVIGATION_HISTORY_SIZE = 20; 
      
  	protected Hashtable markedContents;
  	protected Hashtable highlightedContents;
  	protected FileObject currentParent;
  	protected FileObject[] contents;
! 	protected FileDetails[] sortedDetails;
  	
  	/** Should this be made static? */
--- 51,63 ----
  	private static final int MAX_NAVIGATION_HISTORY_SIZE = 20; 
      
+ 	/**
+ 	 *  A list of {@link IFileControlModelListener}
+ 	 */
+ 	protected List listeners = new LinkedList();
  	protected Hashtable markedContents;
  	protected Hashtable highlightedContents;
  	protected FileObject currentParent;
  	protected FileObject[] contents;
! 	protected FileDetails[] sortedDetails = new FileDetails[]{};
  	
  	/** Should this be made static? */
***************
*** 599,603 ****
  			
  			entered = 0;
! 			set(sortedDetails);
  		}
  	}
--- 619,623 ----
  			
  			entered = 0;
! 			fireContentChanged(sortedDetails);
  		}
  	}
***************
*** 626,630 ****
  			((FileDetails)sortedDetails[index]).getDetails()[FileTableControl.FLAG_COLUMN] = flag;
  		}
! 		set(sortedDetails);
  	}
  	
--- 646,650 ----
  			((FileDetails)sortedDetails[index]).getDetails()[FileTableControl.FLAG_COLUMN] = flag;
  		}
! 		fireContentChanged(sortedDetails);
  	}
  	
***************
*** 644,648 ****
  					}
  					entered++;
! 					set(sortedDetails);
  				}
  			}
--- 664,668 ----
  					}
  					entered++;
! 					fireContentChanged(sortedDetails);
  				}
  			}
***************
*** 752,756 ****
  		}
  
! 		set(sortedDetails);
  	}
  	
--- 772,776 ----
  		}
  
! 		fireContentChanged(sortedDetails);
  	}
  	
***************
*** 772,784 ****
  			}
  		}
! 		set(sortedDetails);		
  	}
  	
- 	public void requestUpdate(IConcurrentModelListener listener) {
- 		
- 
- 		super.requestUpdate(listener);
- 	}
- 
  	public FileTableControl getControl() {
  		return control;
--- 792,798 ----
  			}
  		}
! 		fireContentChanged(sortedDetails);		
  	}
  	
  	public FileTableControl getControl() {
  		return control;
***************
*** 899,902 ****
  		return sortedContents;
  	}
! 		
  }
\ No newline at end of file
--- 913,939 ----
  		return sortedContents;
  	}
! 
! 	private void fireUpdate(FileObject[] files) {
! 		// TODO Auto-generated method stub
! 	}
! 	
! 	private void fireContentChanged(FileDetails[] sortedDetails) {
! 		Iterator it = listeners.iterator();
! 		while (it.hasNext()) {
! 			IFileControlModelListener listener = (IFileControlModelListener) it.next();
! 			listener.contentChanged();
! 		}
! 	}
! 	
! 	public FileDetails[] getElements() {
! 		return sortedDetails;
! 	}
! 	
! 	public void addListener(IFileControlModelListener controlModelListener) {
! 		this.listeners.add(controlModelListener);
! 	}
! 	
! 	public void removeListener(IFileControlModelListener controlModelListener) {
! 		this.listeners.remove(controlModelListener);
! 	}
  }
\ No newline at end of file

[Jcommander-commit] CVSROOT avail,1.21,1.22

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

Update of /cvsroot/jcommander/CVSROOT
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv23655

Modified Files:
	avail 
Log Message:
Updated

Index: avail
===================================================================
RCS file: /cvsroot/jcommander/CVSROOT/avail,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** avail	21 Mar 2006 09:46:19 -0000	1.21
--- avail	6 Jan 2010 15:22:07 -0000	1.22
***************
*** 3,6 ****
--- 3,7 ----
  avail|mhanganu
  avail|renyedi
+ avail|corneanu_dan
  avail|crazzycloe|plugins
  avail|mikesg|plugins

[Jcommander-commit] plugins/org.jcommander.ui.app/src/org/jcommander/ui/app/singleton SingletonAppLauncher.java, 1.2, 1.3

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

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.app/src/org/jcommander/ui/app/singleton
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv14659/src/org/jcommander/ui/app/singleton

Modified Files:
	SingletonAppLauncher.java 
Log Message:
Improved logging

Index: SingletonAppLauncher.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.app/src/org/jcommander/ui/app/singleton/SingletonAppLauncher.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SingletonAppLauncher.java	6 Aug 2006 10:32:17 -0000	1.2
--- SingletonAppLauncher.java	15 Dec 2009 20:01:28 -0000	1.3
***************
*** 6,9 ****
--- 6,11 ----
  import java.net.Socket;
  
+ import org.apache.log4j.Logger;
+ 
  
  /**
***************
*** 15,22 ****
  
  public class SingletonAppLauncher {
! 	private final ApplicationEntryPoint entryPoint; 
  	private final int fromPort;
  	private final int toPort;
! 	
  	public SingletonAppLauncher(ApplicationEntryPoint entryPoint, int fromPort, int toPort){
  		if(null == entryPoint){
--- 17,26 ----
  
  public class SingletonAppLauncher {
! 	protected static final Logger LOG = Logger.getLogger(SingletonAppLauncher.class);
! 
! 	private final ApplicationEntryPoint entryPoint;
  	private final int fromPort;
  	private final int toPort;
! 
  	public SingletonAppLauncher(ApplicationEntryPoint entryPoint, int fromPort, int toPort){
  		if(null == entryPoint){
***************
*** 34,40 ****
  		this.entryPoint = entryPoint;
  		this.fromPort = fromPort;
! 		this.toPort = toPort;		
  	}
! 	
  	public boolean startingFirstInstance(String[] params){
  		ServerSocket server = null;
--- 38,44 ----
  		this.entryPoint = entryPoint;
  		this.fromPort = fromPort;
! 		this.toPort = toPort;
  	}
! 
  	public boolean startingFirstInstance(String[] params){
  		ServerSocket server = null;
***************
*** 47,51 ****
  				}
  				else{
! 					try{ 
  						loopSocket.close();
  					}catch(Exception ex){}
--- 51,55 ----
  				}
  				else{
! 					try{
  						loopSocket.close();
  					}catch(Exception ex){}
***************
*** 82,86 ****
  		}
  	}
! 	
  	private boolean startSameApp(Socket sameApplication, String[] parameters){
  		try{
--- 86,90 ----
  		}
  	}
! 
  	private boolean startSameApp(Socket sameApplication, String[] parameters){
  		try{
***************
*** 110,114 ****
  		}
  	}
! 	
  	private ServerSocket tryToOccupy(int port){
  		try {
--- 114,118 ----
  		}
  	}
! 
  	private ServerSocket tryToOccupy(int port){
  		try {
***************
*** 121,125 ****
  		}
  	}
! 	
  	private Socket contactSameApplication(int port){
  		Socket client = null;
--- 125,129 ----
  		}
  	}
! 
  	private Socket contactSameApplication(int port){
  		Socket client = null;
***************
*** 127,131 ****
  		try {
  			client = new Socket(InetAddress.getLocalHost(), port);
! 			client.setSoTimeout(250);			
  			PrintWriter writer = new PrintWriter(client.getOutputStream());
  			BufferedReader reader = new BufferedReader(new InputStreamReader(client.getInputStream()));
--- 131,135 ----
  		try {
  			client = new Socket(InetAddress.getLocalHost(), port);
! 			client.setSoTimeout(250);
  			PrintWriter writer = new PrintWriter(client.getOutputStream());
  			BufferedReader reader = new BufferedReader(new InputStreamReader(client.getInputStream()));
***************
*** 139,146 ****
  			return null;
  		} catch (IOException e) {
! 			System.err.println("Error communicating:" + e);
  			return null;
  		} catch (Throwable t){
! 			t.printStackTrace();
  			return null;
  		} finally{
--- 143,150 ----
  			return null;
  		} catch (IOException e) {
! 			LOG.warn("Error communicating:" + e, e);
  			return null;
  		} catch (Throwable t){
! 			LOG.warn(t, t);
  			return null;
  		} finally{
***************
*** 152,168 ****
  		}
  	}
! 	
  	private static class HandshakeServer {
  		protected final ServerSocket socket;
  		protected final ApplicationEntryPoint entryPoint;
! 		
  		public HandshakeServer(ServerSocket socket, ApplicationEntryPoint entryPoint){
  			if(null == socket){
  				throw new NullPointerException("socket");
! 			}		
  			if(null == entryPoint){
  				throw new NullPointerException("entryPoint");
! 			}		
! 			this.socket = socket;		
  			this.entryPoint = entryPoint;
  			while(true){
--- 156,172 ----
  		}
  	}
! 
  	private static class HandshakeServer {
  		protected final ServerSocket socket;
  		protected final ApplicationEntryPoint entryPoint;
! 
  		public HandshakeServer(ServerSocket socket, ApplicationEntryPoint entryPoint){
  			if(null == socket){
  				throw new NullPointerException("socket");
! 			}
  			if(null == entryPoint){
  				throw new NullPointerException("entryPoint");
! 			}
! 			this.socket = socket;
  			this.entryPoint = entryPoint;
  			while(true){
***************
*** 176,180 ****
  			}
  		}
! 		
  		private class ClientHandler implements Runnable{
  			private final Socket socket;
--- 180,184 ----
  			}
  		}
! 
  		private class ClientHandler implements Runnable{
  			private final Socket socket;
***************
*** 185,189 ****
  				this.socket = socket;
  			}
! 			
  			public void run(){
  				try{
--- 189,193 ----
  				this.socket = socket;
  			}
! 
  			public void run(){
  				try{
***************
*** 205,213 ****
  				}
  				catch(IOException ex){
! 					ex.printStackTrace();
! 					System.out.println(ex);
  				}
  			}
! 			
  			private String handleLine(String line){
  				if(Requests.RETRIEVE_ID_REQUEST.equalsIgnoreCase(line)){
--- 209,216 ----
  				}
  				catch(IOException ex){
! 					LOG.warn(ex, ex);
  				}
  			}
! 
  			private String handleLine(String line){
  				if(Requests.RETRIEVE_ID_REQUEST.equalsIgnoreCase(line)){
***************
*** 227,231 ****
  				return "UNKNOWN:" + line;
  			}
! 			
  			private void startup(String line){
  				String[] params = null;
--- 230,234 ----
  				return "UNKNOWN:" + line;
  			}
! 
  			private void startup(String line){
  				String[] params = null;
***************
*** 240,251 ****
  				}, "STARTUP").start();
  			}
! 		}	
! 	}	
! 	
  	private static class Requests{
  		public static final String STARTUP_REQUEST = "STARTUP_";
  		public static final String DISCONNECT_REQUEST = "HANDSHAKE_DISCONNECT";
  		public static final String RETRIEVE_ID_REQUEST = "WHO_ARE_YOU";
! 		
  		private Requests(){}
  	}
--- 243,254 ----
  				}, "STARTUP").start();
  			}
! 		}
! 	}
! 
  	private static class Requests{
  		public static final String STARTUP_REQUEST = "STARTUP_";
  		public static final String DISCONNECT_REQUEST = "HANDSHAKE_DISCONNECT";
  		public static final String RETRIEVE_ID_REQUEST = "WHO_ARE_YOU";
! 
  		private Requests(){}
  	}

[Jcommander-commit] plugins/org.jcommander.systemshell.win32/.externalToolBuilders New_Builder.launch, 1.1, 1.2

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

Update of /cvsroot/jcommander/plugins/org.jcommander.systemshell.win32/.externalToolBuilders
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv10387/.externalToolBuilders

Modified Files:
	New_Builder.launch 
Log Message:
Disabled the native builders

Index: New_Builder.launch
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.systemshell.win32/.externalToolBuilders/New_Builder.launch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** New_Builder.launch	18 Sep 2005 18:44:41 -0000	1.1
--- New_Builder.launch	14 Dec 2009 11:32:58 -0000	1.2
***************
*** 1,13 ****
! <?xml version="1.0" encoding="UTF-8"?>
  <launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
! <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
  <booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
  <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
! <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
! <booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
! <stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/org.jcommander.systemshell.win32}"/>
  <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.jcommander.systemshell.win32/nativeBuild.xml}"/>
  <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
! <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
! <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
  </launchConfiguration>
--- 1,14 ----
! <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
! <booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
  <booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+ <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+ <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
+ <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
  <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
! <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
  <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.jcommander.systemshell.win32/nativeBuild.xml}"/>
+ <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
  <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
! <stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/org.jcommander.systemshell.win32}"/>
  </launchConfiguration>

[Jcommander-commit] plugins/org.jcommander.vfsextensions/.externalToolBuilders NativeBuild.launch, 1.1, 1.2

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

Update of /cvsroot/jcommander/plugins/org.jcommander.vfsextensions/.externalToolBuilders
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv10374/.externalToolBuilders

Modified Files:
	NativeBuild.launch 
Log Message:
Disabled the native builders

Index: NativeBuild.launch
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.vfsextensions/.externalToolBuilders/NativeBuild.launch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NativeBuild.launch	12 Nov 2005 16:03:58 -0000	1.1
--- NativeBuild.launch	14 Dec 2009 11:32:55 -0000	1.2
***************
*** 1,12 ****
! <?xml version="1.0" encoding="UTF-8"?>
  <launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
! <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
  <booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
  <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
! <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
! <booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
  <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.jcommander.vfsextensions/nativeBuild.xml}"/>
  <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
- <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
- <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
  </launchConfiguration>
--- 1,13 ----
! <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
! <booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
  <booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+ <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+ <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
+ <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
  <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
! <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
  <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.jcommander.vfsextensions/nativeBuild.xml}"/>
+ <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
  <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
  </launchConfiguration>

[Jcommander-commit] plugins/org.jcommander.ui.app plugin.xml, 1.103, 1.104

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

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.app
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv10128

Modified Files:
	plugin.xml 
Log Message:
Updated plugin dependencies. Updated to Eclipse 3.5

Index: plugin.xml
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.app/plugin.xml,v
retrieving revision 1.103
retrieving revision 1.104
diff -C2 -d -r1.103 -r1.104
*** plugin.xml	12 Jul 2006 13:03:45 -0000	1.103
--- plugin.xml	14 Dec 2009 11:31:11 -0000	1.104
***************
*** 25,29 ****
  		<import plugin="org.eclipse.help.ui" />
  		<import plugin="org.eclipse.help.webapp" />
- 		<import plugin="org.eclipse.tomcat" />
  		<import plugin="org.jcommander.ui.externaltools" />
  		<import plugin="org.jcommander.tools.nativemanager" />
--- 25,28 ----
***************
*** 39,43 ****
  		<import plugin="org.apache.commons"/>
  	</requires>
! 	
  	<extension id="JCmdApplication" name="%applicationName"
  		point="org.eclipse.core.runtime.applications">
--- 38,42 ----
  		<import plugin="org.apache.commons"/>
  	</requires>
! 
  	<extension id="JCmdApplication" name="%applicationName"
  		point="org.eclipse.core.runtime.applications">
***************
*** 46,50 ****
  		</application>
  	</extension>
! 	
  	<extension point="org.eclipse.ui.perspectives">
  		<perspective icon="icons/small_icon.png"
--- 45,49 ----
  		</application>
  	</extension>
! 
  	<extension point="org.eclipse.ui.perspectives">
  		<perspective icon="icons/small_icon.png"
***************
*** 52,56 ****
  			name="JCommander" id="org.jcommander.ui.app.JCmdPerspective" />
  	</extension>
! 	
  	<extension id="JCommander" name="JCommander"
  		point="org.eclipse.core.runtime.products">
--- 51,55 ----
  			name="JCommander" id="org.jcommander.ui.app.JCmdPerspective" />
  	</extension>
! 
  	<extension id="JCommander" name="JCommander"
  		point="org.eclipse.core.runtime.products">
***************
*** 63,68 ****
  				value="jcmd-backimage.gif"/>
  			<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 and initial contributor)&#x0A;&#x0A;Developers:&#x0A;- Michael Smith&#x0A;- Mike Grigorov&#x0A;- Matthias Kümmerer&#x0A;- Edgar Poce &#x0A;&#x0A;Graphical Design: Adrian Chromenko&#x0A;&#x0A;&#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"
--- 62,67 ----
  				value="jcmd-backimage.gif"/>
  			<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 and initial contributor)&#x0A;&#x0A;Developers:&#x0A;- Michael Smith&#x0A;- Mike Grigorov&#x0A;- Matthias Kümmerer&#x0A;- Edgar Poce &#x0A;&#x0A;Graphical Design: Adrian Chromenko&#x0A;&#x0A;&#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"
***************
*** 74,80 ****
  				name="startupProgressRect"
  				value="5,3,310,10"/>
  		</product>
  	</extension>
! 	
  	<extension id="org.jcommander.ui.app.JCmdActionSet"
  		name="JCommander Main Action Set" point="org.eclipse.ui.actionSets">
--- 73,87 ----
  				name="startupProgressRect"
  				value="5,3,310,10"/>
+    <property
+          name="appName"
+          value="JCommander">
+    </property>
+    <property
+          name="preferenceCustomization"
+          value="plugin_customization.ini">
+    </property>
  		</product>
  	</extension>
! 
  	<extension id="org.jcommander.ui.app.JCmdActionSet"
  		name="JCommander Main Action Set" point="org.eclipse.ui.actionSets">
***************
*** 84,88 ****
  				<groupMarker name="File.groupMarker1" />
  			</menu>
! 			
  			<menu id="jcmdviewmenu" label="&amp;View" path="view">
  				<groupMarker name="View.groupMarker1"/>
--- 91,95 ----
  				<groupMarker name="File.groupMarker1" />
  			</menu>
! 
  			<menu id="jcmdviewmenu" label="&amp;View" path="view">
  				<groupMarker name="View.groupMarker1"/>
***************
*** 99,103 ****
  				<groupMarker name="Panel.groupMarker3"/>
  			</menu>
! 			
  			<menu label="&amp;Operations" path="operations"
  				id="jcmdoperationsmenu">
--- 106,110 ----
  				<groupMarker name="Panel.groupMarker3"/>
  			</menu>
! 
  			<menu label="&amp;Operations" path="operations"
  				id="jcmdoperationsmenu">
***************
*** 232,236 ****
  				toolbarPath="JCmdGroup/File"
  				tooltip="Synchronize Other Panel"/>
! 				
  			<action
  				class="org.jcommander.ui.filepanel.actions.SwapPanelsAction"
--- 239,243 ----
  				toolbarPath="JCmdGroup/File"
  				tooltip="Synchronize Other Panel"/>
! 
  			<action
  				class="org.jcommander.ui.filepanel.actions.SwapPanelsAction"
***************
*** 301,305 ****
  				menubarPath="jcmdfilemenu/File.groupMarker1"
  				toolbarPath="JCmdGroup/File"
! 				tooltip="Open Directory URL (Simplified)"/>         
  
  			<action
--- 308,312 ----
  				menubarPath="jcmdfilemenu/File.groupMarker1"
  				toolbarPath="JCmdGroup/File"
! 				tooltip="Open Directory URL (Simplified)"/>
  
  			<action
***************
*** 374,378 ****
  				toolbarPath="JCmdGroup/Operations"
  				tooltip="Copy to Clipboard"/>
! 				
  			<action label="&amp;Show System Context Menu"
  				definitionId="org.jcommander.ui.app.ShowSystemContextMenuCommand"
--- 381,385 ----
  				toolbarPath="JCmdGroup/Operations"
  				tooltip="Copy to Clipboard"/>
! 
  			<action label="&amp;Show System Context Menu"
  				definitionId="org.jcommander.ui.app.ShowSystemContextMenuCommand"
***************
*** 434,438 ****
  				toolbarPath="JCmdGroup/Panel"
  				tooltip="Toggle the current selection"/>
!          
  			<action
  				class="org.jcommander.ui.filepanel.actions.FocusDirectoryInfoAction"
--- 441,445 ----
  				toolbarPath="JCmdGroup/Panel"
  				tooltip="Toggle the current selection"/>
! 
  			<action
  				class="org.jcommander.ui.filepanel.actions.FocusDirectoryInfoAction"
***************
*** 440,445 ****
  				icon="icons/invertCurrentSelection.png"
  				id="org.jcommander.ui.app.actions.FocusDirectoryInfo"
! 				label="Focus Directory Info Panel"/> 
!          
  			<action label="Show Navigation History"
  				class="org.jcommander.ui.filepanel.actions.ShowNavigationHistoryAction"
--- 447,452 ----
  				icon="icons/invertCurrentSelection.png"
  				id="org.jcommander.ui.app.actions.FocusDirectoryInfo"
! 				label="Focus Directory Info Panel"/>
! 
  			<action label="Show Navigation History"
  				class="org.jcommander.ui.filepanel.actions.ShowNavigationHistoryAction"
***************
*** 532,536 ****
  				definitionId="org.jcommander.ui.app.QuickFindCommand"
  				class="org.jcommander.ui.filepanel.actions.QuickFindAction"
! 				style="push" id="org.jcommander.ui.app.actions.QuickFind" 
  				menubarPath="jcmdselectionmenu/Panel.groupMarker0"
  				toolbarPath="JCmdGroup/Panel"
--- 539,543 ----
  				definitionId="org.jcommander.ui.app.QuickFindCommand"
  				class="org.jcommander.ui.filepanel.actions.QuickFindAction"
! 				style="push" id="org.jcommander.ui.app.actions.QuickFind"
  				menubarPath="jcmdselectionmenu/Panel.groupMarker0"
  				toolbarPath="JCmdGroup/Panel"
***************
*** 593,597 ****
  		</actionSet>
  	</extension>
! 	
  	<extension id="JCmdGeneralPrefs" name="JCmdGeneral"
  		point="org.eclipse.ui.preferencePages">
--- 600,604 ----
  		</actionSet>
  	</extension>
! 
  	<extension id="JCmdGeneralPrefs" name="JCmdGeneral"
  		point="org.eclipse.ui.preferencePages">
***************
*** 615,624 ****
  			name="Perspectives" id="org.jcommander.ui.app.PerspectivesPrefs" />
  	</extension>
! 	
  	<extension id="JCmdAppCommands" name="AppCommands"
  		point="org.eclipse.ui.commands">
  		<category name="Tabs"
  			id="org.jcommander.ui.app.categories.Tabs" />
! 			
  		<command description="Opens up a new tab"
  			categoryId="org.jcommander.ui.app.categories.Tabs" name="NewTab"
--- 622,631 ----
  			name="Perspectives" id="org.jcommander.ui.app.PerspectivesPrefs" />
  	</extension>
! 
  	<extension id="JCmdAppCommands" name="AppCommands"
  		point="org.eclipse.ui.commands">
  		<category name="Tabs"
  			id="org.jcommander.ui.app.categories.Tabs" />
! 
  		<command description="Opens up a new tab"
  			categoryId="org.jcommander.ui.app.categories.Tabs" name="NewTab"
***************
*** 632,636 ****
  			categoryId="org.jcommander.ui.app.categories.Tabs"
  			name="Open Location" id="org.jcommander.ui.app.OpenLocationCommand" />
! 		
  		<command description="Open URL"
  			categoryId="org.jcommander.ui.app.categories.Tabs"
--- 639,643 ----
  			categoryId="org.jcommander.ui.app.categories.Tabs"
  			name="Open Location" id="org.jcommander.ui.app.OpenLocationCommand" />
! 
  		<command description="Open URL"
  			categoryId="org.jcommander.ui.app.categories.Tabs"
***************
*** 692,696 ****
  			categoryId="org.jcommander.ui.app.categories.Tabs" name="Compare"
  			id="org.jcommander.ui.app.CompareCommand" />
! 			
  		<command description="Creates a new directory."
  			categoryId="org.jcommander.ui.app.categories.Tabs"
--- 699,703 ----
  			categoryId="org.jcommander.ui.app.categories.Tabs" name="Compare"
  			id="org.jcommander.ui.app.CompareCommand" />
! 
  		<command description="Creates a new directory."
  			categoryId="org.jcommander.ui.app.categories.Tabs"
***************
*** 822,826 ****
  		<command description="Synchronize Other Panel"
  			categoryId="org.jcommander.ui.app.categories.Tabs"
! 			name="Synchronize Other Panel" 
  			id="org.jcommander.ui.app.SynchronizeOtherPanelCommand" />
  
--- 829,833 ----
  		<command description="Synchronize Other Panel"
  			categoryId="org.jcommander.ui.app.categories.Tabs"
! 			name="Synchronize Other Panel"
  			id="org.jcommander.ui.app.SynchronizeOtherPanelCommand" />
  
***************
*** 839,848 ****
  			name="Choose Profile"
  			id="org.jcommander.ui.app.commands.ChooseProfile" />
! 		
  		<command description="Shows the welcome page."
  			categoryId="org.jcommander.ui.app.categories.Tabs"
  			name="Show Welcome Page"
  			id="org.jcommander.ui.app.commands.ShowWelcomePageCommand" />
! 			
  		<command description="Shows the native manager dialog."
  			categoryId="org.jcommander.ui.app.categories.Tabs"
--- 846,855 ----
  			name="Choose Profile"
  			id="org.jcommander.ui.app.commands.ChooseProfile" />
! 
  		<command description="Shows the welcome page."
  			categoryId="org.jcommander.ui.app.categories.Tabs"
  			name="Show Welcome Page"
  			id="org.jcommander.ui.app.commands.ShowWelcomePageCommand" />
! 
  		<command description="Shows the native manager dialog."
  			categoryId="org.jcommander.ui.app.categories.Tabs"
***************
*** 868,872 ****
  
  	</extension>
! 	
  	<extension id="JCmdManager"
  		name="The tab manager provided by JCommander"
--- 875,879 ----
  
  	</extension>
! 
  	<extension id="JCmdManager"
  		name="The tab manager provided by JCommander"
***************
*** 874,878 ****
  		<FilePanelManager class="org.jcommander.ui.app.JcmdManager" />
  	</extension>
! 	
  	<extension
  		point="org.jcommander.ui.filepanel.BookmarkConfiguration">
--- 881,885 ----
  		<FilePanelManager class="org.jcommander.ui.app.JcmdManager" />
  	</extension>
! 
  	<extension
  		point="org.jcommander.ui.filepanel.BookmarkConfiguration">
***************
*** 880,884 ****
  			class="org.jcommander.ui.app.ConfigurationBookmarkManager" />
  	</extension>
! 	
  	<extension id="org.jcommander.ui.app.JCmdPerspectiveExtension"
  		name="JCommander Main Perspective Extension"
--- 887,891 ----
  			class="org.jcommander.ui.app.ConfigurationBookmarkManager" />
  	</extension>
! 
  	<extension id="org.jcommander.ui.app.JCmdPerspectiveExtension"
  		name="JCommander Main Perspective Extension"
***************
*** 889,893 ****
  		</perspectiveExtension>
  	</extension>
! 	
  	<extension
  		point="org.eclipse.ui.views">
--- 896,900 ----
  		</perspectiveExtension>
  	</extension>
! 
  	<extension
  		point="org.eclipse.ui.views">
***************
*** 906,910 ****
  			id="org.jcommander.ui.app.JCmdScheme"
  			name="JCommander"/>
! 			
  		<key
  			contextId="org.eclipse.ui.contexts.dialogAndWindow"
--- 913,917 ----
  			id="org.jcommander.ui.app.JCmdScheme"
  			name="JCommander"/>
! 
  		<key
  			contextId="org.eclipse.ui.contexts.dialogAndWindow"
***************
*** 912,916 ****
  			commandId="org.jcommander.ui.app.commands.NewTab"
  			sequence="Ctrl+T"/>
! 			
  		<key
  			contextId="org.eclipse.ui.contexts.dialogAndWindow"
--- 919,923 ----
  			commandId="org.jcommander.ui.app.commands.NewTab"
  			sequence="Ctrl+T"/>
! 
  		<key
  			contextId="org.eclipse.ui.contexts.dialogAndWindow"
***************
*** 918,922 ****
  			commandId="org.jcommander.ui.app.FindInFilesCommand"
  			sequence="ALT+F7"/>
! 						
  		<key
  			contextId="org.eclipse.ui.contexts.dialogAndWindow"
--- 925,929 ----
  			commandId="org.jcommander.ui.app.FindInFilesCommand"
  			sequence="ALT+F7"/>
! 
  		<key
  			contextId="org.eclipse.ui.contexts.dialogAndWindow"
***************
*** 924,928 ****
  			commandId="org.jcommander.ui.app.OpenLocationCommand"
  			sequence="CTRL+L"/>
! 			
  		<key
  			contextId="org.eclipse.ui.contexts.dialogAndWindow"
--- 931,935 ----
  			commandId="org.jcommander.ui.app.OpenLocationCommand"
  			sequence="CTRL+L"/>
! 
  		<key
  			contextId="org.eclipse.ui.contexts.dialogAndWindow"
***************
*** 1008,1017 ****
  			commandId="org.jcommander.ui.app.RenameCommand"
  			sequence="F2"/>
! 			
  		<key
  			contextId="org.eclipse.ui.contexts.dialogAndWindow"
  			schemeId="org.jcommander.ui.app.JCmdScheme"
  			commandId="org.jcommander.ui.app.RenameCommand"
! 			sequence="Shift+F6"/>	
  
  		<key
--- 1015,1024 ----
  			commandId="org.jcommander.ui.app.RenameCommand"
  			sequence="F2"/>
! 
  		<key
  			contextId="org.eclipse.ui.contexts.dialogAndWindow"
  			schemeId="org.jcommander.ui.app.JCmdScheme"
  			commandId="org.jcommander.ui.app.RenameCommand"
! 			sequence="Shift+F6"/>
  
  		<key
***************
*** 1020,1024 ****
  			commandId="org.jcommander.ui.app.CompareCommand"
  			sequence="F10"/>
! 			
  		<key
  			contextId="org.eclipse.ui.contexts.dialogAndWindow"
--- 1027,1031 ----
  			commandId="org.jcommander.ui.app.CompareCommand"
  			sequence="F10"/>
! 
  		<key
  			contextId="org.eclipse.ui.contexts.dialogAndWindow"
***************
*** 1026,1030 ****
  			commandId="org.jcommander.ui.app.MkDirCommand"
  			sequence="F7"/>
! 			
  		<key
  			contextId="org.eclipse.ui.contexts.dialogAndWindow"
--- 1033,1037 ----
  			commandId="org.jcommander.ui.app.MkDirCommand"
  			sequence="F7"/>
! 
  		<key
  			contextId="org.eclipse.ui.contexts.dialogAndWindow"
***************
*** 1032,1036 ****
  			commandId="org.jcommander.ui.app.DeleteCommand"
  			sequence="F8"/>
! 			
  		<key
  			contextId="org.eclipse.ui.contexts.dialogAndWindow"
--- 1039,1043 ----
  			commandId="org.jcommander.ui.app.DeleteCommand"
  			sequence="F8"/>
! 
  		<key
  			contextId="org.eclipse.ui.contexts.dialogAndWindow"
***************
*** 1038,1042 ****
  			commandId="org.jcommander.ui.app.DeleteCommand"
  			sequence="Delete"/>
! 			
  		<key
  			contextId="org.eclipse.ui.contexts.dialogAndWindow"
--- 1045,1049 ----
  			commandId="org.jcommander.ui.app.DeleteCommand"
  			sequence="Delete"/>
! 
  		<key
  			contextId="org.eclipse.ui.contexts.dialogAndWindow"
***************
*** 1048,1053 ****
  			schemeId="org.jcommander.ui.app.JCmdScheme"
  			commandId="org.jcommander.ui.app.ToggleCurrentSelectionCommand"
! 			sequence="Space"/>	
! 	
  		<key
  			contextId="org.eclipse.ui.contexts.dialogAndWindow"
--- 1055,1060 ----
  			schemeId="org.jcommander.ui.app.JCmdScheme"
  			commandId="org.jcommander.ui.app.ToggleCurrentSelectionCommand"
! 			sequence="Space"/>
! 
  		<key
  			contextId="org.eclipse.ui.contexts.dialogAndWindow"
***************
*** 1055,1059 ****
  			commandId="org.jcommander.ui.app.ShowNavigationHistoryCommand"
  			sequence="Alt+Arrow_Down"/>
! 			
  		<key
  			contextId="org.eclipse.ui.contexts.dialogAndWindow"
--- 1062,1066 ----
  			commandId="org.jcommander.ui.app.ShowNavigationHistoryCommand"
  			sequence="Alt+Arrow_Down"/>
! 
  		<key
  			contextId="org.eclipse.ui.contexts.dialogAndWindow"
***************
*** 1061,1065 ****
  			commandId="org.jcommander.ui.app.InvertSelectionCommand"
  			sequence="Numpad_Multiply"/>
! 			
  		<key
  			contextId="org.eclipse.ui.contexts.dialogAndWindow"
--- 1068,1072 ----
  			commandId="org.jcommander.ui.app.InvertSelectionCommand"
  			sequence="Numpad_Multiply"/>
! 
  		<key
  			contextId="org.eclipse.ui.contexts.dialogAndWindow"
***************
*** 1067,1071 ****
  			commandId="org.jcommander.ui.app.ClosePanelCommand"
  			sequence="Ctrl+W"/>
! 			
  		<key
  			contextId="org.eclipse.ui.contexts.dialogAndWindow"
--- 1074,1078 ----
  			commandId="org.jcommander.ui.app.ClosePanelCommand"
  			sequence="Ctrl+W"/>
! 
  		<key
  			contextId="org.eclipse.ui.contexts.dialogAndWindow"
***************
*** 1073,1077 ****
  			commandId="org.jcommander.ui.app.SelectNoneCommand"
  			sequence="Ctrl+Numpad_Subtract"/>
! 			
  		<key
  			contextId="org.eclipse.ui.contexts.dialogAndWindow"
--- 1080,1084 ----
  			commandId="org.jcommander.ui.app.SelectNoneCommand"
  			sequence="Ctrl+Numpad_Subtract"/>
! 
  		<key
  			contextId="org.eclipse.ui.contexts.dialogAndWindow"
***************
*** 1084,1088 ****
  			commandId="org.jcommander.ui.app.SelectAllCommand"
  			sequence="Ctrl+A"/>
! 			
  		<key
  			contextId="org.eclipse.ui.contexts.dialogAndWindow"
--- 1091,1095 ----
  			commandId="org.jcommander.ui.app.SelectAllCommand"
  			sequence="Ctrl+A"/>
! 
  		<key
  			contextId="org.eclipse.ui.contexts.dialogAndWindow"
***************
*** 1102,1106 ****
  			commandId="org.jcommander.ui.app.CopySelectionToClipboardCommand"
  			sequence="Ctrl+Shift+C"/>
! 			
  		<key
  			contextId="org.eclipse.ui.contexts.dialogAndWindow"
--- 1109,1113 ----
  			commandId="org.jcommander.ui.app.CopySelectionToClipboardCommand"
  			sequence="Ctrl+Shift+C"/>
! 
  		<key
  			contextId="org.eclipse.ui.contexts.dialogAndWindow"
***************
*** 1108,1112 ****
  			commandId="org.jcommander.ui.app.ToggleFilePanelSelectionCommand"
  			sequence="Tab"/>
! 			
  		<key
  			contextId="org.eclipse.ui.contexts.dialogAndWindow"
--- 1115,1119 ----
  			commandId="org.jcommander.ui.app.ToggleFilePanelSelectionCommand"
  			sequence="Tab"/>
! 
  		<key
  			contextId="org.eclipse.ui.contexts.dialogAndWindow"
***************
*** 1114,1118 ****
  			commandId="org.jcommander.ui.app.FocusDirectoryInfoCommand"
  			sequence="ALT+D"/>
! 			
  		<!--<key
  			contextId="org.eclipse.ui.contexts.dialogAndWindow"
--- 1121,1125 ----
  			commandId="org.jcommander.ui.app.FocusDirectoryInfoCommand"
  			sequence="ALT+D"/>
! 
  		<!--<key
  			contextId="org.eclipse.ui.contexts.dialogAndWindow"
***************
*** 1129,1133 ****
  			schemeId="org.jcommander.ui.app.JCmdScheme"
  			commandId="org.jcommander.ui.app.GotoParentDirectoryCommand"
! 			sequence="CTRL+ARROW_LEFT"/>	
  
  		<key
--- 1136,1140 ----
  			schemeId="org.jcommander.ui.app.JCmdScheme"
  			commandId="org.jcommander.ui.app.GotoParentDirectoryCommand"
! 			sequence="CTRL+ARROW_LEFT"/>
  
  		<key

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

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

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.app/src/org/jcommander/ui/app/actions
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv9883/src/org/jcommander/ui/app/actions

Modified Files:
	CustomizePerspectiveAction.java 
Log Message:
Removed dependency on internal Eclipse package

Index: CustomizePerspectiveAction.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.app/src/org/jcommander/ui/app/actions/CustomizePerspectiveAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CustomizePerspectiveAction.java	20 Dec 2005 06:40:09 -0000	1.1
--- CustomizePerspectiveAction.java	14 Dec 2009 11:30:39 -0000	1.2
***************
*** 7,23 ****
  
  public class CustomizePerspectiveAction implements IWorkbenchWindowActionDelegate {
! 	EditActionSetsAction wrappedAction;
! 	
! 	public void dispose() {
! 		// TODO Auto-generated method stub
  
  	}
  
  	public void init(IWorkbenchWindow window) {
! 		wrappedAction = new EditActionSetsAction(window);
  	}
  
  	public void run(IAction action) {
! 		wrappedAction.run();
  	}
  
--- 7,24 ----
  
  public class CustomizePerspectiveAction implements IWorkbenchWindowActionDelegate {
! 	private IWorkbenchWindow window;
  
+ 	public void dispose() {
  	}
  
  	public void init(IWorkbenchWindow window) {
! 		this.window = window;
  	}
  
  	public void run(IAction action) {
! 		WorkbenchPage page = (WorkbenchPage) window.getActivePage();
! 		if (page != null) {
! 			page.editActionSets();
! 		}
  	}
  

[Jcommander-commit] plugins/org.jcommander.ui.app/src/org/jcommander/ui/app JCmdWorkbenchAdvisor.java, 1.38, 1.39

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

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.app/src/org/jcommander/ui/app
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv9767/src/org/jcommander/ui/app

Modified Files:
	JCmdWorkbenchAdvisor.java 
Log Message:
Fixed logging

Index: JCmdWorkbenchAdvisor.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.app/src/org/jcommander/ui/app/JCmdWorkbenchAdvisor.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** JCmdWorkbenchAdvisor.java	11 Jul 2006 14:45:14 -0000	1.38
--- JCmdWorkbenchAdvisor.java	14 Dec 2009 11:30:17 -0000	1.39
***************
*** 7,10 ****
--- 7,11 ----
  
  import org.apache.commons.vfs.*;
+ import org.apache.log4j.Logger;
  import org.eclipse.jface.dialogs.*;
  import org.eclipse.jface.preference.*;
***************
*** 24,46 ****
  /**
   * The workbench advisor for the JCommander RCP.
!  * 
   * @author sky_halud
   */
  public class JCmdWorkbenchAdvisor extends WorkbenchAdvisor {
  	/*
  	 * (non-Javadoc)
! 	 * 
  	 * @see org.eclipse.ui.application.WorkbenchAdvisor#getInitialWindowPerspectiveId()
  	 */
! 	
  	protected String actualCaption;
  	private String captionPrefix;
  	private StartupParameters startupParameters;
! 	
  	public JCmdWorkbenchAdvisor(String captionPrefix) {
  		this.captionPrefix = captionPrefix;
! 		
  		TabMediator.setCaptionPrefix(captionPrefix);
! 		
  		actualCaption = captionPrefix + FilePanelView.CAPTION_SUFFIX;
  	}
--- 25,49 ----
  /**
   * The workbench advisor for the JCommander RCP.
!  *
   * @author sky_halud
   */
  public class JCmdWorkbenchAdvisor extends WorkbenchAdvisor {
+ 	protected static final Logger LOG = Logger.getLogger(JCmdWorkbenchAdvisor.class);
+ 
  	/*
  	 * (non-Javadoc)
! 	 *
  	 * @see org.eclipse.ui.application.WorkbenchAdvisor#getInitialWindowPerspectiveId()
  	 */
! 
  	protected String actualCaption;
  	private String captionPrefix;
  	private StartupParameters startupParameters;
! 
  	public JCmdWorkbenchAdvisor(String captionPrefix) {
  		this.captionPrefix = captionPrefix;
! 
  		TabMediator.setCaptionPrefix(captionPrefix);
! 
  		actualCaption = captionPrefix + FilePanelView.CAPTION_SUFFIX;
  	}
***************
*** 49,53 ****
  		actualCaption = FilePanelView.CAPTION_SUFFIX;
  	}
! 	
  	public void initialize(org.eclipse.ui.application.IWorkbenchConfigurer configurer) {
  		super.initialize(configurer);
--- 52,56 ----
  		actualCaption = FilePanelView.CAPTION_SUFFIX;
  	}
! 
  	public void initialize(org.eclipse.ui.application.IWorkbenchConfigurer configurer) {
  		super.initialize(configurer);
***************
*** 73,79 ****
  		configurer.setShowFastViewBars(true);
  		configurer.setShowPerspectiveBar(true);
! 		
  		IPreferenceStore appPrefStore = AppPlugin.getDefault().getPreferenceStore();
! 		
  		if(appPrefStore.getBoolean(AppPlugin.FIRST_STARTUP_KEY)) {
  			new ChooseProfile().run(null);
--- 76,82 ----
  		configurer.setShowFastViewBars(true);
  		configurer.setShowPerspectiveBar(true);
! 
  		IPreferenceStore appPrefStore = AppPlugin.getDefault().getPreferenceStore();
! 
  		if(appPrefStore.getBoolean(AppPlugin.FIRST_STARTUP_KEY)) {
  			new ChooseProfile().run(null);
***************
*** 85,89 ****
  	}
  
! 	
  	/**
  	 * @param configurer
--- 88,92 ----
  	}
  
! 
  	/**
  	 * @param configurer
***************
*** 91,100 ****
  	private void setWindowInfo(IWorkbenchWindowConfigurer configurer) {
  		configurer.setTitle(actualCaption);
! 		
  		/* Let the Eclipse runtime handle the positioning and sizing */
  //		Shell appShell = configurer.getWindow().getShell();
  //		WindowUtils.centerRelativeTo(appShell, appShell.getDisplay());
  	}
! 	
  	public boolean preWindowShellClose(IWorkbenchWindowConfigurer configurer) {
  		configurer.getWorkbenchConfigurer().setSaveAndRestore(saveOnExit());
--- 94,103 ----
  	private void setWindowInfo(IWorkbenchWindowConfigurer configurer) {
  		configurer.setTitle(actualCaption);
! 
  		/* Let the Eclipse runtime handle the positioning and sizing */
  //		Shell appShell = configurer.getWindow().getShell();
  //		WindowUtils.centerRelativeTo(appShell, appShell.getDisplay());
  	}
! 
  	public boolean preWindowShellClose(IWorkbenchWindowConfigurer configurer) {
  		configurer.getWorkbenchConfigurer().setSaveAndRestore(saveOnExit());
***************
*** 103,112 ****
  		//if confirmed to ask about exit, display the dialog
  		if(conf) {
! 				
  			MessageDialogWithToggle dlg = MessageDialogWithToggle
  			.openOkCancelConfirm( configurer.getWindow().getShell(), "Exit Confirmation",
  					"Do you want to close jCommander?", "&Always ask",
  					conf, null, null);
! 								
  
  			boolean isOK = (dlg.getReturnCode() == IDialogConstants.OK_ID);
--- 106,115 ----
  		//if confirmed to ask about exit, display the dialog
  		if(conf) {
! 
  			MessageDialogWithToggle dlg = MessageDialogWithToggle
  			.openOkCancelConfirm( configurer.getWindow().getShell(), "Exit Confirmation",
  					"Do you want to close jCommander?", "&Always ask",
  					conf, null, null);
! 
  
  			boolean isOK = (dlg.getReturnCode() == IDialogConstants.OK_ID);
***************
*** 122,126 ****
  		if (saveOnExit()) {
  			loadConfig(configurer);
! 		} 
  		else {
  			createDefaultTab();
--- 125,129 ----
  		if (saveOnExit()) {
  			loadConfig(configurer);
! 		}
  		else {
  			createDefaultTab();
***************
*** 134,149 ****
  		// is through the getInstance mechanism)
  		IPreferenceStore appPrefStore = AppPlugin.getDefault().getPreferenceStore();
! 		
  		// Display native library loading info
  		if( appPrefStore.getBoolean(AppPlugin.DISPLAY_NATIVE_MANAGER_KEY)) {
  			NativeManagerUi.displayNativeErrors(configurer.getWindow().getShell());
  		}
! 		
  		if(appPrefStore.getBoolean(AppPlugin.FIRST_STARTUP_KEY)
  			|| appPrefStore.getBoolean(AppPlugin.DISPLAY_WELCOME_KEY)) {
! 			
  			//enter button in intro page
  			showWelcomePage(configurer.getWindow(),true);
! 			
  			if(appPrefStore.getBoolean(AppPlugin.FIRST_STARTUP_KEY)) {
  				// Display the welcome page only at first startup (if not specified otherwise)
--- 137,152 ----
  		// is through the getInstance mechanism)
  		IPreferenceStore appPrefStore = AppPlugin.getDefault().getPreferenceStore();
! 
  		// Display native library loading info
  		if( appPrefStore.getBoolean(AppPlugin.DISPLAY_NATIVE_MANAGER_KEY)) {
  			NativeManagerUi.displayNativeErrors(configurer.getWindow().getShell());
  		}
! 
  		if(appPrefStore.getBoolean(AppPlugin.FIRST_STARTUP_KEY)
  			|| appPrefStore.getBoolean(AppPlugin.DISPLAY_WELCOME_KEY)) {
! 
  			//enter button in intro page
  			showWelcomePage(configurer.getWindow(),true);
! 
  			if(appPrefStore.getBoolean(AppPlugin.FIRST_STARTUP_KEY)) {
  				// Display the welcome page only at first startup (if not specified otherwise)
***************
*** 159,175 ****
  	public static void showWelcomePage(IWorkbenchWindow window,boolean displayEnterButton) {
  		LoggerPlugin.rootLogger.debug("Checking intro...");
! 		
  		if (PlatformUI.getWorkbench().getIntroManager()
  		        .hasIntro()) {
  			LoggerPlugin.rootLogger.debug("DISPLAYING.");
! 			
  		    IIntroManager introManager = PlatformUI.getWorkbench().getIntroManager();
  		    IIntroPart introPart = introManager.showIntro(window, false);
! 		    
  		    //display or not enter button in intro
  		    if(introPart instanceof JCmdIntroPart){
  		    	((JCmdIntroPart)introPart).setDisplayEnterButton(displayEnterButton);
  		    }
! 		    
  		    introPart.setFocus();
  		} else {
--- 162,178 ----
  	public static void showWelcomePage(IWorkbenchWindow window,boolean displayEnterButton) {
  		LoggerPlugin.rootLogger.debug("Checking intro...");
! 
  		if (PlatformUI.getWorkbench().getIntroManager()
  		        .hasIntro()) {
  			LoggerPlugin.rootLogger.debug("DISPLAYING.");
! 
  		    IIntroManager introManager = PlatformUI.getWorkbench().getIntroManager();
  		    IIntroPart introPart = introManager.showIntro(window, false);
! 
  		    //display or not enter button in intro
  		    if(introPart instanceof JCmdIntroPart){
  		    	((JCmdIntroPart)introPart).setDisplayEnterButton(displayEnterButton);
  		    }
! 
  		    introPart.setFocus();
  		} else {
***************
*** 177,182 ****
  		}
  	}
! 	
! 	
  	/* (non-Javadoc)
  	 * @see org.eclipse.ui.application.WorkbenchAdvisor#preShutdown()
--- 180,185 ----
  		}
  	}
! 
! 
  	/* (non-Javadoc)
  	 * @see org.eclipse.ui.application.WorkbenchAdvisor#preShutdown()
***************
*** 189,194 ****
  		PlatformUI.getWorkbench().showPerspective(getInitialWindowPerspectiveId(), EclipseBroker.getWorkbenchWindow());
  		} catch (WorkbenchException e) {
! 			// TODO Auto-generated catch block
! 			e.printStackTrace();
  		}
  		if(saveOnExit()){
--- 192,196 ----
  		PlatformUI.getWorkbench().showPerspective(getInitialWindowPerspectiveId(), EclipseBroker.getWorkbenchWindow());
  		} catch (WorkbenchException e) {
! 			LOG.warn(e, e);
  		}
  		if(saveOnExit()){
***************
*** 209,213 ****
  		return captionPrefix;
  	}
! 	
  	private void createDefaultTab(){
  		try {
--- 211,215 ----
  		return captionPrefix;
  	}
! 
  	private void createDefaultTab(){
  		try {
***************
*** 218,228 ****
  					EclipseBroker.getWorkbenchWindow(), leftPanelFile,
  					rightPanelFile);
! 			
  			crtMediator.setCaption("DefaultTab");
  		} catch (FileSystemException e) {
  			MessageDisplayer.displayMessage(e.getMessage());
  		}
  	}
! 	
  	private void loadConfig(IWorkbenchWindowConfigurer configurer){
  		java.util.List allViews = new ArrayList();
--- 220,231 ----
  					EclipseBroker.getWorkbenchWindow(), leftPanelFile,
  					rightPanelFile);
! 
  			crtMediator.setCaption("DefaultTab");
  		} catch (FileSystemException e) {
+ 			LOG.warn(e, e);
  			MessageDisplayer.displayMessage(e.getMessage());
  		}
  	}
! 
  	private void loadConfig(IWorkbenchWindowConfigurer configurer){
  		java.util.List allViews = new ArrayList();
***************
*** 231,237 ****
  			return;
  		}
! 		IWorkbenchPage page = configurer.getWindow().getPages()[0]; 
  		allViews.addAll(Arrays.asList(page.getViewReferences()));
! 		boolean shownATab = false; 
  		try {
  			Configuration conf = Configuration.getInstance();
--- 234,240 ----
  			return;
  		}
! 		IWorkbenchPage page = configurer.getWindow().getPages()[0];
  		allViews.addAll(Arrays.asList(page.getViewReferences()));
! 		boolean shownATab = false;
  		try {
  			Configuration conf = Configuration.getInstance();
***************
*** 242,249 ****
  				}
  				ConfigurationTab tab = conf.getTab(ref.getId(), ref.getSecondaryId());
! 				
  				if(ref.getView(true) instanceof FilePanelView) {
  					FilePanelView view = (FilePanelView)ref.getView(true);
! 					if((null != tab) && (null != view)){					
  						setupTabInView(view, ref.getSecondaryId(), tab);
  						it.remove();
--- 245,252 ----
  				}
  				ConfigurationTab tab = conf.getTab(ref.getId(), ref.getSecondaryId());
! 
  				if(ref.getView(true) instanceof FilePanelView) {
  					FilePanelView view = (FilePanelView)ref.getView(true);
! 					if((null != tab) && (null != view)){
  						setupTabInView(view, ref.getSecondaryId(), tab);
  						it.remove();
***************
*** 260,264 ****
  		for(Iterator i = allViews.iterator(); i.hasNext(); ){
  			IViewReference view = (IViewReference)i.next();
! 			IViewPart viewPart = view.getView(true); 
  			if(viewPart instanceof FilePanelView){
  				((FilePanelView)viewPart).raiseShutdownClose();
--- 263,267 ----
  		for(Iterator i = allViews.iterator(); i.hasNext(); ){
  			IViewReference view = (IViewReference)i.next();
! 			IViewPart viewPart = view.getView(true);
  			if(viewPart instanceof FilePanelView){
  				((FilePanelView)viewPart).raiseShutdownClose();
***************
*** 270,274 ****
  		}
  	}
! 	
  	private void setupTabInView(FilePanelView view, String viewID, ConfigurationTab tab){
  		try {
--- 273,277 ----
  		}
  	}
! 
  	private void setupTabInView(FilePanelView view, String viewID, ConfigurationTab tab){
  		try {
***************
*** 283,287 ****
  			view.setRightPanelHidden(tab.isRightPanelHidden());
  			view.setDetailsShown(tab.isDetailsShown());
! 			
  			view.getFileTab().getLeftFilePanel().showTree(tab.getLeftpanel().isShowTree());
  			view.getFileTab().getRightFilePanel().showTree(tab.getRightpanel().isShowTree());
--- 286,290 ----
  			view.setRightPanelHidden(tab.isRightPanelHidden());
  			view.setDetailsShown(tab.isDetailsShown());
! 
  			view.getFileTab().getLeftFilePanel().showTree(tab.getLeftpanel().isShowTree());
  			view.getFileTab().getRightFilePanel().showTree(tab.getRightpanel().isShowTree());
***************
*** 290,294 ****
  		}
  	}
! 	
  	private boolean saveOnExit(){
  		IPreferenceStore appPrefStore = AppPlugin.getDefault().getPreferenceStore();
--- 293,297 ----
  		}
  	}
! 
  	private boolean saveOnExit(){
  		IPreferenceStore appPrefStore = AppPlugin.getDefault().getPreferenceStore();

[Jcommander-commit] plugins/org.jcommander plugin_customization.ini, 1.2, 1.3 build.properties, 1.3, 1.4

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

Update of /cvsroot/jcommander/plugins/org.jcommander
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv9515

Modified Files:
	build.properties 
Added Files:
	plugin_customization.ini 
Log Message:
Updated to Eclipse 3.5

--- NEW FILE: plugin_customization.ini ---
org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP = true

Index: build.properties
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander/build.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** build.properties	15 Feb 2006 10:43:54 -0000	1.3
--- build.properties	14 Dec 2009 11:29:30 -0000	1.4
***************
*** 1,12 ****
- ###############################################################################
- # Copyright (c) 2005 IBM Corporation and others.
- # All rights reserved. This program and the accompanying materials
- # are made available under the terms of the Eclipse Public License v1.0
- # which accompanies this distribution, and is available at
- # http://www.eclipse.org/legal/epl-v10.html
- #
- # Contributors:
- #     IBM Corporation - initial API and implementation
- ###############################################################################
  bin.includes = feature.xml,\
                 jcmd.ico,\
--- 1,2 ----

[Jcommander-commit] plugins/org.apache.commons/META-INF MANIFEST.MF, 1.3, 1.4

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

Update of /cvsroot/jcommander/plugins/org.apache.commons/META-INF
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv9317/META-INF

Modified Files:
	MANIFEST.MF 
Log Message:
Removed invalid import

Index: MANIFEST.MF
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.apache.commons/META-INF/MANIFEST.MF,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MANIFEST.MF	4 Jan 2007 09:07:11 -0000	1.3
--- MANIFEST.MF	14 Dec 2009 11:28:58 -0000	1.4
***************
*** 41,45 ****
   org.apache.commons.lang,
   org.apache.commons.lang.builder,
-  org.apache.commons.lang.enum,
   org.apache.commons.lang.enums,
   org.apache.commons.lang.exception,
--- 41,44 ----

[Jcommander-commit] plugins/org.apache.commons.vfs.dependencies .classpath, 1.5, 1.6 build.properties, 1.5, 1.6

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

Update of /cvsroot/jcommander/plugins/org.apache.commons.vfs.dependencies
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv9216

Modified Files:
	.classpath build.properties 
Log Message:
Fixed build issues with Java 6

Index: .classpath
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.apache.commons.vfs.dependencies/.classpath,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** .classpath	4 Jan 2007 09:08:02 -0000	1.5
--- .classpath	14 Dec 2009 11:28:19 -0000	1.6
***************
*** 6,10 ****
  	<classpathentry exported="true" kind="lib" path="jdom-1.0.jar"/>
  	<classpathentry exported="true" kind="lib" path="jsch-0.1.23.jar"/>
- 	<classpathentry exported="true" kind="lib" path="xml-apis-1.0.b2.jar"/>
  	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
  	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
--- 6,9 ----

Index: build.properties
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.apache.commons.vfs.dependencies/build.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** build.properties	4 Jan 2007 09:08:03 -0000	1.5
--- build.properties	14 Dec 2009 11:28:19 -0000	1.6
***************
*** 4,7 ****
                 jcifs-0.8.3.jar,\
                 jdom-1.0.jar,\
!                jsch-0.1.23.jar,\
!                xml-apis-1.0.b2.jar
--- 4,6 ----
                 jcifs-0.8.3.jar,\
                 jdom-1.0.jar,\
!                jsch-0.1.23.jar

[Jcommander-commit] plugins/org.apache.commons.vfs.dependencies/META-INF MANIFEST.MF, 1.7, 1.8

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

Update of /cvsroot/jcommander/plugins/org.apache.commons.vfs.dependencies/META-INF
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv9216/META-INF

Modified Files:
	MANIFEST.MF 
Log Message:
Fixed build issues with Java 6

Index: MANIFEST.MF
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.apache.commons.vfs.dependencies/META-INF/MANIFEST.MF,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** MANIFEST.MF	4 Jan 2007 09:08:02 -0000	1.7
--- MANIFEST.MF	14 Dec 2009 11:28:19 -0000	1.8
***************
*** 10,15 ****
   jcifs-0.8.3.jar,
   jdom-1.0.jar,
!  jsch-0.1.23.jar,
!  xml-apis-1.0.b2.jar
  Require-Bundle: org.apache.commons;visibility:=reexport
  Export-Package: .,
--- 10,14 ----
   jcifs-0.8.3.jar,
   jdom-1.0.jar,
!  jsch-0.1.23.jar
  Require-Bundle: org.apache.commons;visibility:=reexport
  Export-Package: .,
***************
*** 17,25 ****
   com.jcraft.jsch.jce,
   com.jcraft.jsch.jcraft,
-  javax.xml.parsers,
-  javax.xml.transform,
-  javax.xml.transform.dom,
-  javax.xml.transform.sax,
-  javax.xml.transform.stream,
   jcifs,
   jcifs.http,
--- 16,19 ----
***************
*** 60,64 ****
   org.apache.webdav.lib.util,
   org.apache.webdav.ui,
-  org.apache.xmlcommons,
   org.jdom,
   org.jdom.adapters,
--- 54,57 ----
***************
*** 67,80 ****
   org.jdom.output,
   org.jdom.transform,
!  org.jdom.xpath,
!  org.w3c.dom,
!  org.w3c.dom.css,
!  org.w3c.dom.events,
!  org.w3c.dom.html,
!  org.w3c.dom.ranges,
!  org.w3c.dom.stylesheets,
!  org.w3c.dom.traversal,
!  org.w3c.dom.views,
!  org.xml.sax,
!  org.xml.sax.ext,
!  org.xml.sax.helpers
--- 60,62 ----
   org.jdom.output,
   org.jdom.transform,
!  org.jdom.xpath

[Jcommander-commit] plugins/org.jcommander.ui.logger/src/org/jcommander/ui/logger LoggerPlugin.java, 1.4, 1.5

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

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.logger/src/org/jcommander/ui/logger
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv5218/src/org/jcommander/ui/logger

Modified Files:
	LoggerPlugin.java 
Log Message:
Fixed warnings

Index: LoggerPlugin.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.logger/src/org/jcommander/ui/logger/LoggerPlugin.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** LoggerPlugin.java	14 Dec 2009 11:06:32 -0000	1.4
--- LoggerPlugin.java	14 Dec 2009 11:07:11 -0000	1.5
***************
*** 6,10 ****
  import org.apache.log4j.xml.*;
  import org.eclipse.core.runtime.*;
- import org.jcommander.phileas.platformutils.*;
  import org.osgi.framework.*;
  
--- 6,9 ----
***************
*** 38,42 ****
  	}
  
! 	public static Logger getLogger(Class c) {
  		return Logger.getLogger(c);
  	}
--- 37,41 ----
  	}
  
! 	public static Logger getLogger(Class<?> c) {
  		return Logger.getLogger(c);
  	}

[Jcommander-commit] plugins/org.jcommander.ui.logger/src/org/jcommander/ui/logger LoggerPlugin.java, 1.3, 1.4

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

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.logger/src/org/jcommander/ui/logger
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv5065/src/org/jcommander/ui/logger

Modified Files:
	LoggerPlugin.java 
Log Message:
Improved Log4j initialization

Index: LoggerPlugin.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.logger/src/org/jcommander/ui/logger/LoggerPlugin.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** LoggerPlugin.java	7 Nov 2005 06:10:14 -0000	1.3
--- LoggerPlugin.java	14 Dec 2009 11:06:32 -0000	1.4
***************
*** 17,23 ****
  	//Resource bundle.
  	private ResourceBundle resourceBundle;
! 	
  	public static Logger rootLogger;
! 	
  	/**
  	 * The constructor.
--- 17,23 ----
  	//Resource bundle.
  	private ResourceBundle resourceBundle;
! 
  	public static Logger rootLogger;
! 
  	/**
  	 * The constructor.
***************
*** 33,43 ****
  	public void start(BundleContext context) throws Exception {
  		super.start(context);
! 		
! 		String pluginLocation = PlatformUtil.getPluginLocation(plugin);
! 		DOMConfigurator.configure(pluginLocation + "log4j.xml");
! 		
  		rootLogger = Logger.getRootLogger();
  	}
! 	
  	public static Logger getLogger(Class c) {
  		return Logger.getLogger(c);
--- 33,41 ----
  	public void start(BundleContext context) throws Exception {
  		super.start(context);
! 
! 		DOMConfigurator.configure(getBundle().getEntry("log4j.xml"));
  		rootLogger = Logger.getRootLogger();
  	}
! 
  	public static Logger getLogger(Class c) {
  		return Logger.getLogger(c);

[Jcommander-commit] plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls FileTab.java, 1.43, 1.44

[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-serv5322/src/org/jcommander/ui/filepanel/controls

Modified Files:
	FileTab.java 
Log Message:
Only one instance of BookmarksRootBookmark

Index: FileTab.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls/FileTab.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** FileTab.java	6 Aug 2006 10:33:26 -0000	1.43
--- FileTab.java	4 Jan 2007 15:06:47 -0000	1.44
***************
*** 132,137 ****
  //		rightBookmarkPanel.setBookmarks(new BookmarkGroup(bookmarks));
  		
! 		leftBookmarkPanel.setBookmarks(new BookmarksRootBookmark());
! 		rightBookmarkPanel.setBookmarks(new BookmarksRootBookmark());
  		
  		leftBookmarkPanel.addBookmarkSelectionListener(new BookmarkSelectionListener() {
--- 132,137 ----
  //		rightBookmarkPanel.setBookmarks(new BookmarkGroup(bookmarks));
  		
! 		leftBookmarkPanel.setBookmarks(BookmarksRootBookmark.getDefault());
! 		rightBookmarkPanel.setBookmarks(BookmarksRootBookmark.getDefault());
  		
  		leftBookmarkPanel.addBookmarkSelectionListener(new BookmarkSelectionListener() {