[eclipse-ccase-cvs] net.sourceforge.eclipseccase/src/net/sourceforge/eclipseccase IClearCasePreferenceConstants.java, 1.4, 1.5 ClearCaseProvider.java, 1.21, 1.22 ClearCasePlugin.java, 1.5, 1.6

[Frederic B. <fbe...@us...>]

Update of /cvsroot/eclipse-ccase/net.sourceforge.eclipseccase/src/net/sourceforge/eclipseccase
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv10836/src/net/sourceforge/eclipseccase

Modified Files:
	IClearCasePreferenceConstants.java ClearCaseProvider.java 
	ClearCasePlugin.java 
Log Message:
3044243  	 Cannot save edited cs in dyn view twice
3052126  	 [snapshot view] Version tree requests dynamic view to show
3000299  	 Problem to modify Config Spec within snapshot view
3052119  	 Add a view to search files in a branch
3052122  	 Add prefix name to branch when creating it
3026490  	 Forbid config spec modification from preferences


Index: ClearCaseProvider.java
===================================================================
RCS file: /cvsroot/eclipse-ccase/net.sourceforge.eclipseccase/src/net/sourceforge/eclipseccase/ClearCaseProvider.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** ClearCaseProvider.java	10 Aug 2010 05:15:24 -0000	1.21
--- ClearCaseProvider.java	24 Aug 2010 09:02:18 -0000	1.22
***************
*** 351,356 ****
  	}
  
! 	public void showVersionTree(String element) {
! 		ClearCasePlugin.getEngine().showVersionTree(element);
  
  	}
--- 351,356 ----
  	}
  
! 	public void showVersionTree(String element, File workingDir) {
! 		ClearCasePlugin.getEngine().showVersionTree(element, workingDir);
  
  	}
***************
*** 360,363 ****
--- 360,374 ----
  
  	}
+ 	
+ 
+ 	public String[] loadBrancheList(File workingDir) {
+ 		return ClearCasePlugin.getEngine().loadBrancheList(workingDir);
+ 	}
+ 	
+ 	public String[] searchFilesInBranch(String branchName, File workingDir, OperationListener listener)
+ 	{
+ 		return ClearCasePlugin.getEngine().searchFilesInBranch(branchName,workingDir, listener);
+ 	}
+ 
  
  	public void update(String element, int flags, boolean workingDir) {
***************
*** 1923,1925 ****
  	}
  
! }
\ No newline at end of file
--- 1934,1936 ----
  	}
  
! }

Index: ClearCasePlugin.java
===================================================================
RCS file: /cvsroot/eclipse-ccase/net.sourceforge.eclipseccase/src/net/sourceforge/eclipseccase/ClearCasePlugin.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ClearCasePlugin.java	2 Jul 2010 14:10:29 -0000	1.5
--- ClearCasePlugin.java	24 Aug 2010 09:02:18 -0000	1.6
***************
*** 588,591 ****
--- 588,596 ----
  				IClearCasePreferenceConstants.CLEARCASE_PRIMARY_GROUP);
  	}
+ 	
+ 	public static String getBranchPrefix() {
+ 		return getInstance().getPluginPreferences().getString(
+ 				IClearCasePreferenceConstants.BRANCH_PREFIX);
+ 	}
  
  	public static boolean isCheckinIdenticalAllowed() {
***************
*** 634,637 ****
--- 639,652 ----
  	}
  	
+ 
+ 	/**
+ 	 * Used to know if config spec modification has been forbidden
+ 	 * @return true if modification forbidden; false else.
+ 	 */
+ 	public static boolean IsConfigSpecModificationForbidden() {
+ 		return getInstance().getPluginPreferences().getBoolean(
+ 				IClearCasePreferenceConstants.FORBID_CONFIG_SPEC_MODIFICATION);
+ 	}
+ 	
  	/**
  	 * Logs an exception with the specified severity an message.
***************
*** 791,794 ****
--- 806,810 ----
  	 * @see org.eclipse.core.runtime.Plugin#initializeDefaultPluginPreferences()
  	 */
+ 	@SuppressWarnings("deprecation")
  	@Override
  	protected void initializeDefaultPluginPreferences() {
***************
*** 857,861 ****
  				IClearCasePreferenceConstants.GRAPHICAL_EXTERNAL_UPDATE_VIEW,
  				true);
! 
  		/* Set timeout as an environment variable */
  		setGraphicalToolTimeout();
--- 873,883 ----
  				IClearCasePreferenceConstants.GRAPHICAL_EXTERNAL_UPDATE_VIEW,
  				true);
! 		pref.setDefault(
! 				IClearCasePreferenceConstants.BRANCH_PREFIX,
! 				"");
! 		pref.setDefault(
! 				IClearCasePreferenceConstants.FORBID_CONFIG_SPEC_MODIFICATION,
! 				false);
! 		
  		/* Set timeout as an environment variable */
  		setGraphicalToolTimeout();

Index: IClearCasePreferenceConstants.java
===================================================================
RCS file: /cvsroot/eclipse-ccase/net.sourceforge.eclipseccase/src/net/sourceforge/eclipseccase/IClearCasePreferenceConstants.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** IClearCasePreferenceConstants.java	2 Jul 2010 14:10:29 -0000	1.4
--- IClearCasePreferenceConstants.java	24 Aug 2010 09:02:18 -0000	1.5
***************
*** 80,83 ****
--- 80,86 ----
  	String CLEARCASE_PRIMARY_GROUP = ClearCasePlugin.PLUGIN_ID
  			+ ".clearcasePrimaryGroup"; //$NON-NLS-1$
+ 	
+ 	String BRANCH_PREFIX = ClearCasePlugin.PLUGIN_ID
+ 	+ ".branch.prefix"; //$NON-NLS-1$
  
  	/** ClearCase preference */
***************
*** 129,133 ****
  	/** ClearCase preference */
  	String GRAPHICAL_EXTERNAL_UPDATE_VIEW = ClearCasePlugin.PLUGIN_ID
! 	+ ".graphical.external.updae.view"; //$NON-NLS-1$
  	
  	/** ClearCase preference */
--- 132,139 ----
  	/** ClearCase preference */
  	String GRAPHICAL_EXTERNAL_UPDATE_VIEW = ClearCasePlugin.PLUGIN_ID
! 	+ ".graphical.external.update.view"; //$NON-NLS-1$
! 	
! 	String FORBID_CONFIG_SPEC_MODIFICATION = ClearCasePlugin.PLUGIN_ID
! 	+ ".config_spec.forbid_modification"; //$NON-NLS-1$
  	
  	/** ClearCase preference */
***************
*** 135,137 ****
  			+ ".auto.parent.checkin.after.move"; //$NON-NLS-1$
  
! }
\ No newline at end of file
--- 141,143 ----
  			+ ".auto.parent.checkin.after.move"; //$NON-NLS-1$
  
! }