diff options
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui')
278 files changed, 0 insertions, 40095 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/.classpath b/bundles/org.eclipse.team.cvs.ui/.classpath deleted file mode 100644 index 07afd19ec..000000000 --- a/bundles/org.eclipse.team.cvs.ui/.classpath +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src/"/> - <classpathentry kind="src" path="/org.apache.xerces"/> - <classpathentry kind="src" path="/org.eclipse.core.runtime"/> - <classpathentry kind="src" path="/org.eclipse.core.resources"/> - <classpathentry kind="src" path="/org.eclipse.ui"/> - <classpathentry kind="src" path="/org.eclipse.team.core"/> - <classpathentry kind="src" path="/org.eclipse.team.ui"/> - <classpathentry kind="src" path="/org.eclipse.compare"/> - <classpathentry kind="src" path="/org.eclipse.core.boot"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="src" path="/org.eclipse.team.cvs.core"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/bundles/org.eclipse.team.cvs.ui/.cvsignore b/bundles/org.eclipse.team.cvs.ui/.cvsignore deleted file mode 100644 index fe99505dc..000000000 --- a/bundles/org.eclipse.team.cvs.ui/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -bin - diff --git a/bundles/org.eclipse.team.cvs.ui/.options b/bundles/org.eclipse.team.cvs.ui/.options deleted file mode 100644 index 6c209bcfb..000000000 --- a/bundles/org.eclipse.team.cvs.ui/.options +++ /dev/null @@ -1,7 +0,0 @@ -# Debugging options for the org.eclipse.team.cvs.ui plugin. - -# Turn on debugging for the plugin. -org.eclipse.team.cvs.ui/debug=false - -# Shows buffering and flushing of CVS console info to the console document -org.eclipse.team.cvs.ui/consolebuffering=false diff --git a/bundles/org.eclipse.team.cvs.ui/.project b/bundles/org.eclipse.team.cvs.ui/.project deleted file mode 100644 index 3da4b6004..000000000 --- a/bundles/org.eclipse.team.cvs.ui/.project +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.team.cvs.ui</name> - <comment></comment> - <projects> - <project>org.apache.xerces</project> - <project>org.eclipse.compare</project> - <project>org.eclipse.core.boot</project> - <project>org.eclipse.core.resources</project> - <project>org.eclipse.core.runtime</project> - <project>org.eclipse.team.core</project> - <project>org.eclipse.team.cvs.core</project> - <project>org.eclipse.team.ui</project> - <project>org.eclipse.ui</project> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> diff --git a/bundles/org.eclipse.team.cvs.ui/about.html b/bundles/org.eclipse.team.cvs.ui/about.html deleted file mode 100644 index 9db411aab..000000000 --- a/bundles/org.eclipse.team.cvs.ui/about.html +++ /dev/null @@ -1,30 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<html> -<head> -<title>About</title> -<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> -</head> -<body lang="EN-US"> -<h2>About This Content</h2> - -<p>20th June, 2002</p> -<h3>License</h3> -<p>Eclipse.org makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Common Public License Version 1.0 ("CPL"). A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>. -For purposes of the CPL, "Program" will mean the Content.</p> - -<h3>Contributions</h3> - -<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise -made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such -Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p> - -<p>If this Content is licensed to you under license terms and conditions other than the CPL ("Other License"), any modifications, enhancements and/or -other code and/or documentation ("Modifications") uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the -host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available -to others under the terms of the Other License. In addition, with regard to Modifications for which you are the copyright holder, you are also -providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of -the CPL.</p> - -</body> -</html>
\ No newline at end of file diff --git a/bundles/org.eclipse.team.cvs.ui/build.properties b/bundles/org.eclipse.team.cvs.ui/build.properties deleted file mode 100644 index 405e31126..000000000 --- a/bundles/org.eclipse.team.cvs.ui/build.properties +++ /dev/null @@ -1,14 +0,0 @@ -############################################################################### -# Copyright (c) 2000, 2003 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Common Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/cpl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -# Eclipse build contribution -source.teamcvsui.jar=src/ -src.includes=about.html -bin.includes=about.html,icons/,plugin.xml,plugin.properties,*.jar
\ No newline at end of file diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/clcl16/clear_co.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/clcl16/clear_co.gif Binary files differdeleted file mode 100644 index 255832653..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/clcl16/clear_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/clcl16/collapseall.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/clcl16/collapseall.gif Binary files differdeleted file mode 100644 index 0bae56c34..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/clcl16/collapseall.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/clcl16/filter_history.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/clcl16/filter_history.gif Binary files differdeleted file mode 100644 index 1492b4efa..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/clcl16/filter_history.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/clcl16/newstream_wiz.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/clcl16/newstream_wiz.gif Binary files differdeleted file mode 100644 index fffccf7a7..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/clcl16/newstream_wiz.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/clcl16/refresh.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/clcl16/refresh.gif Binary files differdeleted file mode 100644 index a063c230a..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/clcl16/refresh.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/ctool16/checkout.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/ctool16/checkout.gif Binary files differdeleted file mode 100644 index 1409330d8..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/ctool16/checkout.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/ctool16/contents.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/ctool16/contents.gif Binary files differdeleted file mode 100644 index 133140dc6..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/ctool16/contents.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/cview16/annotate_view.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/cview16/annotate_view.gif Binary files differdeleted file mode 100644 index b3823f4dc..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/cview16/annotate_view.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/cview16/console_view.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/cview16/console_view.gif Binary files differdeleted file mode 100644 index 99aed6cba..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/cview16/console_view.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/cview16/cvs_persp.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/cview16/cvs_persp.gif Binary files differdeleted file mode 100644 index 4761ce75a..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/cview16/cvs_persp.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/cview16/history_view.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/cview16/history_view.gif Binary files differdeleted file mode 100644 index 24ed918b3..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/cview16/history_view.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/cview16/rep_editors_view.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/cview16/rep_editors_view.gif Binary files differdeleted file mode 100644 index b3823f4dc..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/cview16/rep_editors_view.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/cview16/repo_rep.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/cview16/repo_rep.gif Binary files differdeleted file mode 100644 index 8ade8a019..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/cview16/repo_rep.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/dlcl16/clear_co.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/dlcl16/clear_co.gif Binary files differdeleted file mode 100644 index d873c49b8..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/dlcl16/clear_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/dlcl16/filter_history.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/dlcl16/filter_history.gif Binary files differdeleted file mode 100644 index 2b6285b75..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/dlcl16/filter_history.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/dlcl16/refresh.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/dlcl16/refresh.gif Binary files differdeleted file mode 100644 index b2281b40c..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/dlcl16/refresh.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/dtool16/contents.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/dtool16/contents.gif Binary files differdeleted file mode 100644 index ca68c5d47..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/dtool16/contents.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/elcl16/clear_co.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/elcl16/clear_co.gif Binary files differdeleted file mode 100644 index 6faf8d66f..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/elcl16/clear_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/elcl16/collapseall.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/elcl16/collapseall.gif Binary files differdeleted file mode 100644 index 3409b11b3..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/elcl16/collapseall.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/elcl16/filter_history.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/elcl16/filter_history.gif Binary files differdeleted file mode 100644 index 537265693..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/elcl16/filter_history.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/elcl16/refresh.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/elcl16/refresh.gif Binary files differdeleted file mode 100644 index 919423d43..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/elcl16/refresh.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/etool16/contents.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/etool16/contents.gif Binary files differdeleted file mode 100644 index 684e659cc..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/etool16/contents.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/glyphs/glyph1.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/glyphs/glyph1.gif Binary files differdeleted file mode 100644 index 706dc020e..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/glyphs/glyph1.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/glyphs/glyph2.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/glyphs/glyph2.gif Binary files differdeleted file mode 100644 index 1492b4efa..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/glyphs/glyph2.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/glyphs/glyph3.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/glyphs/glyph3.gif Binary files differdeleted file mode 100644 index 5a8c7ea96..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/glyphs/glyph3.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/glyphs/glyph4.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/glyphs/glyph4.gif Binary files differdeleted file mode 100644 index 6152fd7e2..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/glyphs/glyph4.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/glyphs/glyph5.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/glyphs/glyph5.gif Binary files differdeleted file mode 100644 index 19df9ae7d..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/glyphs/glyph5.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/glyphs/glyph6.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/glyphs/glyph6.gif Binary files differdeleted file mode 100644 index 9b278e6fa..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/glyphs/glyph6.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/glyphs/glyph7.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/glyphs/glyph7.gif Binary files differdeleted file mode 100644 index a063c230a..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/glyphs/glyph7.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/glyphs/glyph8.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/glyphs/glyph8.gif Binary files differdeleted file mode 100644 index 9ed470d02..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/glyphs/glyph8.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/obj16/branches_rep.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/obj16/branches_rep.gif Binary files differdeleted file mode 100644 index 21cc9f7b0..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/obj16/branches_rep.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/obj16/module_rep.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/obj16/module_rep.gif Binary files differdeleted file mode 100644 index 72b2dd1ac..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/obj16/module_rep.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/obj16/prjversions_rep.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/obj16/prjversions_rep.gif Binary files differdeleted file mode 100644 index 72258bdef..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/obj16/prjversions_rep.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/obj16/repository_rep.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/obj16/repository_rep.gif Binary files differdeleted file mode 100644 index 197a669f6..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/obj16/repository_rep.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/obj16/tag.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/obj16/tag.gif Binary files differdeleted file mode 100644 index dc5a486d3..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/obj16/tag.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/obj16/versions_rep.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/obj16/versions_rep.gif Binary files differdeleted file mode 100644 index 9b55c268c..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/obj16/versions_rep.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/ovr16/confauto_ov.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/ovr16/confauto_ov.gif Binary files differdeleted file mode 100644 index 65d335d36..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/ovr16/confauto_ov.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/ovr16/edited_ov.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/ovr16/edited_ov.gif Binary files differdeleted file mode 100644 index e750fd58e..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/ovr16/edited_ov.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/ovr16/merged_ov.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/ovr16/merged_ov.gif Binary files differdeleted file mode 100644 index 2616852d4..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/ovr16/merged_ov.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/ovr16/no_remotedir_ov.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/ovr16/no_remotedir_ov.gif Binary files differdeleted file mode 100644 index 0a63808bc..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/ovr16/no_remotedir_ov.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/ovr16/question_ov.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/ovr16/question_ov.gif Binary files differdeleted file mode 100644 index 62903bf50..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/ovr16/question_ov.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/wizards/cvs_synch.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/wizards/cvs_synch.gif Binary files differdeleted file mode 100644 index c4a11c3cc..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/wizards/cvs_synch.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/wizards/newconnect_wiz.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/wizards/newconnect_wiz.gif Binary files differdeleted file mode 100644 index ead6e3cc4..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/wizards/newconnect_wiz.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/wizards/newlocation_wiz.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/wizards/newlocation_wiz.gif Binary files differdeleted file mode 100644 index 81483819d..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/wizards/newlocation_wiz.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/wizban/createpatch_wizban.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/wizban/createpatch_wizban.gif Binary files differdeleted file mode 100644 index 442f976f6..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/wizban/createpatch_wizban.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/wizban/keywordsub_wizban.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/wizban/keywordsub_wizban.gif Binary files differdeleted file mode 100644 index e5f67afb5..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/wizban/keywordsub_wizban.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/wizban/mergestream_wizban.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/wizban/mergestream_wizban.gif Binary files differdeleted file mode 100644 index 218d49973..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/wizban/mergestream_wizban.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/wizban/newconnect_wizban.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/wizban/newconnect_wizban.gif Binary files differdeleted file mode 100644 index 41a82848b..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/wizban/newconnect_wizban.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/wizban/newlocation_wizban.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/wizban/newlocation_wizban.gif Binary files differdeleted file mode 100644 index 8f6b2dfca..000000000 --- a/bundles/org.eclipse.team.cvs.ui/icons/full/wizban/newlocation_wizban.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ui/plugin.properties b/bundles/org.eclipse.team.cvs.ui/plugin.properties deleted file mode 100644 index f3bd06c43..000000000 --- a/bundles/org.eclipse.team.cvs.ui/plugin.properties +++ /dev/null @@ -1,184 +0,0 @@ -############################################################################### -# Copyright (c) 2000, 2003 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Common Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/cpl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -providerName=Eclipse.org -pluginName=CVS Team Provider UI - -CVS=CVS - -CVSRepositoryExploring=CVS Repository Exploring - -CVSGroupMenu.label=C&VS - -SharingWizard.name=CVS - -PreferencePage.name=CVS -ConsolePreferencePage.name=Console -DecoratorPreferencePage.name=Label Decorations -ExtMethodPreferencePage.name=Ext Connection Method -WatchEditPreferencePage.name=Watch/Edit - -DecoratorStandard.name=CVS -DecoratorStandard.desc=Shows CVS specific information on resources in projects under CVS control. Information includes the revision number, branch or version name, etc. - -AddAction.label=&Add to Version Control -AddAction.tooltip=Add the Selected Resources to Version Control - -MergeAction.label=&Merge... -MergeAction.tooltip=Merge - -BranchAction.label=&Branch... -BranchAction.tooltip=Branch - -CompareRemoteResourcesAction.label=Com&pare -CompareRemoteResourcesAction.tooltip=Compare the Remote Resources with Each Other - -CompareRemoteWithTagAction.label=Compare &With... -CompareRemoteWithTagAction.tooltip=Compare with a Branch or a Version - -CompareWithRemoteAction.label=&Latest from Repository -CompareWithRemoteAction.tooltip=Compare with Content on CVS Server - -CompareWithRevisionAction.label=&Revision... -CompareWithRevisionAction.tooltip=Compare with Revision on CVS Server - -CompareWithTagAction.label=Another &Branch or Version... -CompareWithTagAction.tooltip=Compare with a Branch or a Version on the CVS Server - -ContentAction.label=Compare File Contents -ContentAction.tooltip=Use File Contents Instead of Timestamps When Comparing - -ConvertNature.label=Convert Provider from Nature -ConvertNature.tooltip=Converts a CVS project from using natures to using properties - -CopyRepositoryNameAction.label=&Copy to Clipboard -CopyRepositoryNameAction.tooltip=Copy Repository Names to Clipboard - -IgnoreAction.label=A&dd to .cvsignore -IgnoreAction.tooltip=Ignore the Selected Resources when Synchronizing - -RefreshTagsAction.label=Refresh &Branches... -RefreshTagsAction.tooltip=Refresh the branch tags and their members using the auto-refresh files associated with each remote folder - -RemoveRootAction.label=Discard &Location -RemoveRootAction.tooltip=Discard Location - -ReplaceWithRevisionAction.label=&Revision... -ReplaceWithRevisionAction.tooltip=Replace with Revision on CVS Server - -ReplaceWithTagAction.label=&Another Branch or Version... -ReplaceWithTagAction.tooltip=Replace with Branch or Version on the CVS Server - -TagAction.label=&Tag as Version... -TagAction.tooltip=Tag the resources with a CVS version tag - -TagInRepositoryAction.label=&Tag as Version... -TagInRepositoryAction.tooltip=Tag the resources with a CVS version tag - -MoveTagAction.label=Tag with &Existing... -MoveTagAction.tooltip=Tag the selected resources with an existing tag - -SetKeywordSubstitutionAction.label=C&hange ASCII/Binary Property... -SetKeywordSubstitutionAction.tooltip=Change whether the selected resources should be treated as ASCII or binary on the CVS Server - -UpdateAction.label=&Update -UpdateAction.tooltip=Update - -ReplaceWithAction.label=&Latest from Repository -ReplaceWithAction.tooltip=Replace with last committed content from CVS Server - -ConfigureTags.label=Configure &Branches and Versions... -ConfigureTags.tooltip=Configure the branch and version tags shown in the workbench - -AddToBranch.label=Add &to Branch List... -AddToBranch.tooltip=Add the selected remote folder to a branch - -CommitAction.label=&Commit... -CommitAction.tooltip=Commit - -CheckoutAction.label=&Check Out -CheckoutAction.tooltip=Check out a module from the repository to the workspace - -CheckoutAsAction.label=Check Out &As... -CheckoutAsAction.tooltip=Check out a module from the repository to the workspace - -OpenLogEntryAction.label=&Open -OpenLogEntryAction.tooltip=Open Remote File - -OpenRemoteFileAction.label=&Open -OpenRemoteFileAction.tooltip=Open Remote File - -ShowHistoryAction.label=Show in Resource &History -ShowHistoryAction.tooltip=Show in Resource History - -ShowAnnotationAction.label=Show Annotation -ShowAnnotationAction.tooltip=Show Annotation - -GenerateDiff.label=Create &Patch... -GenerateDiff.tooltip=Compare your workspace contents with the server and generate a diff file that can be used as a patch file. - -RefreshFromLocal.label=&Refresh from local CVS state -RefreshFromLocal.tooltip=Refresh the workbench with changes made to CVS projects from outside the workbench. - -Synchronize.label=&Synchronize with Repository... -Synchronize.tooltip=Synchronize the workspace resources with those in the repository - -SynchronizeOutgoing.label=S&ynchronize Outgoing Changes... -SynchronizeOutgoing.tooltip=Synchronize the outgoing changes with the repository - -EditAction.label=&Edit -EditAction.tooltip=Perform a ''cvs edit'' on the selected files - -UneditAction.label=U&nedit -UneditAction.tooltip=Perform a ''cvs unedit'' on the selected files - -viewCategory=CVS - -Console.name=CVS Console - -RepositoriesView.name=CVS Repositories - -HistoryFilter.label=&Filter History -HistoryFilter.tooltip=Filter History - -HistoryView.name=CVS Resource History - -UnmanageFolder.label=&Disconnect... -UnmanageFolder.tooltip=Disconnect from the CVS repository. - -CVSActionSet.categoryName=CVS -CVSActionSet.description=Actions that apply when working with CVS repositories -CVSActionSet.newLabel=Add CVS Repository -CVSActionSet.newTooltip=Add CVS Repository - -RestoreFromRepositoryAction.label=&Restore from Repository... -RestoreFromRepositoryAction.tooltip=Restore resources that have been deleted from the remote folder. - -ShowEditorsAction.label=Show Editors -ShowEditorsAction.tooltip=Perform a ''cvs editors'' on the selected file - -EditorsView.name=CVS Editors -AnnotateView.name=CVS Annotate -CVSConsoleFont.label=CVS Console Font -CVSConsoleFont.description=The font for the CVS console. - -CVSWorkspaceSubscriber.update.label=&Update -CVSWorkspaceSubscriber.update.tooltip=Perform an update on the visible resources - -CVSWorkspaceSubscriber.commit.label=&Commit -CVSWorkspaceSubscriber.commit.tooltip=Perform a commit on the visible resources - -CVSWorkspaceSubscriber.confirmMerged.label=&Mark as Merged -CVSWorkspaceSubscriber.confirmMerged.tooltip=Mark the conflict as merged by upgrading the base to match the remote - -CVSWorkspaceSubscriber.merge.label=&Update -CVSWorkspaceSubscriber.merge.tooltip=Perform an update merge on the visible resources - -WorkInProgress.name=Work In Progress diff --git a/bundles/org.eclipse.team.cvs.ui/plugin.xml b/bundles/org.eclipse.team.cvs.ui/plugin.xml deleted file mode 100644 index 21856ef67..000000000 --- a/bundles/org.eclipse.team.cvs.ui/plugin.xml +++ /dev/null @@ -1,844 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<plugin - id="org.eclipse.team.cvs.ui" - name="%pluginName" - version="3.0.0" - provider-name="%providerName" - class="org.eclipse.team.internal.ccvs.ui.CVSUIPlugin"> - - <runtime> - <library name="teamcvsui.jar"> - <export name="*"/> - <packages prefixes="org.eclipse.team.internal.ccvs.ui"/> - </library> - </runtime> - <requires> - <import plugin="org.apache.xerces"/> - <import plugin="org.eclipse.core.runtime"/> - <import plugin="org.eclipse.core.resources"/> - <import plugin="org.eclipse.ui"/> - <import plugin="org.eclipse.team.core"/> - <import plugin="org.eclipse.team.ui"/> - <import plugin="org.eclipse.team.cvs.core"/> - <import plugin="org.eclipse.compare"/> - </requires> - -<!-- *************** Authenticator **************** --> - <extension - point="org.eclipse.team.cvs.core.authenticator"> - <authenticator> - <run - class="org.eclipse.team.internal.ccvs.ui.WorkbenchUserAuthenticator"> - </run> - </authenticator> - </extension> -<!-- *************** CVS File Modification Validator **************** --> - <extension - point="org.eclipse.team.cvs.core.filemodificationvalidator"> - <validator> - <run - class="org.eclipse.team.internal.ccvs.ui.FileModificationValidator"> - </run> - </validator> - </extension> -<!-- ******************* Wizards ****************** --> - <extension - point="org.eclipse.team.ui.configurationWizards"> - <wizard - name="%SharingWizard.name" - icon="icons/full/wizards/newconnect_wiz.gif" - class="org.eclipse.team.internal.ccvs.ui.wizards.SharingWizard" - id="org.eclipse.team.ccvs.ui.SharingWizard"> - </wizard> - </extension> -<!-- ************** Property Pages *************** --> - <extension - point="org.eclipse.ui.propertyPages"> - <page - objectClass="org.eclipse.core.resources.IFile" - adaptable="true" - name="%CVS" - class="org.eclipse.team.internal.ccvs.ui.CVSFilePropertiesPage" - id="org.eclipse.team.ccvs.ui.propertyPages.CVSFilePropertiesPage"> - <filter - name="projectPersistentProperty" - value="org.eclipse.team.core.repository=org.eclipse.team.cvs.core.cvsnature"> - </filter> - </page> - <page - objectClass="org.eclipse.core.resources.IFolder" - adaptable="true" - name="%CVS" - class="org.eclipse.team.internal.ccvs.ui.CVSFolderPropertiesPage" - id="org.eclipse.team.ccvs.ui.propertyPages.CVSFolderPropertiesPage"> - <filter - name="projectPersistentProperty" - value="org.eclipse.team.core.repository=org.eclipse.team.cvs.core.cvsnature"> - </filter> - </page> - <page - objectClass="org.eclipse.core.resources.IProject" - adaptable="true" - name="%CVS" - class="org.eclipse.team.internal.ccvs.ui.CVSProjectPropertiesPage" - id="org.eclipse.team.ccvs.ui.propertyPages.CVSProjectPropertiesPage"> - <filter - name="projectPersistentProperty" - value="org.eclipse.team.core.repository=org.eclipse.team.cvs.core.cvsnature"> - </filter> - </page> - <page - objectClass="org.eclipse.team.internal.ccvs.ui.repo.RepositoryRoot" - name="%CVS" - class="org.eclipse.team.internal.ccvs.ui.repo.CVSRepositoryPropertiesPage" - id="org.eclipse.team.ccvs.ui.propertyPages.CVSRepositoryPropertiesPage"> - </page> - </extension> - -<!-- ******************* Action Definitions ******************** --> - - <extension point="org.eclipse.ui.commands"> - <category - name="%CVSActionSet.categoryName" - description="%CVSActionSet.description" - id="org.eclipse.team.cvs.ui.actionSet"> - </category> - <command - category="org.eclipse.team.cvs.ui.actionSet" - name="%CVSActionSet.newLabel" - description="%CVSActionSet.newTooltip" - id="org.eclipse.team.cvs.ui.new.location"> - </command> - </extension> - -<!-- ******************* Menus ******************** --> - <extension - point="org.eclipse.ui.popupMenus"> - <objectContribution - objectClass="org.eclipse.core.resources.IFile" - adaptable="true" - id="org.eclipse.team.ccvs.ui.IFileContributions"> - <filter - name="projectPersistentProperty" - value="org.eclipse.team.core.repository=org.eclipse.team.cvs.core.cvsnature"> - </filter> - <action - label="%IgnoreAction.label" - tooltip="%IgnoreAction.tooltip" - class="org.eclipse.team.internal.ccvs.ui.actions.IgnoreAction" - menubarPath="team.main/group3" - helpContextId="org.eclipse.team.cvs.ui.team_ignore_action_context" - id="org.eclipse.team.ccvs.ui.ignore"> - </action> - <action - label="%AddAction.label" - tooltip="%AddAction.tooltip" - class="org.eclipse.team.internal.ccvs.ui.actions.AddAction" - menubarPath="team.main/group3" - helpContextId="org.eclipse.team.cvs.ui.team_add_action_context" - id="org.eclipse.team.ccvs.ui.add"> - </action> - <action - label="%ShowHistoryAction.label" - tooltip="%ShowHistoryAction.tooltip" - class="org.eclipse.team.internal.ccvs.ui.actions.ShowResourceInHistoryAction" - menubarPath="team.main/group2" - helpContextId="org.eclipse.team.cvs.ui.show_in_history_action_context" - id="org.eclipse.team.ccvs.ui.showHistory"> - </action> - <action - label="%ShowAnnotationAction.label" - tooltip="%ShowAnnotationAction.tooltip" - class="org.eclipse.team.internal.ccvs.ui.actions.ShowAnnotationAction" - menubarPath="team.main/group2" - helpContextId="org.eclipse.team.cvs.ui.get_annotate_action_context" - id="org.eclipse.team.ccvs.ui.showAnnotation"> - </action> - <action - label="%CompareWithRevisionAction.label" - tooltip="%CompareWithRevisionAction.tooltip" - class="org.eclipse.team.internal.ccvs.ui.actions.CompareWithRevisionAction" - menubarPath="compareWithMenu/compareWithGroup" - helpContextId="org.eclipse.team.cvs.ui.compare_with_revision_action_context" - id="org.eclipse.team.ccvs.ui.compareWithRevision"> - </action> - <action - label="%ReplaceWithRevisionAction.label" - tooltip="%ReplaceWithRevisionAction.tooltip" - class="org.eclipse.team.internal.ccvs.ui.actions.CompareWithRevisionAction" - menubarPath="replaceWithMenu/replaceWithGroup" - helpContextId="org.eclipse.team.cvs.ui.replace_with_revision_action_context" - id="org.eclipse.team.ccvs.ui.replaceWithRevision"> - </action> - <action - label="%EditAction.label" - tooltip="%EditAction.tooltip" - class="org.eclipse.team.internal.ccvs.ui.actions.EditAction" - menubarPath="team.main/group4" - helpContextId="org.eclipse.team.cvs.ui.team_edit_action_context" - id="org.eclipse.team.ccvs.ui.edit"> - </action> - <action - label="%UneditAction.label" - tooltip="%UneditAction.tooltip" - class="org.eclipse.team.internal.ccvs.ui.actions.UneditAction" - menubarPath="team.main/group4" - helpContextId="org.eclipse.team.cvs.ui.team_unedit_action_context" - id="org.eclipse.team.ccvs.ui.unedit"> - </action> - </objectContribution> - <objectContribution - objectClass="org.eclipse.core.resources.IResource" - adaptable="true" - id="org.eclipse.team.ccvs.ui.ResourceContributions"> - <filter - name="projectPersistentProperty" - value="org.eclipse.team.core.repository=org.eclipse.team.cvs.core.cvsnature"> - </filter> - <action - label="%SetKeywordSubstitutionAction.label" - tooltip="%SetKeywordSubstitutionAction.tooltip" - class="org.eclipse.team.internal.ccvs.ui.actions.SetKeywordSubstitutionAction" - menubarPath="team.main/group3" - helpContextId="org.eclipse.team.cvs.ui.team_set_keyword_mode_action_context" - id="org.eclipse.team.ccvs.ui.setKeywordSubstitution"> - </action> - <action - label="%MergeAction.label" - tooltip="%MergeAction.tooltip" - class="org.eclipse.team.internal.ccvs.ui.actions.MergeAction" - menubarPath="team.main/group2" - helpContextId="org.eclipse.team.cvs.ui.team_merge_action_context" - id="org.eclipse.team.ccvs.ui.merge"> - </action> - <action - label="%BranchAction.label" - tooltip="%BranchAction.tooltip" - class="org.eclipse.team.internal.ccvs.ui.actions.BranchAction" - menubarPath="team.main/group2" - helpContextId="org.eclipse.team.cvs.ui.team_branch_action_context" - id="org.eclipse.team.ccvs.ui.branch"> - </action> - <action - label="%TagAction.label" - tooltip="%TagAction.tooltip" - class="org.eclipse.team.internal.ccvs.ui.actions.TagLocalAction" - menubarPath="team.main/group2" - helpContextId="org.eclipse.team.cvs.ui.team_tag_as_version_action_context" - id="org.eclipse.team.ccvs.ui.tag"> - </action> - <action - label="%CompareWithTagAction.label" - tooltip="%CompareWithTagAction.tooltip" - class="org.eclipse.team.internal.ccvs.ui.actions.CompareWithTagAction" - menubarPath="compareWithMenu/compareWithGroup" - helpContextId="org.eclipse.team.cvs.ui.compare_with_tag_action_context" - id="org.eclipse.team.ccvs.ui.compareWithTag"> - </action> - <action - label="%CompareWithRemoteAction.label" - tooltip="%CompareWithRemoteAction.tooltip" - class="org.eclipse.team.internal.ccvs.ui.actions.CompareWithRemoteAction" - menubarPath="compareWithMenu/compareWithGroup" - helpContextId="org.eclipse.team.cvs.ui.compare_with_latest_action_context" - id="org.eclipse.team.ccvs.ui.compareWithRemote"> - </action> - <action - label="%ReplaceWithTagAction.label" - tooltip="%ReplaceWithTagAction.tooltip" - class="org.eclipse.team.internal.ccvs.ui.actions.ReplaceWithTagAction" - menubarPath="replaceWithMenu/replaceWithGroup" - helpContextId="org.eclipse.team.cvs.ui.replace_with_tag_action_context" - id="org.eclipse.team.ccvs.ui.replaceWithTag"> - </action> - <action - label="%ReplaceWithAction.label" - tooltip="%ReplaceWithAction.tooltip" - class="org.eclipse.team.internal.ccvs.ui.actions.ReplaceWithRemoteAction" - menubarPath="replaceWithMenu/replaceWithGroup" - helpContextId="org.eclipse.team.cvs.ui.replace_with_latest_action_context" - id="org.eclipse.team.ccvs.ui.replace"> - </action> - <action - label="%GenerateDiff.label" - tooltip="%GenerateDiff.tooltip" - class="org.eclipse.team.internal.ccvs.ui.actions.GenerateDiffFileAction" - menubarPath="team.main/group1" - helpContextId="org.eclipse.team.cvs.ui.team_create_patch_action_context" - id="org.eclipse.team.ccvs.ui.GenerateDiff"> - </action> - <action - label="%UpdateAction.label" - tooltip="%UpdateAction.tooltip" - class="org.eclipse.team.internal.ccvs.ui.actions.UpdateAction" - menubarPath="team.main/group1" - helpContextId="org.eclipse.team.cvs.ui.team_update_action_context" - id="org.eclipse.team.ccvs.ui.update"> - </action> - <action - label="%CommitAction.label" - tooltip="%CommitAction.tooltip" - class="org.eclipse.team.internal.ccvs.ui.actions.CommitAction" - menubarPath="team.main/group1" - helpContextId="org.eclipse.team.cvs.ui.team_commit_action_context" - id="org.eclipse.team.ccvs.ui.commit"> - </action> - <action - label="%Synchronize.label" - tooltip="%Synchronize.tooltip" - class="org.eclipse.team.internal.ccvs.ui.actions.SyncAction" - menubarPath="team.main/group1" - helpContextId="org.eclipse.team.cvs.ui.team_synchronize_action_context" - id="org.eclipse.team.ccvs.ui.sync"> - </action> - </objectContribution> - - <objectContribution - objectClass="org.eclipse.core.resources.IResource" - adaptable="true" - id="org.eclipse.team.ccvs.ui.ResourceContributions"> - <filter - name="projectPersistentProperty" - value="org.eclipse.team.core.repository=org.eclipse.team.cvs.core.cvsnature"> - </filter> - <action - label="%ShowEditorsAction.label" - tooltip="%ShowEditorsAction.tooltip" - class="org.eclipse.team.internal.ccvs.ui.actions.ShowEditorsAction" - menubarPath="team.main/group4" - helpContextId="org.eclipse.team.cvs.ui.team_show_editors_action_context" - id="org.eclipse.team.ccvs.ui.showeditors"> - </action> - </objectContribution> - - - <!-- ************** Project Menu *************** --> - - - <objectContribution - objectClass="org.eclipse.core.resources.IProject" - adaptable="true" - id="org.eclipse.team.ccvs.ui.IProjectContributions"> - <filter - name="projectPersistentProperty" - value="org.eclipse.team.core.repository=org.eclipse.team.cvs.core.cvsnature"> - </filter> - <action - label="%UnmanageFolder.label" - tooltip="%UnmanageFolder.tooltip" - class="org.eclipse.team.internal.ccvs.ui.actions.UnmanageAction" - menubarPath="team.main/projectGroup" - helpContextId="org.eclipse.team.cvs.ui.team_disconnect_action_context" - id="org.eclipse.team.ccvs.ui.unmanage"> - </action> - </objectContribution> - <objectContribution - objectClass="org.eclipse.core.resources.IContainer" - adaptable="true" - id="org.eclipse.team.ccvs.ui.IContainerContributions"> - <filter - name="projectPersistentProperty" - value="org.eclipse.team.core.repository=org.eclipse.team.cvs.core.cvsnature"> - </filter> - <action - label="%RestoreFromRepositoryAction.label" - tooltip="%RestoreFromRepositoryAction.tooltip" - class="org.eclipse.team.internal.ccvs.ui.actions.RestoreFromRepositoryAction" - menubarPath="team.main/group4" - helpContextId="org.eclipse.team.cvs.ui.team_restore_from_repository_action_context" - id="org.eclipse.team.ccvs.ui.restoreFromRepository"> - </action> - </objectContribution> - <objectContribution - objectClass="org.eclipse.core.resources.IFolder" - adaptable="true" - id="org.eclipse.team.ccvs.ui.IFolderContributions"> - <filter - name="projectPersistentProperty" - value="org.eclipse.team.core.repository=org.eclipse.team.cvs.core.cvsnature"> - </filter> - <action - label="%IgnoreAction.label" - tooltip="%IgnoreAction.tooltip" - class="org.eclipse.team.internal.ccvs.ui.actions.IgnoreAction" - menubarPath="team.main/group3" - helpContextId="org.eclipse.team.cvs.ui.team_ignore_action_context" - id="org.eclipse.team.ccvs.ui.ignore"> - </action> - <action - label="%AddAction.label" - tooltip="%AddAction.tooltip" - class="org.eclipse.team.internal.ccvs.ui.actions.AddAction" - menubarPath="team.main/group3" - helpContextId="org.eclipse.team.cvs.ui.team_add_action_context" - id="org.eclipse.team.ccvs.ui.add"> - </action> - </objectContribution> - <objectContribution - objectClass="org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder" - id="org.eclipse.team.ccvs.ui.RemoteFolderContributions"> - <action - label="%CheckoutAsAction.label" - tooltip="%CheckoutAsAction.tooltip" - menubarPath="checkoutGroup" - class="org.eclipse.team.internal.ccvs.ui.actions.CheckoutAsAction" - helpContextId="org.eclipse.team.cvs.ui.checkout_as_action_context" - id="org.eclipse.team.ccvs.ui.checkoutAs"> - </action> - <action - label="%CheckoutAction.label" - tooltip="%CheckoutAction.tooltip" - menubarPath="checkoutGroup" - class="org.eclipse.team.internal.ccvs.ui.actions.CheckoutAction" - helpContextId="org.eclipse.team.cvs.ui.checkout_as_project_action_context" - id="org.eclipse.team.ccvs.ui.checkout"> - </action> - <action - id="org.eclipse.team.ccvs.ui.configureTagsOnRemoteFolder" - label="%ConfigureTags.label" - menubarPath="miscGroup" - tooltip="%ConfigureTags.tooltip" - icon="icons/full/clcl16/newstream_wiz.gif" - helpContextId="org.eclipse.team.cvs.ui.tag_configuration_overview" - class="org.eclipse.team.internal.ccvs.ui.actions.ConfigureTagsFromRepoViewOnFolder"/> - <action - id="org.eclipse.team.ccvs.ui.addToBranch" - label="%AddToBranch.label" - menubarPath="miscGroup" - tooltip="%ddToBranch.tooltip" - icon="icons/full/clcl16/newstream_wiz.gif" - helpContextId="org.eclipse.team.cvs.ui.add_to_branch_context" - class="org.eclipse.team.internal.ccvs.ui.repo.AddToBranchAction"/> - </objectContribution> - <objectContribution - objectClass="org.eclipse.team.internal.ccvs.core.ICVSRemoteFile" - id="org.eclipse.team.ccvs.ui.RemoteFileContributions"> - <action - label="%OpenRemoteFileAction.label" - tooltip="%OpenRemoteFileAction.tooltip" - class="org.eclipse.team.internal.ccvs.ui.actions.OpenRemoteFileAction" - helpContextId="org.eclipse.team.cvs.ui.open_remote_file_action_context" - id="org.eclipse.team.ccvs.ui.openRemoteFile"> - </action> - <action - label="%ShowHistoryAction.label" - tooltip="%ShowHistoryAction.tooltip" - class="org.eclipse.team.internal.ccvs.ui.actions.ShowHistoryAction" - helpContextId="org.eclipse.team.cvs.ui.show_in_history_action_context" - id="org.eclipse.team.ccvs.ui.showHistory"> - </action> - <action - label="%ShowAnnotationAction.label" - tooltip="%ShowAnnotationAction.tooltip" - class="org.eclipse.team.internal.ccvs.ui.actions.ShowAnnotationAction" - helpContextId="org.eclipse.team.cvs.ui.get_annotate_action_context" - id="org.eclipse.team.ccvs.ui.showAnnotation"> - </action> - </objectContribution> - <objectContribution - objectClass="org.eclipse.team.internal.ccvs.core.ILogEntry" - id="org.eclipse.team.ccvs.ui.LogEntryContributions"> - <action - label="%OpenLogEntryAction.label" - tooltip="%OpenLogEntryAction.tooltip" - class="org.eclipse.team.internal.ccvs.ui.actions.OpenLogEntryAction" - helpContextId="org.eclipse.team.cvs.ui.open_remote_file_action_context" - id="org.eclipse.team.ccvs.ui.openLogEntry"> - </action> - <action - label="%CompareRemoteResourcesAction.label" - tooltip="%CompareRemoteResourcesAction.tooltip" - class="org.eclipse.team.internal.ccvs.ui.actions.CompareRemoteResourcesAction" - enablesFor="2" - helpContextId="org.eclipse.team.cvs.ui.compare_remote_resources_action_context" - id="org.eclipse.team.ccvs.ui.compareLogEntries"> - </action> - <action - label="%ShowAnnotationAction.label" - tooltip="%ShowAnnotationAction.tooltip" - class="org.eclipse.team.internal.ccvs.ui.actions.ShowAnnotationAction" - helpContextId="org.eclipse.team.cvs.ui.get_annotate_action_context" - id="org.eclipse.team.ccvs.ui.showAnnotation"> - </action> - </objectContribution> - <objectContribution - objectClass="org.eclipse.team.internal.ccvs.ui.model.RemoteModule" - id="org.eclipse.team.ccvs.ui.VersionCategoryContributions"> - <action - id="org.eclipse.team.ccvs.ui.configureTagsOnRemoteModule" - label="%ConfigureTags.label" - tooltip="%ConfigureTags.label" - icon="icons/full/clcl16/newstream_wiz.gif" - helpContextId="org.eclipse.team.cvs.ui.tag_configuration_overview" - class="org.eclipse.team.internal.ccvs.ui.actions.ConfigureTagsFromRepoViewOnFolder"/> - </objectContribution> - <objectContribution - objectClass="org.eclipse.team.internal.ccvs.ui.model.ProjectVersion" - id="org.eclipse.team.ccvs.ui.ProjectVersionContributions"> - <action - id="org.eclipse.team.ccvs.ui.configureTagsOnProjectVersion" - label="%ConfigureTags.label" - tooltip="%ConfigureTags.label" - icon="icons/full/clcl16/newstream_wiz.gif" - helpContextId="org.eclipse.team.cvs.ui.tag_configuration_overview" - class="org.eclipse.team.internal.ccvs.ui.actions.ConfigureTagsFromRepoView"/> - </objectContribution> - - <objectContribution - objectClass="org.eclipse.team.internal.ccvs.ui.repo.RepositoryRoot" - id="org.eclipse.team.ccvs.ui.RemoteRootContributions"> - <action - label="%CopyRepositoryNameAction.label" - tooltip="%CopyRepositoryNameAction.tooltip" - menubarPath="miscGroup" - class="org.eclipse.team.internal.ccvs.ui.repo.CopyRepositoryNameAction" - helpContextId="org.eclipse.team.cvs.ui.copy_repository_name_action_context" - id="org.eclipse.team.ccvs.ui.copyNames"> - </action> - <action - label="%RefreshTagsAction.label" - icon="icons/full/clcl16/newstream_wiz.gif" - tooltip="%RefreshTagsAction.tooltip" - menubarPath="tagGroup" - class="org.eclipse.team.internal.ccvs.ui.repo.RefreshTagsAction" - helpContextId="org.eclipse.team.cvs.ui.refresh_tags_action_context" - id="org.eclipse.team.ccvs.ui.refreshTags"> - </action> - </objectContribution> - <objectContribution - objectClass="org.eclipse.team.internal.ccvs.ui.model.BranchCategory" - id="org.eclipse.team.ccvs.ui.model.BranchCategoryContributions"> - <action - label="%RefreshTagsAction.label" - icon="icons/full/clcl16/newstream_wiz.gif" - tooltip="%RefreshTagsAction.tooltip" - menubarPath="tagGroup" - class="org.eclipse.team.internal.ccvs.ui.repo.RefreshTagsAction" - helpContextId="org.eclipse.team.cvs.ui.refresh_tags_action_context" - id="org.eclipse.team.ccvs.ui.refreshTags"> - </action> - </objectContribution> - <objectContribution - objectClass="org.eclipse.team.internal.ccvs.core.ICVSRemoteResource" - id="org.eclipse.team.ccvs.ui.RemoteResourceContributions"> - <action - label="%CompareRemoteResourcesAction.label" - menubarPath="miscGroup" - tooltip="%CompareRemoteResourcesAction.tooltip" - class="org.eclipse.team.internal.ccvs.ui.actions.CompareRemoteResourcesAction" - enablesFor="2" - helpContextId="org.eclipse.team.cvs.ui.compare_remote_resources_action_context" - id="org.eclipse.team.ccvs.ui.compareRemoteResources"> - </action> - <action - label="%CompareRemoteWithTagAction.label" - menubarPath="miscGroup" - tooltip="%CompareRemoteWithTagAction.tooltip" - class="org.eclipse.team.internal.ccvs.ui.actions.CompareRemoteWithTagAction" - helpContextId="org.eclipse.team.cvs.ui.compare_remote_with_tag_action_context" - id="org.eclipse.team.ccvs.ui.compareRemoteWithTag"> - </action> - <action - label="%MoveTagAction.label" - menubarPath="tagGroup" - tooltip="%MoveTagAction.tooltip" - class="org.eclipse.team.internal.ccvs.ui.actions.MoveRemoteTagAction" - helpContextId="org.eclipse.team.cvs.ui.move_remote_tag_action_context" - id="org.eclipse.team.ccvs.ui.moveTagInRepository"> - </action> - <action - label="%TagInRepositoryAction.label" - menubarPath="tagGroup" - tooltip="%TagInRepositoryAction.tooltip" - class="org.eclipse.team.internal.ccvs.ui.actions.TagInRepositoryAction" - helpContextId="org.eclipse.team.cvs.ui.tag_remote_action_context" - id="org.eclipse.team.ccvs.ui.tagInRepository"> - </action> - </objectContribution> - </extension> - -<!-- ************* Subscriber Menus ************ --> - <extension - point="org.eclipse.team.ui.subscriberMenus"> - <subscriberContribution - subscriberClass="org.eclipse.team.internal.ccvs.core.CVSWorkspaceSubscriber" - id="org.eclipse.team.ccvs.ui.CVSWorkspaceSubscriberContributions"> - <action - label="%CVSWorkspaceSubscriber.update.label" - tooltip="%CVSWorkspaceSubscriber.update.tooltip" - class="org.eclipse.team.internal.ccvs.ui.subscriber.WorkspaceUpdateAction" - helpContextId="org.eclipse.team.cvs.ui.workspace_subscriber_update_action" - id="org.eclipse.team.ccvs.ui.CVSWorkspaceSubscriber.update"> - </action> - <action - label="%CVSWorkspaceSubscriber.commit.label" - tooltip="%CVSWorkspaceSubscriber.commit.tooltip" - class="org.eclipse.team.internal.ccvs.ui.subscriber.SubscriberCommitAction" - helpContextId="org.eclipse.team.cvs.ui.workspace_subscriber_commit_action" - id="org.eclipse.team.ccvs.ui.CVSWorkspaceSubscriber.commit"> - </action> - <action - label="%CVSWorkspaceSubscriber.confirmMerged.label" - tooltip="%CVSWorkspaceSubscriber.confirmMerged.tooltip" - class="org.eclipse.team.internal.ccvs.ui.subscriber.SubscriberConfirmMergedAction" - helpContextId="org.eclipse.team.cvs.ui.workspace_subscriber_confirm_merged_action" - id="org.eclipse.team.ccvs.ui.CVSWorkspaceSubscriber.confirmMerged"> - </action> - </subscriberContribution> - <subscriberContribution - subscriberClass="org.eclipse.team.internal.ccvs.core.CVSMergeSubscriber" - id="org.eclipse.team.ccvs.ui.CVSMergeSubscriberContributions"> - <action - label="%CVSWorkspaceSubscriber.merge.label" - tooltip="%CVSWorkspaceSubscriber.merge.tooltip" - class="org.eclipse.team.internal.ccvs.ui.subscriber.MergeUpdateAction" - helpContextId="org.eclipse.team.cvs.ui.workspace_subscriber_merge_action" - id="org.eclipse.team.ccvs.ui.CVSMergeSubscriber.merge"> - </action> - <action - label="%CVSWorkspaceSubscriber.confirmMerged.label" - tooltip="%CVSWorkspaceSubscriber.confirmMerged.tooltip" - class="org.eclipse.team.internal.ccvs.ui.subscriber.SubscriberConfirmMergedAction" - helpContextId="org.eclipse.team.cvs.ui.workspace_subscriber_confirm_merged_action" - id="org.eclipse.team.ccvs.ui.CVSMergeSubscriber.confirmMerged"> - </action> - </subscriberContribution> - </extension> - -<!-- ************** Views ********************** --> - <extension - point="org.eclipse.ui.views"> - <category - name="%viewCategory" - id="org.eclipse.team.ccvs.ui"> - </category> - <view - name="%Console.name" - icon="icons/full/cview16/console_view.gif" - category="org.eclipse.team.ccvs.ui" - class="org.eclipse.team.internal.ccvs.ui.Console" - id="org.eclipse.team.ccvs.ui.console"> - </view> - <view - name="%RepositoriesView.name" - icon="icons/full/cview16/repo_rep.gif" - category="org.eclipse.team.ccvs.ui" - fastViewWidthRatio="0.5" - class="org.eclipse.team.internal.ccvs.ui.repo.RepositoriesView" - id="org.eclipse.team.ccvs.ui.RepositoriesView"> - </view> - <view - name="%HistoryView.name" - icon="icons/full/cview16/history_view.gif" - category="org.eclipse.team.ccvs.ui" - class="org.eclipse.team.internal.ccvs.ui.HistoryView" - id="org.eclipse.team.ccvs.ui.HistoryView"> - </view> - <view - name="%EditorsView.name" - icon="icons/full/cview16/rep_editors_view.gif" - category="org.eclipse.team.ccvs.ui" - class="org.eclipse.team.internal.ccvs.ui.EditorsView" - id="org.eclipse.team.ccvs.ui.EditorsView"> - </view> - <view - name="%AnnotateView.name" - icon="icons/full/cview16/annotate_view.gif" - category="org.eclipse.team.ccvs.ui" - class="org.eclipse.team.internal.ccvs.ui.AnnotateView" - id="org.eclipse.team.ccvs.ui.AnnotateView"> - </view> - </extension> -<!-- **************** Preferences ******************* --> - <extension - point="org.eclipse.ui.preferencePages"> - <page - name="%PreferencePage.name" - category="org.eclipse.team.ui.TeamPreferences" - class="org.eclipse.team.internal.ccvs.ui.CVSPreferencesPage" - id="org.eclipse.team.cvs.ui.CVSPreferences"> - </page> - </extension> - <extension - point="org.eclipse.ui.preferencePages"> - <page - name="%ConsolePreferencePage.name" - category="org.eclipse.team.cvs.ui.CVSPreferences" - class="org.eclipse.team.internal.ccvs.ui.ConsolePreferencesPage" - id="org.eclipse.team.cvs.ui.ConsolePreferences"> - </page> - </extension> - <extension - point="org.eclipse.ui.preferencePages"> - <page - name="%DecoratorPreferencePage.name" - category="org.eclipse.team.cvs.ui.CVSPreferences" - class="org.eclipse.team.internal.ccvs.ui.CVSDecoratorPreferencesPage" - id="org.eclipse.team.cvs.ui.CVSDecoratorPreferences"> - </page> - </extension> - <extension - point="org.eclipse.ui.preferencePages"> - <page - name="%ExtMethodPreferencePage.name" - category="org.eclipse.team.cvs.ui.CVSPreferences" - class="org.eclipse.team.internal.ccvs.ui.ExtMethodPreferencePage" - id="org.eclipse.team.cvs.ui.ExtMethodPreferencePage"> - </page> - </extension> - <extension - point="org.eclipse.ui.preferencePages"> - <page - name="%WatchEditPreferencePage.name" - category="org.eclipse.team.cvs.ui.CVSPreferences" - class="org.eclipse.team.internal.ccvs.ui.WatchEditPreferencePage" - id="org.eclipse.team.cvs.ui.WatchEditPreferencePage"> - </page> - </extension> - <extension - point="org.eclipse.ui.preferencePages"> - <page - name="%WorkInProgress.name" - category="org.eclipse.team.cvs.ui.CVSPreferences" - class="org.eclipse.team.internal.ccvs.ui.WorkInProgressPreferencePage" - id="org.eclipse.team.cvs.ui.WorkInProgress"> - </page> - </extension> - -<!-- **************** Decorator ******************* --> - <extension - point="org.eclipse.ui.decorators"> - <decorator - objectClass="org.eclipse.core.resources.IResource" - adaptable="true" - label="%DecoratorStandard.name" - state="false" - lightweight= "true" - quadrant = "BOTTOM_RIGHT" - class="org.eclipse.team.internal.ccvs.ui.CVSLightweightDecorator" - id="org.eclipse.team.cvs.ui.decorator"> - <description> - %DecoratorStandard.desc - </description> - </decorator> - </extension> -<!-- *************** View Actions **************** --> - <extension - point="org.eclipse.ui.viewActions"> - <viewContribution - targetID="org.eclipse.team.ccvs.ui.HistoryView" - id="org.eclipse.team.cvs.ui.history"> - <action - label="%HistoryFilter.label" - icon="icons/full/elcl16/filter_history.gif" - disabledIcon="icons/full/dlcl16/filter_history.gif" - hoverIcon="icons/full/clcl16/filter_history.gif" - tooltip="%HistoryFilter.tooltip" - class="org.eclipse.team.internal.ccvs.ui.HistoryFilterAction" - toolbarPath="actions" - id="org.eclipse.team.cvs.ui.historyaction"> - </action> - </viewContribution> - </extension> - -<!-- **************** CVS Perspective ******************* --> - <extension - point="org.eclipse.ui.perspectives"> - <perspective - name="%CVSRepositoryExploring" - icon="icons/full/cview16/cvs_persp.gif" - class="org.eclipse.team.internal.ccvs.ui.CVSPerspective" - id="org.eclipse.team.cvs.ui.cvsPerspective"> - </perspective> - </extension> -<!-- ************** Perspective Extensions **************** --> - <extension - point="org.eclipse.ui.perspectiveExtensions"> - <perspectiveExtension - targetID="org.eclipse.ui.resourcePerspective"> - <perspectiveShortcut - id="org.eclipse.team.cvs.ui.cvsPerspective"> - </perspectiveShortcut> - <view id="org.eclipse.team.ccvs.ui.console" - relative="org.eclipse.ui.views.TaskList" - visible="false" - relationship="stack"/> - <view id="org.eclipse.team.ccvs.ui.HistoryView" - relative="org.eclipse.ui.views.TaskList" - visible="false" - relationship="stack"/> - <view id="org.eclipse.team.ccvs.ui.RepositoriesView" - relative="org.eclipse.ui.views.ResourceNavigator" - visible="false" - relationship="stack"/> - <view id="org.eclipse.team.ccvs.ui.AnnotateView" - relative="org.eclipse.ui.views.ResourceNavigator" - visible="false" - relationship="stack"/> - </perspectiveExtension> - <perspectiveExtension - targetID="org.eclipse.team.cvs.ui.cvsPerspective"> - <actionSet id="org.eclipse.team.cvs.ui.CVSActionSet"/> - <view id="org.eclipse.team.ccvs.ui.AnnotateView" - relative="org.eclipse.team.ccvs.ui.RepositoriesView" - relationship="stack"/> - </perspectiveExtension> - </extension> - - <!-- ************** Project Sets **************** --> - <extension point="org.eclipse.team.core.projectSets"> - <projectSet id="org.eclipse.team.cvs.core.cvsnature" class="org.eclipse.team.internal.ccvs.ui.CVSProjectSetSerializer"/> - </extension> - - - <!-- ************ Editor Actions ************** --> - <extension point="org.eclipse.ui.editorActions"> - <editorContribution - id="org.eclipse.team.cvs.ui.contentCompare" - targetID="org.eclipse.compare.CompareEditor"> - <action - id="org.eclipse.team.cvs.ui.ContentAction" - state="false" - toolbarPath="Normal/additions" - icon="icons/full/etool16/contents.gif" - disabledIcon="icons/full/dtool16/contents.gif" - hoverIcon="icons/full/ctool16/contents.gif" - label="%ContentAction.label" - tooltip="%ContentAction.tooltip" - class="org.eclipse.team.internal.ccvs.ui.actions.ContentAction"> - </action> - </editorContribution> - </extension> - - <!-- ********** Action Sets ************** --> - <extension point="org.eclipse.ui.actionSets"> - <actionSet - label="%CVS" - visible="false" - id="org.eclipse.team.cvs.ui.CVSActionSet" - description="%CVSActionSet.description"> - <action - toolbarPath="Normal/CVS" - label="%CVSActionSet.newLabel" - tooltip="%CVSActionSet.newTooltip" - icon="icons/full/wizards/newconnect_wiz.gif" - class="org.eclipse.team.internal.ccvs.ui.actions.NewRepositoryAction" - id="org.eclipse.team.cvs.ui.actions.NewRepositoryAction" - definitionId="org.eclipse.team.cvs.ui.new.location"> - </action> - </actionSet> - </extension> - - <!-- ********** Font Definitions ************** --> - <extension - point="org.eclipse.ui.fontDefinitions"> - <fontDefinition - label="%CVSConsoleFont.label" - defaultsTo="org.eclipse.jface.textfont" - id="pref_console_font"> - <description> - %CVSConsoleFont.description - </description> - </fontDefinition> - </extension> -</plugin> diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AdaptableHierarchicalResourceList.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AdaptableHierarchicalResourceList.java deleted file mode 100644 index cd1edfe4b..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AdaptableHierarchicalResourceList.java +++ /dev/null @@ -1,102 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import java.util.HashSet; -import java.util.Set; - -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IWorkspaceRoot; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.Path; -import org.eclipse.jface.viewers.ITreeContentProvider; -import org.eclipse.ui.model.WorkbenchContentProvider; - -/** - * This class acts as an adaptable list that will return the resources in the - * hierarchy indicated by their paths - */ -public class AdaptableHierarchicalResourceList extends AdaptableResourceList { - private IContainer root; - - /** - * Constructor for AdaptableHierarchicalResourceList. - * @param resources - */ - public AdaptableHierarchicalResourceList(IContainer root, IResource[] resources) { - super(resources); - this.root = root; - } - - /** - * @see org.eclipse.ui.model.IWorkbenchAdapter#getChildren(java.lang.Object) - */ - public Object[] getChildren(Object o) { - return getChildenFor(root); - } - - private IResource[] getChildenFor(IContainer parent) { - Set children = new HashSet(); - IPath parentPath = parent.getFullPath(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; - IPath resourcePath = resource.getFullPath(); - if (parent instanceof IWorkspaceRoot) { - children.add(((IWorkspaceRoot)parent).getProject(resourcePath.segment(0))); - } else if (parentPath.isPrefixOf(resourcePath)) { - IPath parentRelativePath = resourcePath.removeFirstSegments(parentPath.segmentCount()); - if (parentRelativePath.segmentCount() == 1) { - children.add(resource); - } else if (parentRelativePath.segmentCount() > 1) { - children.add(parent.getFolder(new Path(parentRelativePath.segment(0)))); - } - } - } - return (IResource[]) children.toArray(new IResource[children.size()]); - } - - /** - * Returns a content provider for <code>IResource</code>s that returns - * only children of the given resource type. - */ - public ITreeContentProvider getTreeContentProvider() { - return new WorkbenchContentProvider() { - public Object[] getChildren(Object o) { - if (o instanceof IContainer) { - return getChildenFor((IContainer) o); - } else { - return super.getChildren(o); - } - } - }; - } - - public void setResources(IResource[] resources) { - this.resources = resources; - } - /** - * Returns the root. - * @return IContainer - */ - public IContainer getRoot() { - return root; - } - - /** - * Sets the root. - * @param root The root to set - */ - public void setRoot(IContainer root) { - this.root = root; - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AdaptableResourceList.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AdaptableResourceList.java deleted file mode 100644 index d8179f457..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AdaptableResourceList.java +++ /dev/null @@ -1,62 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.ui.model.IWorkbenchAdapter; - -/** - * This class acts as a resource list that can be used in table widgets. - */ -public class AdaptableResourceList implements IAdaptable, IWorkbenchAdapter { - - IResource[] resources; - - public AdaptableResourceList(IResource[] resources) { - this.resources = resources; - } - - /** - * @see org.eclipse.core.runtime.IAdaptable#getAdapter(Class) - */ - public Object getAdapter(Class adapter) { - if (adapter == IWorkbenchAdapter.class) return this; - return null; - } - - /** - * @see org.eclipse.ui.model.IWorkbenchAdapter#getChildren(Object) - */ - public Object[] getChildren(Object o) { - return resources; - } - /** - * @see org.eclipse.ui.model.IWorkbenchAdapter#getImageDescriptor(java.lang.Object) - */ - public ImageDescriptor getImageDescriptor(Object object) { - return null; - } - /** - * @see org.eclipse.ui.model.IWorkbenchAdapter#getLabel(java.lang.Object) - */ - public String getLabel(Object o) { - return o == null ? "" : o.toString();//$NON-NLS-1$ - } - /** - * @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object) - */ - public Object getParent(Object o) { - return null; - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AddToVersionControlDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AddToVersionControlDialog.java deleted file mode 100644 index f6a310d44..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AddToVersionControlDialog.java +++ /dev/null @@ -1,219 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import java.util.Arrays; -import java.util.List; - -import org.eclipse.core.resources.IResource; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.viewers.CheckboxTableViewer; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.internal.ui.dialogs.DetailsDialog; -import org.eclipse.ui.help.WorkbenchHelp; -import org.eclipse.ui.model.WorkbenchContentProvider; -import org.eclipse.ui.model.WorkbenchLabelProvider; - -/** - * This dialog allows the user to add a set of resources to version control. - * They can either all be added or the user can choose which to add from a - * details list. - */ -public class AddToVersionControlDialog extends DetailsDialog { - - private static final int WIDTH_HINT = 350; - private final static int SELECTION_HEIGHT_HINT = 100; - - private IResource[] unaddedResources; - private Object[] resourcesToAdd; - - private CheckboxTableViewer listViewer; - /** - * Constructor for AddToVersionControlDialog. - * @param parentShell - */ - public AddToVersionControlDialog(Shell parentShell, IResource[] unaddedResources) { - super(parentShell, Policy.bind("AddToVersionControlDialog.title")); //$NON-NLS-1$ - this.unaddedResources = unaddedResources; - } - - /** - * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) - */ - protected void createMainDialogArea(Composite parent) { - Composite composite = new Composite(parent, SWT.NULL); - composite.setLayout(new GridLayout()); - composite.setLayoutData(new GridData(GridData.FILL_BOTH)); - - // set F1 help - WorkbenchHelp.setHelp(composite, IHelpContextIds.ADD_TO_VERSION_CONTROL_DIALOG); - - // add a description label - if (unaddedResources.length==1) { - createWrappingLabel(composite, Policy.bind("AddToVersionControlDialog.thereIsAnUnaddedResource", new Integer(unaddedResources.length).toString())); //$NON-NLS-1$ - } else { - createWrappingLabel(composite, Policy.bind("AddToVersionControlDialog.thereAreUnaddedResources", new Integer(unaddedResources.length).toString())); //$NON-NLS-1$ - } - } - - /** - * @see org.eclipse.team.internal.ui.DetailsDialog#createDropDownDialogArea(org.eclipse.swt.widgets.Composite) - */ - protected Composite createDropDownDialogArea(Composite parent) { - // create a composite with standard margins and spacing - Composite composite = new Composite(parent, SWT.NONE); - GridLayout layout = new GridLayout(); - layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN); - layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN); - layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING); - layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING); - composite.setLayout(layout); - composite.setLayoutData(new GridData(GridData.FILL_BOTH)); - composite.setFont(parent.getFont()); - - addUnaddedResourcesArea(composite); - - // set F1 help - WorkbenchHelp.setHelp(composite, IHelpContextIds.ADD_TO_VERSION_CONTROL_DIALOG); - - return composite; - } - - private void addUnaddedResourcesArea(Composite composite) { - - // add a description label - createWrappingLabel(composite, Policy.bind("ReleaseCommentDialog.unaddedResources")); //$NON-NLS-1$ - - // add the selectable checkbox list - listViewer = CheckboxTableViewer.newCheckList(composite, SWT.BORDER); - GridData data = new GridData(GridData.FILL_BOTH); - data.heightHint = SELECTION_HEIGHT_HINT; - data.widthHint = WIDTH_HINT; - listViewer.getTable().setLayoutData(data); - - // set the contents of the list - listViewer.setLabelProvider(new WorkbenchLabelProvider() { - protected String decorateText(String input, Object element) { - if (element instanceof IResource) - return ((IResource)element).getFullPath().toString(); - else - return input; - } - }); - listViewer.setContentProvider(new WorkbenchContentProvider()); - listViewer.setInput(new AdaptableResourceList(unaddedResources)); - if (resourcesToAdd == null) { - listViewer.setAllChecked(true); - } else { - listViewer.setCheckedElements(resourcesToAdd); - } - listViewer.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - resourcesToAdd = listViewer.getCheckedElements(); - } - }); - - addSelectionButtons(composite); - } - - /** - * Add the selection and deselection buttons to the dialog. - * @param composite org.eclipse.swt.widgets.Composite - */ - private void addSelectionButtons(Composite composite) { - - Composite buttonComposite = new Composite(composite, SWT.RIGHT); - GridLayout layout = new GridLayout(); - layout.numColumns = 2; - buttonComposite.setLayout(layout); - GridData data = - new GridData(GridData.HORIZONTAL_ALIGN_END | GridData.GRAB_HORIZONTAL); - data.grabExcessHorizontalSpace = true; - composite.setData(data); - - Button selectButton = createButton(buttonComposite, IDialogConstants.SELECT_ALL_ID, Policy.bind("ReleaseCommentDialog.selectAll"), false); //$NON-NLS-1$ - SelectionListener listener = new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - listViewer.setAllChecked(true); - resourcesToAdd = null; - } - }; - selectButton.addSelectionListener(listener); - - Button deselectButton = createButton(buttonComposite, IDialogConstants.DESELECT_ALL_ID, Policy.bind("ReleaseCommentDialog.deselectAll"), false); //$NON-NLS-1$ - listener = new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - listViewer.setAllChecked(false); - resourcesToAdd = new Object[0]; - - } - }; - deselectButton.addSelectionListener(listener); - } - - /** - * @see org.eclipse.team.internal.ui.DetailsDialog#updateEnablements() - */ - protected void updateEnablements() { - } - - /** - * Returns the resourcesToAdd. - * @return IResource[] - */ - public IResource[] getResourcesToAdd() { - if (resourcesToAdd == null) { - return unaddedResources; - } else { - List result = Arrays.asList(resourcesToAdd); - return (IResource[]) result.toArray(new IResource[result.size()]); - } - } - - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite) - */ - protected void createButtonsForButtonBar(Composite parent) { - createButton(parent, IDialogConstants.YES_ID, IDialogConstants.YES_LABEL, true); - createButton(parent, IDialogConstants.NO_ID, IDialogConstants.NO_LABEL, true); - super.createButtonsForButtonBar(parent); - } - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.DetailsDialog#includeOkButton() - */ - protected boolean includeOkButton() { - return false; - } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#buttonPressed(int) - */ - protected void buttonPressed(int id) { - // hijack yes and no buttons to set the correct return - // codes. - if(id == IDialogConstants.YES_ID || id == IDialogConstants.NO_ID) { - setReturnCode(id); - close(); - } else { - super.buttonPressed(id); - } - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AlternateUserValidationDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AlternateUserValidationDialog.java deleted file mode 100644 index 520278890..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AlternateUserValidationDialog.java +++ /dev/null @@ -1,241 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.VerifyEvent; -import org.eclipse.swt.events.VerifyListener; -import org.eclipse.swt.graphics.Font; -import org.eclipse.swt.graphics.FontData; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.Text; - -public class AlternateUserValidationDialog extends Dialog { - String user; - String password = ""; //$NON-NLS-1$ - List numXs = new ArrayList(); - Font font; - Label icon1; - Label icon2; - Label icon3; - Label icon4; - Text passwordText; - boolean inUpdate = false; - - Image[] images; - - public AlternateUserValidationDialog(Shell parentShell, String user) { - super(parentShell); - this.user = user; - initializeImages(); - } - - protected void configureShell(Shell newShell) { - super.configureShell(newShell); - newShell.setText(Policy.bind("AlternateUserValidationDialog.Enter_Password_2")); //$NON-NLS-1$ - } - - protected Control createContents(Composite parent) { - Composite main = new Composite(parent, SWT.NONE); - GridLayout layout = new GridLayout(); - layout.numColumns = 3; - main.setLayout(layout); - main.setLayoutData(new GridData(GridData.FILL_BOTH)); - - Composite iconComposite = new Composite(main, SWT.NONE); - layout = new GridLayout(); - layout.numColumns = 2; - iconComposite.setLayout(layout); - iconComposite.setLayoutData(new GridData()); - - icon1 = createLabel(iconComposite); - icon2 = createLabel(iconComposite); - icon3 = createLabel(iconComposite); - icon4 = createLabel(iconComposite); - - Composite middleComposite = new Composite(main, SWT.NONE); - middleComposite.setLayout(new GridLayout()); - middleComposite.setLayoutData(new GridData()); - - Label l = new Label(middleComposite, SWT.NULL); - l.setText(Policy.bind("AlternateUserValidationDialog.message", user)); //$NON-NLS-1$ - l.setLayoutData(new GridData()); - l = new Label(middleComposite, SWT.NULL); - l.setText(""); //$NON-NLS-1$ - l.setLayoutData(new GridData()); - passwordText = new Text(middleComposite, SWT.SINGLE | SWT.BORDER); - GridData data = new GridData(); - data.widthHint = 250; - passwordText.setLayoutData(data); - - passwordText.setFont(font); - passwordText.addVerifyListener(new VerifyListener() { - public void verifyText(VerifyEvent e) { - if (inUpdate) return; - e.doit = false; - inUpdate = true; - switch ((int)e.character) { - case 8: { - // backspace pressed - if (password.length() > 0) { - password = password.substring(0, password.length() - 1); - } - // get rid of bogus Xs - int numX = ((Integer)numXs.get(numXs.size() - 1)).intValue(); - numXs.remove(numXs.size() - 1); - String oldText = passwordText.getText(); - String newText = oldText.substring(0, oldText.length() - numX); - passwordText.setText(newText); - passwordText.setSelection(newText.length()); - break; - } - default: { - String oldText = passwordText.getText(); - String x = getXs(); - numXs.add(numXs.size(), new Integer(x.length())); - String newText = oldText + x; - passwordText.setText(newText); - passwordText.setSelection(newText.length()); - password += e.character; - } - } - inUpdate = false; - updateImages(); - } - }); - /*passwordText.addTraverseListener(new TraverseListener() { - public void keyTraversed(TraverseEvent e) { - switch (e.detail) { - case SWT.TRAVERSE_ARROW_NEXT: - case SWT.TRAVERSE_ARROW_PREVIOUS: - e.detail = SWT.TRAVERSE_NONE; - e.doit = false; - break; - } - } - });*/ - Composite buttonComposite = new Composite(main, SWT.NONE); - buttonComposite.setLayout(new GridLayout()); - buttonComposite.setLayoutData(new GridData()); - Button b = new Button(buttonComposite, SWT.PUSH); - b.setText(Policy.bind("AlternateUserValidationDialog.OK_6")); //$NON-NLS-1$ - data = new GridData(); - data.widthHint = 70; - b.setLayoutData(data); - b.addListener(SWT.Selection, new Listener() { - public void handleEvent(Event event) { - okPressed(); - } - }); - buttonComposite.getShell().setDefaultButton(b); - b = new Button(buttonComposite, SWT.PUSH); - b.setText(Policy.bind("AlternateUserValidationDialog.Cancel_7")); //$NON-NLS-1$ - data = new GridData(); - data.widthHint = 70; - b.setLayoutData(data); - b.addListener(SWT.Selection, new Listener() { - public void handleEvent(Event event) { - cancelPressed(); - } - }); - - return main; - } - - public boolean close() { - boolean result = super.close(); - if (font != null) font.dispose(); - if (images != null) { - for (int i = 0; i < images.length; i++) { - images[i].dispose(); - images[i] = null; - } - images = null; - } - return result; - } - public String getPassword() { - return password; - } - - Label createLabel(Composite parent) { - Label result = new Label(parent, SWT.NULL); - GridData data = new GridData(); - data.widthHint = 22; - data.heightHint = 22; - result.setLayoutData(data); - result.setImage(getImage()); - return result; - } - Image getImage() { - double random = Math.random(); - random *= 7; // Random number between 0.0 and 7.0 - long num = Math.round(random); - return images[(int)num]; - } - void initializeImages() { - images = new Image[8]; - for (int i = 0; i < images.length; i++) { - images[i] = CVSUIPlugin.getPlugin().getImageDescriptor("glyphs/glyph" + (i+1) + ".gif").createImage(); //$NON-NLS-1$ //$NON-NLS-2$ - } - FontData fd = new FontData(); - fd.setStyle(SWT.BOLD); - fd.setHeight(10); - // On Windows, set the font to Sans Serif for an authentic look - if (System.getProperty("os.name").indexOf("Windows") != -1) { //$NON-NLS-1$ //$NON-NLS-2$ - fd.setName("Microsoft Sans Serif"); //$NON-NLS-1$ - } - font = new Font(Display.getDefault(), fd); - } - void updateImages() { - icon1.setImage(getImage()); - icon2.setImage(getImage()); - icon3.setImage(getImage()); - icon4.setImage(getImage()); - } - public void setUsername(String user) { - this.user = user; - } - String getXs() { - double random = Math.random(); - random *= 2; - random += 2; - long num = Math.round(random); - // Random number between 2 and 4 - switch ((int)num) { - case 2: - return "XX"; //$NON-NLS-1$ - case 3: - return "XXX"; //$NON-NLS-1$ - case 4: - return "XXXX"; //$NON-NLS-1$ - } - return "X"; //$NON-NLS-1$ - } - protected void cancelPressed() { - password = null; - super.cancelPressed(); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AnnotateView.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AnnotateView.java deleted file mode 100644 index 0a4280732..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AnnotateView.java +++ /dev/null @@ -1,356 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import java.io.IOException; -import java.io.InputStream; -import java.lang.reflect.InvocationTargetException; -import java.util.Collection; -import java.util.Iterator; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.ITextSelection; -import org.eclipse.jface.viewers.ArrayContentProvider; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.ISelectionProvider; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jface.viewers.ListViewer; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Label; -import org.eclipse.team.internal.ccvs.core.CVSAnnotateBlock; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFile; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.ui.IEditorDescriptor; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.IEditorRegistry; -import org.eclipse.ui.IReusableEditor; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.help.WorkbenchHelp; -import org.eclipse.ui.internal.IWorkbenchConstants; -import org.eclipse.ui.internal.WorkbenchPlugin; -import org.eclipse.ui.internal.registry.EditorDescriptor; -import org.eclipse.ui.part.ViewPart; -import org.eclipse.ui.texteditor.IDocumentProvider; -import org.eclipse.ui.texteditor.ITextEditor; - -/** - * A view showing the results of the CVS Annotate Command. A linked - * combination of a View of annotations, a source editor and the - * Resource History View - */ -public class AnnotateView extends ViewPart implements ISelectionChangedListener { - - ITextEditor editor; - HistoryView historyView; - IWorkbenchPage page; - - ListViewer viewer; - IDocument document; - Collection cvsAnnotateBlocks; - ICVSResource cvsResource; - InputStream contents; - - IStructuredSelection previousListSelection; - ITextSelection previousTextSelection; - boolean lastSelectionWasText = false; - - - public static final String VIEW_ID = "org.eclipse.team.ccvs.ui.AnnotateView"; //$NON-NLS-1$ - private Composite top; - - public AnnotateView() { - super(); - } - - public void createPartControl(Composite parent) { - - this.top = parent; - - // Create default contents - Label label = new Label(top, SWT.WRAP); - label.setText(Policy.bind("CVSAnnotateView.viewInstructions")); //$NON-NLS-1$ - label.setLayoutData(new GridData(GridData.FILL_BOTH)); - top.layout(); - } - - /** - * Show the annotation view. - * @param cvsResource - * @param cvsAnnotateBlocks - * @param contents - * @throws InvocationTargetException - */ - public void showAnnotations(ICVSResource cvsResource, Collection cvsAnnotateBlocks, InputStream contents) throws InvocationTargetException { - showAnnotations(cvsResource, cvsAnnotateBlocks, contents, true); - } - - /** - * Show the annotation view. - * @param cvsResource - * @param cvsAnnotateBlocks - * @param contents - * @param useHistoryView - * @throws InvocationTargetException - */ - public void showAnnotations(ICVSResource cvsResource, Collection cvsAnnotateBlocks, InputStream contents, boolean useHistoryView) throws InvocationTargetException { - - // Remove old viewer - Control[] oldChildren = top.getChildren(); - if (oldChildren != null) { - for (int i = 0; i < oldChildren.length; i++) { - oldChildren[i].dispose(); - } - } - - viewer = new ListViewer(top, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER); - viewer.setContentProvider(new ArrayContentProvider()); - viewer.setLabelProvider(new LabelProvider()); - viewer.addSelectionChangedListener(this); - viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH)); - - WorkbenchHelp.setHelp(viewer.getControl(), IHelpContextIds.ANNOTATE_VIEW); - - top.layout(); - - this.cvsResource = cvsResource; - this.contents = contents; - this.cvsAnnotateBlocks = cvsAnnotateBlocks; - page = CVSUIPlugin.getActivePage(); - viewer.setInput(cvsAnnotateBlocks); - editor = (ITextEditor) openEditor(); - IDocumentProvider provider = editor.getDocumentProvider(); - document = provider.getDocument(editor.getEditorInput()); - - setTitle(Policy.bind("CVSAnnotateView.showFileAnnotation", new Object[] {cvsResource.getName()})); //$NON-NLS-1$ - - if (!useHistoryView) { - return; - } - - // Get hook to the HistoryView - - try { - historyView = (HistoryView) page.showView(HistoryView.VIEW_ID); - historyView.showHistory((ICVSRemoteFile) CVSWorkspaceRoot.getRemoteResourceFor(cvsResource)); - } catch (PartInitException e) { - throw new InvocationTargetException(e); - } catch (CVSException e) { - throw new InvocationTargetException(e); - } - } - - /** - * Makes the view visible in the active perspective. If there - * isn't a view registered <code>null</code> is returned. - * Otherwise the opened view part is returned. - */ - public static AnnotateView openInActivePerspective() { - try { - return (AnnotateView) CVSUIPlugin.getActivePage().showView(VIEW_ID); - } catch (PartInitException pe) { - return null; - } - } - - /** - * Selection changed in either the Annotate List View or the - * Source editor. - */ - public void selectionChanged(SelectionChangedEvent event) { - - if (event.getSelection() instanceof IStructuredSelection) { - listSelectionChanged((IStructuredSelection) event.getSelection()); - } else if (event.getSelection() instanceof ITextSelection) { - textSelectionChanged((ITextSelection) event.getSelection()); - } - - - } - - /** - * A selection event in the Annotate Source Editor - * @param event - */ - private void textSelectionChanged(ITextSelection selection) { - - // Track where the last selection event came from to avoid - // a selection event loop. - lastSelectionWasText = true; - - // Locate the annotate block containing the selected line number. - CVSAnnotateBlock match = null; - for (Iterator iterator = cvsAnnotateBlocks.iterator(); iterator.hasNext();) { - CVSAnnotateBlock block = (CVSAnnotateBlock) iterator.next(); - if (block.contains(selection.getStartLine())) { - match = block; - break; - } - } - - // Select the annotate block in the List View. - if (match == null) { - return; - } - - StructuredSelection listSelection = new StructuredSelection(match); - viewer.setSelection(listSelection, true); - } - - /** - * A selection event in the Annotate List View - * @param selection - */ - private void listSelectionChanged(IStructuredSelection selection) { - - // If the editor was closed, reopen it. - if (editor == null || editor.getSelectionProvider() == null) { - try { - contents.reset(); - showAnnotations(cvsResource, cvsAnnotateBlocks, contents, false); - } catch (InvocationTargetException e) { - return; - } catch (IOException e) { - return; - } - } - - ISelectionProvider selectionProvider = editor.getSelectionProvider(); - if (selectionProvider == null) { - // Failed to open the editor but what else can we do. - return; - } - - ITextSelection textSelection = (ITextSelection) selectionProvider.getSelection(); - CVSAnnotateBlock listSelection = (CVSAnnotateBlock) selection.getFirstElement(); - - /** - * Ignore event if the current text selection is already equal to the corresponding - * list selection. Nothing to do. This prevents infinite event looping. - * - * Extra check to handle single line deltas - */ - - if (textSelection.getStartLine() == listSelection.getStartLine() && textSelection.getEndLine() == listSelection.getEndLine() && selection.equals(previousListSelection)) { - return; - } - - // If the last selection was a text selection then bale to prevent a selection loop. - if (!lastSelectionWasText) { - try { - int start = document.getLineOffset(listSelection.getStartLine()); - int end = document.getLineOffset(listSelection.getEndLine() + 1); - editor.selectAndReveal(start, end - start); - if (editor != null && !page.isPartVisible(editor)) { - page.activate(editor); - } - - } catch (BadLocationException e) { - // Ignore - nothing we can do. - } - } - - - // Select the revision in the history view. - historyView.selectRevision(listSelection.getRevision()); - lastSelectionWasText = false; - } - - /** - * Try and open the correct registered editor type for the file. If the registered - * editor is *not* an ITextEditor then open the source in a default text editor. - * @return - * @throws InvocationTargetException - */ - private IEditorPart openEditor() throws InvocationTargetException { - // Open the editor - IEditorPart part; - - IEditorRegistry registry = CVSUIPlugin.getPlugin().getWorkbench().getEditorRegistry(); - ICVSRemoteFile file; - - try { - file = (ICVSRemoteFile) CVSWorkspaceRoot.getRemoteResourceFor(cvsResource); - } catch (CVSException e1) { - throw new InvocationTargetException(e1); - } - - IEditorDescriptor descriptor = registry.getDefaultEditor(file.getName()); - - // Determine if the registered editor is an ITextEditor. - - String id; - - if (descriptor == null || !(descriptor instanceof EditorDescriptor) || !(((EditorDescriptor)descriptor).isInternal())) { - id = IWorkbenchConstants.DEFAULT_EDITOR_ID; //$NON-NLS-1$ - } else { - try { - Object obj = WorkbenchPlugin.createExtension(((EditorDescriptor) descriptor).getConfigurationElement(), "class"); //$NON-NLS-1$ - if (obj instanceof ITextEditor) { - id = descriptor.getId(); - } else { - id = IWorkbenchConstants.DEFAULT_EDITOR_ID; - } - } catch (CoreException e) { - id = IWorkbenchConstants.DEFAULT_EDITOR_ID; - } - } - - // Either reuse an existing editor or open a new editor of the correct type. - try { - try { - if (editor != null && editor instanceof IReusableEditor && page.isPartVisible(editor) && editor.getSite().getId().equals(id)) { - // We can reuse the editor - ((IReusableEditor) editor).setInput(new RemoteAnnotationEditorInput(file, contents)); - part = editor; - } else { - // We can not reuse the editor so close the existing one and open a new one. - if (editor != null) { - page.closeEditor(editor, false); - editor = null; - } - part = page.openEditor(new RemoteAnnotationEditorInput(file, contents), id); - } - } catch (PartInitException e) { - if (id.equals(IWorkbenchConstants.DEFAULT_EDITOR_ID)) { - throw e; - } else { - // Could not open desired editor, try a default text editor. - part = page.openEditor(new RemoteAnnotationEditorInput(file, contents), IWorkbenchConstants.DEFAULT_EDITOR_ID); //$NON-NLS-1$ - } - } - } catch (PartInitException e) { - // Total failure. - throw new InvocationTargetException(e); - } - - // Hook Editor selection listener. - ITextEditor editor = (ITextEditor) part; - editor.getSelectionProvider().addSelectionChangedListener(this); - return part; - } - - // This method implemented to be an ISelectionChangeListener but we - // don't really care when the List or Editor get focus. - public void setFocus() { - return; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AvoidableMessageDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AvoidableMessageDialog.java deleted file mode 100644 index 3259f7911..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AvoidableMessageDialog.java +++ /dev/null @@ -1,63 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Shell; - -public class AvoidableMessageDialog extends MessageDialog { - Button dontShowAgain; - boolean dontShow; - boolean showOption; - - public AvoidableMessageDialog(Shell shell, String dialogTitle, Image dialogTitleImage, String dialogMessage, int dialogImageType, String[] dialogButtonLabels, int defaultIndex) { - this(shell, dialogTitle, dialogTitleImage, dialogMessage, dialogImageType, dialogButtonLabels, defaultIndex, true); - } - - public AvoidableMessageDialog(Shell shell, String dialogTitle, Image dialogTitleImage, String dialogMessage, int dialogImageType, String[] dialogButtonLabels, int defaultIndex, boolean showOption) { - super(shell, dialogTitle, dialogTitleImage, dialogMessage, dialogImageType, dialogButtonLabels, defaultIndex); - this.showOption = showOption; - } - - protected Control createCustomArea(Composite composite) { - if ( ! showOption) return null; - dontShow = false; - dontShowAgain = new Button(composite, SWT.CHECK); - GridData data = new GridData(); - data.horizontalIndent = 50; - dontShowAgain.setLayoutData(data); - dontShowAgain.setText(Policy.bind("AvoidableMessageDialog.dontShowAgain")); //$NON-NLS-1$ - dontShowAgain.setSelection(dontShow); - dontShowAgain.addSelectionListener(new SelectionListener() { - public void widgetSelected(SelectionEvent e) { - dontShow = dontShowAgain.getSelection(); - } - public void widgetDefaultSelected(SelectionEvent e) { - widgetSelected(e); - } - - }); - return dontShowAgain; - } - - public boolean isDontShowAgain() { - return dontShow; - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/BranchPromptDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/BranchPromptDialog.java deleted file mode 100644 index 8547bc65a..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/BranchPromptDialog.java +++ /dev/null @@ -1,259 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import org.eclipse.core.runtime.IStatus; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.Text; -import org.eclipse.swt.widgets.Tree; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.team.internal.ccvs.ui.merge.ProjectElement; -import org.eclipse.team.internal.ccvs.ui.repo.RepositorySorter; -import org.eclipse.team.internal.ccvs.ui.wizards.CVSWizardPage; -import org.eclipse.team.internal.ui.dialogs.DetailsDialog; -import org.eclipse.ui.help.WorkbenchHelp; -import org.eclipse.ui.model.WorkbenchContentProvider; -import org.eclipse.ui.model.WorkbenchLabelProvider; - -public class BranchPromptDialog extends DetailsDialog { - - private ICVSFolder folder; - private String branchTag = ""; //$NON-NLS-1$ - private String versionTag= ""; //$NON-NLS-1$ - private String versionName= ""; //$NON-NLS-1$ - - private boolean allStickyResources; - private boolean update; - - private Text versionText; - private Text branchText; - - private static final int TABLE_HEIGHT_HINT = 150; - - // widgets; - private TreeViewer tagTree; - - public BranchPromptDialog(Shell parentShell, String title, ICVSFolder folder, boolean allResourcesSticky, String versionName) { - super(parentShell, title); - this.folder = folder; - this.allStickyResources = allResourcesSticky; - this.versionName = versionName; - } - - /** - * @see DetailsDialog#createMainDialogArea(Composite) - */ - protected void createMainDialogArea(Composite composite) { - // create message - Label label = new Label(composite, SWT.WRAP); - String message; - if(allStickyResources) { - message = Policy.bind("BranchWizardPage.pageDescriptionVersion"); //$NON-NLS-1$ - } else { - message = Policy.bind("BranchWizardPage.pageDescription"); //$NON-NLS-1$ - } - label.setText(message); - GridData data = new GridData( - GridData.GRAB_HORIZONTAL | - GridData.GRAB_VERTICAL | - GridData.HORIZONTAL_ALIGN_FILL | - GridData.VERTICAL_ALIGN_CENTER); - data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);; - label.setLayoutData(data); - label.setFont(composite.getFont()); - - CVSWizardPage.createLabel(composite, Policy.bind("BranchWizardPage.branchName")); //$NON-NLS-1$ - branchText = CVSWizardPage.createTextField(composite); - branchText.addListener(SWT.Modify, new Listener() { - public void handleEvent(Event event) { - branchTag = branchText.getText(); - updateEnablements(); - updateVersionName(branchTag); - } - }); - - final Button check = new Button(composite, SWT.CHECK); - data = new GridData(); - data.horizontalSpan = 2; - check.setLayoutData(data); - check.setText(Policy.bind("BranchWizardPage.startWorking")); //$NON-NLS-1$ - check.addListener(SWT.Selection, new Listener() { - public void handleEvent(Event event) { - update = check.getSelection(); - } - }); - check.setSelection(true); - update = true; - - label = new Label(composite, SWT.WRAP); - label.setText(Policy.bind("BranchWizardPage.specifyVersion")); //$NON-NLS-1$ - data = new GridData(); - data.horizontalSpan = 2; - data.widthHint = 350; - label.setLayoutData(data); - - CVSWizardPage.createLabel(composite, Policy.bind("BranchWizardPage.versionName")); //$NON-NLS-1$ - versionText = CVSWizardPage.createTextField(composite); - versionText.addListener(SWT.Modify, new Listener() { - public void handleEvent(Event event) { - versionTag = versionText.getText(); - updateEnablements(); - } - }); - - if(allStickyResources) { - versionText.setEditable(false); - versionText.setText(versionName); - } - - // F1 Help - WorkbenchHelp.setHelp(composite, IHelpContextIds.BRANCH_DIALOG); - - branchText.setFocus(); - } - - /** - * Updates version name - */ - protected void updateVersionName(String branchName) { - if(versionText!=null && !allStickyResources) { - versionText.setText(Policy.bind("BranchWizardPage.versionPrefix") + branchName); //$NON-NLS-1$ - } - } - - /** - * @see DetailsDialog#createDropDownDialogArea(Composite) - */ - protected Composite createDropDownDialogArea(Composite parent) { - - // create a composite with standard margins and spacing - Composite composite = new Composite(parent, SWT.NONE); - GridLayout layout = new GridLayout(); - layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN); - layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN); - layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING); - layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING); - composite.setLayout(layout); - composite.setLayoutData(new GridData(GridData.FILL_BOTH)); - composite.setFont(parent.getFont()); - - Label label = new Label(composite, SWT.WRAP); - label.setText(Policy.bind("BranchWizardPage.existingVersionsAndBranches")); //$NON-NLS-1$ - GridData data = new GridData( - GridData.GRAB_HORIZONTAL | - GridData.GRAB_VERTICAL | - GridData.HORIZONTAL_ALIGN_FILL | - GridData.VERTICAL_ALIGN_CENTER); - data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);; - label.setLayoutData(data); - label.setFont(composite.getFont()); - - tagTree = createTree(composite); - tagTree.setInput(new ProjectElement(folder, ProjectElement.INCLUDE_BRANCHES | ProjectElement.INCLUDE_VERSIONS)); - Runnable refresh = new Runnable() { - public void run() { - getShell().getDisplay().syncExec(new Runnable() { - public void run() { - tagTree.refresh(); - } - }); - } - }; - TagConfigurationDialog.createTagDefinitionButtons(getShell(), composite, new ICVSFolder[] {folder}, - convertVerticalDLUsToPixels(IDialogConstants.BUTTON_HEIGHT), - convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH), - refresh, refresh); - return composite; - } - - /** - * Creates the existing branch and version tree viewer in the details pane - */ - protected TreeViewer createTree(Composite parent) { - Tree tree = new Tree(parent, SWT.SINGLE | SWT.BORDER); - GridData data = new GridData(GridData.FILL_BOTH); - data.heightHint = TABLE_HEIGHT_HINT; - tree.setLayoutData(data); - TreeViewer result = new TreeViewer(tree); - result.setContentProvider(new WorkbenchContentProvider()); - result.setLabelProvider(new WorkbenchLabelProvider()); - result.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - } - }); - result.setSorter(new RepositorySorter()); - return result; - } - - /** - * Validates branch and version names - */ - protected void updateEnablements() { - String message = null; - boolean complete = false; - - if (branchTag.length() == 0) { - message = ""; //$NON-NLS-1$ - } else { - IStatus status = CVSTag.validateTagName(branchTag); - if (!status.isOK()) { - message = Policy.bind("BranchWizard.branchNameWarning", status.getMessage()); //$NON-NLS-1$ - } else { - if(versionText!=null) { - status = CVSTag.validateTagName(versionText.getText()); - if (!status.isOK()) { - message = Policy.bind("BranchWizard.versionNameWarning", status.getMessage()); //$NON-NLS-1$ - } else { - if(versionTag.length() != 0 && versionTag.equals(branchTag)) { - message = Policy.bind("BranchWizard.branchAndVersionMustBeDifferent"); //$NON-NLS-1$ - } - } - } - } - } - setPageComplete(message == null); - setErrorMessage(message); - } - - /** - * Returns the branch tag name - */ - public String getBranchTagName() { - return branchTag; - } - - /** - * Returns the version tag name - */ - public String getVersionTagName() { - return versionTag; - } - - /** - * Returns the state of the update checkbox - */ - public boolean getUpdate() { - return update; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSAbstractResolutionGenerator.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSAbstractResolutionGenerator.java deleted file mode 100644 index e94795fec..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSAbstractResolutionGenerator.java +++ /dev/null @@ -1,70 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.team.internal.ccvs.ui; - -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.jface.dialogs.ProgressMonitorDialog; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.IMarkerResolutionGenerator; -import org.eclipse.ui.IWorkbenchWindow; - -public abstract class CVSAbstractResolutionGenerator implements IMarkerResolutionGenerator { - protected void run(final IRunnableWithProgress runnable) throws InvocationTargetException, InterruptedException { - final Exception[] exception = new Exception[] {null}; - Display.getDefault().syncExec(new Runnable() { - public void run() { - try { - Shell shell; - IWorkbenchWindow window = CVSUIPlugin.getPlugin().getWorkbench().getActiveWorkbenchWindow(); - boolean disposeShell = false; - if (window != null) { - shell = window.getShell(); - } else { - Display display = Display.getCurrent(); - shell = new Shell(display); - disposeShell = true; - } - new ProgressMonitorDialog(shell).run(true, true, runnable); - if (disposeShell) shell.dispose(); - } catch (InterruptedException e) { - exception[0] = e; - } catch (InvocationTargetException e) { - exception[0] = e; - } - } - }); - if (exception[0] != null) { - if (exception[0] instanceof InvocationTargetException) { - throw (InvocationTargetException)exception[0]; - } else if (exception[0] instanceof InterruptedException) { - throw (InterruptedException)exception[0]; - } else { - throw new InvocationTargetException(exception[0]); - } - } - } - - /** - * Shows the given errors to the user. - * - * @param status the status containing the error - * @param title the title of the error dialog - * @param message the message for the error dialog - * @param shell the shell to open the error dialog in - */ - protected void handle(Throwable exception, String title, final String message) { - CVSUIPlugin.openError(null, title, message, exception, CVSUIPlugin.LOG_NONTEAM_EXCEPTIONS); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSAddResolutionGenerator.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSAddResolutionGenerator.java deleted file mode 100644 index dbad4b8c5..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSAddResolutionGenerator.java +++ /dev/null @@ -1,134 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.team.internal.ccvs.ui; - -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.core.resources.IMarker; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.team.core.RepositoryProvider; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSTeamProvider; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.ui.IMarkerResolution; - -/** - * Generate marker resoultions for a cvs remove marker - */ -public class CVSAddResolutionGenerator extends CVSAbstractResolutionGenerator { - /* - * @see IMarkerResolutionGenerator#getResolutions(IMarker) - */ - public IMarkerResolution[] getResolutions(IMarker marker) { - IMarkerResolution manage = new IMarkerResolution() { - public String getLabel() { - return Policy.bind("CVSAddResolutionGenerator.Add_Resource_to_CVS_1"); //$NON-NLS-1$ - } - public void run(IMarker marker) { - try { - final IResource resource = marker.getResource(); - ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource); - final TeamException[] exception = new TeamException[] {null}; - if ( ! cvsResource.isManaged()) { - CVSAddResolutionGenerator.this.run(new IRunnableWithProgress() { - public void run(IProgressMonitor monitor)throws InvocationTargetException, InterruptedException { - try { - ((CVSTeamProvider)RepositoryProvider.getProvider(resource.getProject())).add(new IResource[] {resource}, IResource.DEPTH_ZERO, monitor); - } catch (TeamException e) { - exception[0] = e; - } - } - }); - } - if (exception[0] != null) { - throw exception[0]; - } - marker.delete(); - } catch (TeamException e) { - handle(e, null, null); - } catch (CoreException e) { - handle(e, null, null); - } catch (InvocationTargetException e) { - handle(e, null, null); - } catch (InterruptedException e) { - // do nothing - } - } - }; - IMarkerResolution manageDeep = new IMarkerResolution() { - public String getLabel() { - return Policy.bind("CVSAddResolutionGenerator.Add_Resource_and_Children_to_CVS_2"); //$NON-NLS-1$ - } - public void run(IMarker marker) { - try { - final IResource resource = marker.getResource(); - ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource); - final TeamException[] exception = new TeamException[] {null}; - if ( ! cvsResource.isManaged()) { - CVSAddResolutionGenerator.this.run(new IRunnableWithProgress() { - public void run(IProgressMonitor monitor)throws InvocationTargetException, InterruptedException { - try { - ((CVSTeamProvider)RepositoryProvider.getProvider(resource.getProject())).add(new IResource[] {resource}, IResource.DEPTH_INFINITE, monitor); - } catch (TeamException e) { - exception[0] = e; - } - } - }); - } - if (exception[0] != null) { - throw exception[0]; - } - marker.delete(); - } catch (TeamException e) { - handle(e, null, null); - } catch (CoreException e) { - handle(e, null, null); - } catch (InvocationTargetException e) { - handle(e, null, null); - } catch (InterruptedException e) { - // do nothing - } - } - - }; - IMarkerResolution ignore = new IMarkerResolution() { - public String getLabel() { - return Policy.bind("CVSAddResolutionGenerator.Add_to_.cvsignore_3"); //$NON-NLS-1$ - } - public void run(IMarker marker) { - try { - ICVSResource resource = CVSWorkspaceRoot.getCVSResourceFor(marker.getResource()); - if ( resource.isManaged()) { - resource.unmanage(null); - } - resource.setIgnored(); - marker.delete(); - } catch (CVSException e) { - handle(e, null, null); - } catch (CoreException e) { - handle(e, null, null); - } - } - - }; - if (marker.getResource().getType() == IResource.FILE) { - return new IMarkerResolution[] {manage, ignore}; - } else { - return new IMarkerResolution[] {manageDeep, manage, ignore}; - } - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSCompareEditorInput.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSCompareEditorInput.java deleted file mode 100644 index 85d759e70..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSCompareEditorInput.java +++ /dev/null @@ -1,393 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - - -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.compare.CompareConfiguration; -import org.eclipse.compare.CompareEditorInput; -import org.eclipse.compare.ITypedElement; -import org.eclipse.compare.structuremergeviewer.DiffNode; -import org.eclipse.compare.structuremergeviewer.Differencer; -import org.eclipse.compare.structuremergeviewer.IDiffContainer; -import org.eclipse.compare.structuremergeviewer.IStructureComparator; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.SubProgressMonitor; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFile; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteResource; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.internal.ccvs.core.ICVSRunnable; -import org.eclipse.team.internal.ccvs.core.client.Session; -import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo; - -/** - * A compare input for comparing remote resources. Use <code>CVSLocalCompareInput</code> - * when comparing resources in the workspace to remote resources. - */ -public class CVSCompareEditorInput extends CompareEditorInput { - private ITypedElement left; - private ITypedElement right; - private ITypedElement ancestor; - private Image leftImage; - private Image rightImage; - private Image ancestorImage; - - // comparison constants - private static final int NODE_EQUAL = 0; - private static final int NODE_NOT_EQUAL = 1; - private static final int NODE_UNKNOWN = 2; - - /** - * Creates a new CVSCompareEditorInput. - */ - public CVSCompareEditorInput(ResourceEditionNode left, ResourceEditionNode right) { - this(left, right, null); - } - - /** - * Creates a new CVSCompareEditorInput. - */ - public CVSCompareEditorInput(ResourceEditionNode left, ResourceEditionNode right, ResourceEditionNode ancestor) { - super(new CompareConfiguration()); - this.left = left; - this.right = right; - this.ancestor = ancestor; - if (left != null) { - this.leftImage = left.getImage(); - } - if (right != null) { - this.rightImage = right.getImage(); - } - if (ancestor != null) { - this.ancestorImage = ancestor.getImage(); - } - } - - /** - * Returns the label for the given input element. - */ - private String getLabel(ITypedElement element) { - if (element instanceof ResourceEditionNode) { - ICVSRemoteResource edition = ((ResourceEditionNode)element).getRemoteResource(); - ICVSResource resource = (ICVSResource)edition; - if (edition instanceof ICVSRemoteFile) { - try { - return Policy.bind("nameAndRevision", resource.getName(), ((ICVSRemoteFile)edition).getRevision()); //$NON-NLS-1$ - } catch (TeamException e) { - // fall through - } - } - try { - if (edition.isContainer()) { - CVSTag tag = ((ICVSRemoteFolder)edition).getTag(); - if (tag == null) { - return Policy.bind("CVSCompareEditorInput.inHead", edition.getName()); //$NON-NLS-1$ - } else if (tag.getType() == CVSTag.BRANCH) { - return Policy.bind("CVSCompareEditorInput.inBranch", new Object[] {edition.getName(), tag.getName()}); //$NON-NLS-1$ - } else { - return Policy.bind("CVSCompareEditorInput.repository", new Object[] {edition.getName(), tag.getName()}); //$NON-NLS-1$ - } - } else { - return Policy.bind("CVSCompareEditorInput.repository", new Object[] {edition.getName(), resource.getSyncInfo().getRevision()}); //$NON-NLS-1$ - } - } catch (TeamException e) { - handle(e); - // Fall through and get the default label - } - } - return element.getName(); - } - - /** - * Returns the label for the given input element. - */ - private String getVersionLabel(ITypedElement element) { - if (element instanceof ResourceEditionNode) { - ICVSRemoteResource edition = ((ResourceEditionNode)element).getRemoteResource(); - ICVSResource resource = (ICVSResource)edition; - try { - if (edition.isContainer()) { - CVSTag tag = ((ICVSRemoteFolder)resource).getTag(); - if (tag == null) { - return Policy.bind("CVSCompareEditorInput.headLabel"); //$NON-NLS-1$ - } else if (tag.getType() == CVSTag.BRANCH) { - return Policy.bind("CVSCompareEditorInput.branchLabel", tag.getName()); //$NON-NLS-1$ - } else { - return tag.getName(); - } - } else { - return resource.getSyncInfo().getRevision(); - } - } catch (TeamException e) { - handle(e); - // Fall through and get the default label - } - } - return element.getName(); - } - - /* - * Returns a guess of the resource name being compared, for display - * in the title. - */ - private String guessResourceName() { - if (left != null) { - return left.getName(); - } - if (right != null) { - return right.getName(); - } - if (ancestor != null) { - return ancestor.getName(); - } - return ""; //$NON-NLS-1$ - } - - /** - * Handles a random exception and sanitizes it into a reasonable - * error message. - */ - private void handle(Exception e) { - // create a status - Throwable t = e; - // unwrap the invocation target exception - if (t instanceof InvocationTargetException) { - t = ((InvocationTargetException)t).getTargetException(); - } - IStatus error; - if (t instanceof CoreException) { - error = ((CoreException)t).getStatus(); - } else if (t instanceof TeamException) { - error = ((TeamException)t).getStatus(); - } else { - error = new Status(IStatus.ERROR, CVSUIPlugin.ID, 1, Policy.bind("internal"), t); //$NON-NLS-1$ - } - setMessage(error.getMessage()); - if (!(t instanceof TeamException)) { - CVSUIPlugin.log(error.getSeverity(), error.getMessage(), t); - } - } - - /** - * Sets up the title and pane labels for the comparison view. - */ - private void initLabels() { - CompareConfiguration cc = (CompareConfiguration) getCompareConfiguration(); - setLabels(cc, new StructuredSelection()); - - String title; - if (ancestor != null) { - title = Policy.bind("CVSCompareEditorInput.titleAncestor", new Object[] {guessResourceName(), getVersionLabel(ancestor), getVersionLabel(left), getVersionLabel(right)} ); //$NON-NLS-1$ - } else { - String leftName = null; - if (left != null) leftName = left.getName(); - String rightName = null; - if (right != null) rightName = right.getName(); - boolean differentNames = false; - if (leftName != null && !leftName.equals(rightName)) { - title = Policy.bind("CVSCompareEditorInput.titleNoAncestorDifferent", new Object[] {leftName, getVersionLabel(left), rightName, getVersionLabel(right)} ); //$NON-NLS-1$ - } else { - title = Policy.bind("CVSCompareEditorInput.titleNoAncestor", new Object[] {guessResourceName(), getVersionLabel(left), getVersionLabel(right)} ); //$NON-NLS-1$ - } - } - setTitle(title); - } - - private void setLabels(CompareConfiguration cc, IStructuredSelection selection) { - ITypedElement left = this.left; - ITypedElement right = this.right; - ITypedElement ancestor = this.ancestor; - - if (left != null) { - cc.setLeftLabel(getLabel(left)); - cc.setLeftImage(leftImage); - } - - if (right != null) { - cc.setRightLabel(getLabel(right)); - cc.setRightImage(rightImage); - } - - if (ancestor != null) { - cc.setAncestorLabel(getLabel(ancestor)); - cc.setAncestorImage(ancestorImage); - } - } - - /* (Non-javadoc) - * Method declared on CompareEditorInput - */ - public boolean isSaveNeeded() { - return false; - } - - /* (non-Javadoc) - * Method declared on CompareEditorInput - */ - protected Object prepareInput(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - final boolean threeWay = ancestor != null; - if (right == null || left == null) { - setMessage(Policy.bind("CVSCompareEditorInput.different")); //$NON-NLS-1$ - return null; - } - - initLabels(); - - final Differencer d = new Differencer() { - protected boolean contentsEqual(Object input1, Object input2) { - int compare = teamEqual(input1, input2); - if (compare == NODE_EQUAL) { - return true; - } - if (compare == NODE_NOT_EQUAL) { - return false; - } - //revert to slow content comparison - return super.contentsEqual(input1, input2); - } - protected void updateProgress(IProgressMonitor progressMonitor, Object node) { - if (node instanceof ITypedElement) { - ITypedElement element = (ITypedElement)node; - progressMonitor.subTask(Policy.bind("CompareEditorInput.fileProgress", new String[] {element.getName()})); //$NON-NLS-1$ - progressMonitor.worked(1); - } - } - protected Object[] getChildren(Object input) { - if (input instanceof IStructureComparator) { - Object[] children= ((IStructureComparator)input).getChildren(); - if (children != null) - return children; - } - return null; - } - protected Object visit(Object data, int result, Object ancestor, Object left, Object right) { - return new DiffNode((IDiffContainer) data, result, (ITypedElement)ancestor, (ITypedElement)left, (ITypedElement)right); - } - }; - - try { - // do the diff - final Object[] result = new Object[] { null }; - Session.run(null, null, false, new ICVSRunnable() { - public void run(IProgressMonitor monitor) throws CVSException { - monitor.beginTask(Policy.bind("CVSCompareEditorInput.comparing"), 30); //$NON-NLS-1$ - IProgressMonitor sub = new SubProgressMonitor(monitor, 30); - sub.beginTask(Policy.bind("CVSCompareEditorInput.comparing"), 100); //$NON-NLS-1$ - try { - result[0] = d.findDifferences(threeWay, sub, null, ancestor, left, right); - } finally { - sub.done(); - } - } - }, monitor); - return result[0]; - } catch (OperationCanceledException e) { - throw new InterruptedException(e.getMessage()); - } catch (RuntimeException e) { - handle(e); - return null; - } catch (CVSException e) { - handle(e); - return null; - } finally { - monitor.done(); - } - } - - /** - * Compares two nodes to determine if they are equal. Returns NODE_EQUAL - * of they are the same, NODE_NOT_EQUAL if they are different, and - * NODE_UNKNOWN if comparison was not possible. - */ - protected int teamEqual(Object left, Object right) { - // calculate the type for the left contribution - ICVSRemoteResource leftEdition = null; - if (left instanceof ResourceEditionNode) { - leftEdition = ((ResourceEditionNode)left).getRemoteResource(); - } - - // calculate the type for the right contribution - ICVSRemoteResource rightEdition = null; - if (right instanceof ResourceEditionNode) - rightEdition = ((ResourceEditionNode)right).getRemoteResource(); - - - // compare them - - if (leftEdition == null || rightEdition == null) { - return NODE_UNKNOWN; - } - // if they're both non-files, they're the same - if (leftEdition.isContainer() && rightEdition.isContainer()) { - return NODE_EQUAL; - } - // if they have different types, they're different - if (leftEdition.isContainer() != rightEdition.isContainer()) { - return NODE_NOT_EQUAL; - } - - String leftLocation = leftEdition.getRepository().getLocation(); - String rightLocation = rightEdition.getRepository().getLocation(); - if (!leftLocation.equals(rightLocation)) { - return NODE_UNKNOWN; - } - try { - ResourceSyncInfo leftInfo = ((ICVSResource)leftEdition).getSyncInfo(); - ResourceSyncInfo rightInfo = ((ICVSResource)rightEdition).getSyncInfo(); - - if (leftEdition.getRepositoryRelativePath().equals(rightEdition.getRepositoryRelativePath()) && - leftInfo.getRevision().equals(rightInfo.getRevision())) { - return NODE_EQUAL; - } else { - if(considerContentIfRevisionOrPathDiffers()) { - return NODE_UNKNOWN; - } else { - return NODE_NOT_EQUAL; - } - } - } catch (TeamException e) { - handle(e); - return NODE_UNKNOWN; - } - } - - private boolean considerContentIfRevisionOrPathDiffers() { - return CVSUIPlugin.getPlugin().getPreferenceStore().getBoolean(ICVSUIConstants.PREF_CONSIDER_CONTENTS); - } - - public Viewer createDiffViewer(Composite parent) { - Viewer viewer = super.createDiffViewer(parent); - viewer.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - CompareConfiguration cc = getCompareConfiguration(); - setLabels(cc, (IStructuredSelection)event.getSelection()); - } - }); - return viewer; - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSCompareRevisionsInput.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSCompareRevisionsInput.java deleted file mode 100644 index 8e6bf0207..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSCompareRevisionsInput.java +++ /dev/null @@ -1,381 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - - -import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.compare.CompareConfiguration; -import org.eclipse.compare.CompareEditorInput; -import org.eclipse.compare.CompareUI; -import org.eclipse.compare.ITypedElement; -import org.eclipse.compare.ResourceNode; -import org.eclipse.compare.structuremergeviewer.DiffContainer; -import org.eclipse.compare.structuremergeviewer.DiffNode; -import org.eclipse.compare.structuremergeviewer.Differencer; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.SubProgressMonitor; -import org.eclipse.jface.action.Action; -import org.eclipse.jface.action.IMenuListener; -import org.eclipse.jface.action.IMenuManager; -import org.eclipse.jface.action.MenuManager; -import org.eclipse.jface.dialogs.ProgressMonitorDialog; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredContentProvider; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.TableViewer; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.Table; -import org.eclipse.team.core.RepositoryProvider; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.CVSTeamProvider; -import org.eclipse.team.internal.ccvs.core.ICVSFile; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFile; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteResource; -import org.eclipse.team.internal.ccvs.core.ILogEntry; -import org.eclipse.team.internal.ccvs.core.client.Command; -import org.eclipse.team.internal.ccvs.core.client.Update; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.ui.actions.CVSAction; -import org.eclipse.team.internal.ccvs.ui.actions.ShowAnnotationAction; -import org.eclipse.ui.actions.WorkspaceModifyOperation; -import org.eclipse.ui.help.WorkbenchHelp; - -public class CVSCompareRevisionsInput extends CompareEditorInput { - IFile resource; - ILogEntry[] editions; - TableViewer viewer; - Action getContentsAction; - Action getRevisionAction; - Action getAnnotateAction; - Shell shell; - - private HistoryTableProvider historyTableProvider; - - class TypedBufferedContent extends ResourceNode { - public TypedBufferedContent(IFile resource) { - super(resource); - } - protected InputStream createStream() throws CoreException { - return ((IFile)getResource()).getContents(); - } - public void setContent(byte[] contents) { - if (contents == null) contents = new byte[0]; - final InputStream is = new ByteArrayInputStream(contents); - IRunnableWithProgress runnable = new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - try { - IFile file = resource; - if (is != null) { - if (!file.exists()) { - file.create(is, false, monitor); - } else { - file.setContents(is, false, true, monitor); - } - } else { - file.delete(false, true, monitor); - } - } catch (CoreException e) { - throw new InvocationTargetException(e); - } - } - }; - try { - new ProgressMonitorDialog(shell).run(false, false, runnable); - } catch (InvocationTargetException e) { - CVSUIPlugin.openError(CVSUIPlugin.getPlugin().getWorkbench().getActiveWorkbenchWindow().getShell(), Policy.bind("TeamFile.saveChanges", resource.getName()), null, e); //$NON-NLS-1$ - } catch (InterruptedException e) { - // Ignore - } - fireContentChanged(); - } - public ITypedElement replace(ITypedElement child, ITypedElement other) { - return null; - } - } - - /** - * This class is an edition node which knows the log entry it came from. - */ - class ResourceRevisionNode extends ResourceEditionNode { - ILogEntry entry; - public ResourceRevisionNode(ILogEntry entry) { - super(entry.getRemoteFile()); - this.entry = entry; - } - public ILogEntry getLogEntry() { - return entry; - } - public String getName() { - ICVSRemoteResource edition = getRemoteResource(); - String revisionName = entry.getRevision(); - if (revisionName != null) { - IResource resource = CVSCompareRevisionsInput.this.resource; - try { - ICVSRemoteFile currentEdition = (ICVSRemoteFile) CVSWorkspaceRoot.getRemoteResourceFor(resource); - if (currentEdition != null && currentEdition.getRevision().equals(revisionName)) { - Policy.bind("currentRevision", revisionName); //$NON-NLS-1$ - } else { - return revisionName; - } - } catch (TeamException e) { - handle(e); - } - } - return super.getName(); - } - }; - /** - * A compare node that gets its label from the right element - */ - class VersionCompareDiffNode extends DiffNode implements IAdaptable { - public VersionCompareDiffNode(ITypedElement left, ITypedElement right) { - super(left, right); - } - public String getName() { - return getRight().getName(); - } - public Object getAdapter(Class adapter) { - if (adapter == ILogEntry.class) { - return ((ResourceRevisionNode)getRight()).getLogEntry(); - } - return null; - } - - }; - /** - * A content provider which knows how to get the children of the diff container - */ - class VersionCompareContentProvider implements IStructuredContentProvider { - public void dispose() { - } - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - } - public Object[] getElements(Object inputElement) { - if (inputElement instanceof DiffContainer) { - return ((DiffContainer)inputElement).getChildren(); - } - return null; - } - }; - - public CVSCompareRevisionsInput(IFile resource, ILogEntry[] editions) { - super(new CompareConfiguration()); - this.resource = resource; - this.editions = editions; - updateCurrentEdition(); - initializeActions(); - } - - public Viewer createDiffViewer(Composite parent) { - this.shell = parent.getShell(); - viewer = getHistoryTableProvider().createTable(parent); - Table table = viewer.getTable(); - table.setData(CompareUI.COMPARE_VIEWER_TITLE, Policy.bind("CVSCompareRevisionsInput.structureCompare")); //$NON-NLS-1$ - - viewer.setContentProvider(new VersionCompareContentProvider()); - - MenuManager mm = new MenuManager(); - mm.setRemoveAllWhenShown(true); - mm.addMenuListener( - new IMenuListener() { - public void menuAboutToShow(IMenuManager mm) { - mm.add(getContentsAction); - mm.add(getRevisionAction); - mm.add(getAnnotateAction); - } - } - ); - table.setMenu(mm.createContextMenu(table)); - viewer.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - ISelection selection = event.getSelection(); - if (!(selection instanceof IStructuredSelection)) { - getContentsAction.setEnabled(false); - getRevisionAction.setEnabled(false); - getAnnotateAction.setEnabled(false); - return; - } - IStructuredSelection ss = (IStructuredSelection)selection; - getContentsAction.setEnabled(ss.size() == 1); - getRevisionAction.setEnabled(ss.size() == 1); - getAnnotateAction.setEnabled(ss.size() == 1); - } - }); - - // Add F1 help. - WorkbenchHelp.setHelp(table, IHelpContextIds.COMPARE_REVISIONS_VIEW); - WorkbenchHelp.setHelp(getContentsAction, IHelpContextIds.GET_FILE_CONTENTS_ACTION); - WorkbenchHelp.setHelp(getRevisionAction, IHelpContextIds.GET_FILE_REVISION_ACTION); - WorkbenchHelp.setHelp(getAnnotateAction, IHelpContextIds.GET_ANNOTATE_ACTION); - - return viewer; - } - - private void initLabels() { - CompareConfiguration cc = (CompareConfiguration)getCompareConfiguration(); - String resourceName = resource.getName(); -// if (editions[0].isTeamStreamResource()) { -// setTitle(Policy.bind("CompareResourceEditorInput.compareResourceAndStream", new Object[] {resourceName, editions[0].getTeamStream().getName()})); -// } else { -// setTitle(Policy.bind("CompareResourceEditorInput.compareResourceAndVersions", new Object[] {resourceName})); -// } - setTitle(Policy.bind("CVSCompareRevisionsInput.compareResourceAndVersions", new Object[] {resourceName})); //$NON-NLS-1$ - cc.setLeftEditable(true); - cc.setRightEditable(false); - - String leftLabel = Policy.bind("CVSCompareRevisionsInput.workspace", new Object[] {resourceName}); //$NON-NLS-1$ - cc.setLeftLabel(leftLabel); - String rightLabel = Policy.bind("CVSCompareRevisionsInput.repository", new Object[] {resourceName}); //$NON-NLS-1$ - cc.setRightLabel(rightLabel); - } - private void initializeActions() { - - getAnnotateAction = new Action(Policy.bind("HistoryView.getAnnotateAction"), null) { //$NON-NLS-1$ - public void run() { - try { - IStructuredSelection selection = (IStructuredSelection)viewer.getSelection(); - if (selection.size() != 1) return; - VersionCompareDiffNode node = (VersionCompareDiffNode)selection.getFirstElement(); - ResourceEditionNode right = (ResourceEditionNode)node.getRight(); - ICVSRemoteResource edition = right.getRemoteResource(); - ShowAnnotationAction annotateAction = new ShowAnnotationAction(); - annotateAction.execute(edition); - - } catch (InterruptedException e) { - // Do nothing - return; - } catch (InvocationTargetException e) { - handle(e); - } - } - }; - - getContentsAction = new Action(Policy.bind("HistoryView.getContentsAction"), null) { //$NON-NLS-1$ - public void run() { - try { - new ProgressMonitorDialog(shell).run(false, true, new WorkspaceModifyOperation() { - protected void execute(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - IStructuredSelection selection = (IStructuredSelection)viewer.getSelection(); - if (selection.size() != 1) return; - VersionCompareDiffNode node = (VersionCompareDiffNode)selection.getFirstElement(); - ResourceEditionNode right = (ResourceEditionNode)node.getRight(); - ICVSRemoteResource edition = right.getRemoteResource(); - // Do the load. This just consists of setting the local contents. We don't - // actually want to change the base. - try { - monitor.beginTask(null, 100); - InputStream in = edition.getContents(new SubProgressMonitor(monitor, 50)); - resource.setContents(in, false, true, new SubProgressMonitor(monitor, 50)); - } catch (TeamException e) { - throw new InvocationTargetException(e); - } catch (CoreException e) { - throw new InvocationTargetException(e); - } finally { - monitor.done(); - } - } - }); - } catch (InterruptedException e) { - // Do nothing - return; - } catch (InvocationTargetException e) { - handle(e); - } - // recompute the labels on the viewer - updateCurrentEdition(); - viewer.refresh(); - } - }; - - getRevisionAction = new Action(Policy.bind("HistoryView.getRevisionAction"), null) { //$NON-NLS-1$ - public void run() { - try { - new ProgressMonitorDialog(shell).run(false, true, new WorkspaceModifyOperation() { - protected void execute(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - IStructuredSelection selection = (IStructuredSelection)viewer.getSelection(); - if (selection.size() != 1) return; - VersionCompareDiffNode node = (VersionCompareDiffNode)selection.getFirstElement(); - ResourceEditionNode right = (ResourceEditionNode)node.getRight(); - ICVSRemoteResource edition = right.getRemoteResource(); - // Do the load. This just consists of setting the local contents. We don't - // actually want to change the base. - try { - CVSTeamProvider provider = (CVSTeamProvider)RepositoryProvider.getProvider(resource.getProject()); - CVSTag revisionTag = new CVSTag(((ICVSRemoteFile)edition).getRevision(), CVSTag.VERSION); - if(CVSAction.checkForMixingTags(shell, new IResource[] {resource}, revisionTag)) { - provider.update(new IResource[] {resource}, new Command.LocalOption[] {Update.IGNORE_LOCAL_CHANGES}, - revisionTag, true /*create backups*/, monitor); - getHistoryTableProvider().setFile((ICVSFile)edition); - } - } catch (TeamException e) { - throw new InvocationTargetException(e); - } - } - }); - } catch (InterruptedException e) { - // Do nothing - return; - } catch (InvocationTargetException e) { - handle(e); - } - // recompute the labels on the viewer - viewer.refresh(); - } - }; - } - public boolean isSaveNeeded() { - return false; - } - protected Object prepareInput(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - initLabels(); - DiffNode diffRoot = new DiffNode(Differencer.NO_CHANGE); - for (int i = 0; i < editions.length; i++) { - ITypedElement left = new TypedBufferedContent(resource); - ITypedElement right = new ResourceRevisionNode(editions[i]); - diffRoot.add(new VersionCompareDiffNode(left, right)); - } - return diffRoot; - } - private void updateCurrentEdition() { - try { - getHistoryTableProvider().setFile((ICVSFile) CVSWorkspaceRoot.getRemoteResourceFor(resource)); - } catch (TeamException e) { - handle(e); - } - } - private void handle(Exception e) { - setMessage(CVSUIPlugin.openError(shell, null, null, e, CVSUIPlugin.LOG_NONTEAM_EXCEPTIONS).getMessage()); - } - /** - * Returns the historyTableProvider. - * @return HistoryTableProvider - */ - public HistoryTableProvider getHistoryTableProvider() { - if (historyTableProvider == null) { - historyTableProvider = new HistoryTableProvider(); - } - return historyTableProvider; - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecoratorConfiguration.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecoratorConfiguration.java deleted file mode 100644 index 1017dfb34..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecoratorConfiguration.java +++ /dev/null @@ -1,133 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - - -import java.util.Map; - -import org.eclipse.jface.viewers.IDecoration; - -public class CVSDecoratorConfiguration { - - // bindings for - public static final String RESOURCE_NAME = "name"; //$NON-NLS-1$ - public static final String RESOURCE_TAG = "tag"; //$NON-NLS-1$ - public static final String FILE_REVISION = "revision"; //$NON-NLS-1$ - public static final String FILE_KEYWORD = "keyword"; //$NON-NLS-1$ - - // bindings for repository location - public static final String REMOTELOCATION_METHOD = "method"; //$NON-NLS-1$ - public static final String REMOTELOCATION_USER = "user"; //$NON-NLS-1$ - public static final String REMOTELOCATION_HOST = "host"; //$NON-NLS-1$ - public static final String REMOTELOCATION_ROOT = "root"; //$NON-NLS-1$ - public static final String REMOTELOCATION_REPOSITORY = "repository"; //$NON-NLS-1$ - - // bindings for resource states - public static final String DIRTY_FLAG = "dirty_flag"; //$NON-NLS-1$ - public static final String ADDED_FLAG = "added_flag"; //$NON-NLS-1$ - public static final String DEFAULT_DIRTY_FLAG = ">"; //$NON-NLS-1$ - public static final String DEFAULT_ADDED_FLAG = "*"; //$NON-NLS-1$ - - // default text decoration formats - public static final String DEFAULT_FILETEXTFORMAT = "{dirty_flag}{name} {revision} {tag} ({keyword})"; //$NON-NLS-1$ - public static final String DEFAULT_FOLDERTEXTFORMAT = "{dirty_flag}{name} {tag}"; //$NON-NLS-1$ - public static final String DEFAULT_PROJECTTEXTFORMAT = "{dirty_flag}{name} {tag} [{host}]"; //$NON-NLS-1$ - - // prefix characters that can be removed if the following binding is not found - private static final char KEYWORD_SEPSPACE = ' '; - private static final char KEYWORD_SEPCOLON = ':'; - private static final char KEYWORD_SEPAT = '@'; - - public static void decorate(IDecoration decoration, String format, Map bindings) { - StringBuffer prefix = new StringBuffer(80); - StringBuffer suffix = new StringBuffer(80); - StringBuffer output = prefix; - - int length = format.length(); - int start = -1; - int end = length; - while (true) { - if ((end = format.indexOf('{', start)) > -1) { - output.append(format.substring(start + 1, end)); - if ((start = format.indexOf('}', end)) > -1) { - String key = format.substring(end + 1, start); - String s; - - //We use the RESOURCE_NAME key to determine if we are doing the prefix or suffix. The name isn't actually part of either. - if(key.equals(RESOURCE_NAME)) { - output = suffix; - s = null; - } else { - s = (String) bindings.get(key); - } - - if(s!=null) { - output.append(s); - } else { - // support for removing prefix character if binding is null - int curLength = output.length(); - if(curLength>0) { - char c = output.charAt(curLength - 1); - if(c == KEYWORD_SEPCOLON || c == KEYWORD_SEPAT) { - output.deleteCharAt(curLength - 1); - } - } - } - } else { - output.append(format.substring(end, length)); - break; - } - } else { - output.append(format.substring(start + 1, length)); - break; - } - } - - decoration.addPrefix(prefix.toString()); - decoration.addSuffix(suffix.toString()); - } - -//todo: leaving the old bind method in until senders can be fixed - - public static String bind(String format, Map bindings) { - StringBuffer output = new StringBuffer(80); - int length = format.length(); - int start = -1; - int end = length; - while (true) { - if ((end = format.indexOf('{', start)) > -1) { - output.append(format.substring(start + 1, end)); - if ((start = format.indexOf('}', end)) > -1) { - String s = (String)bindings.get(format.substring(end + 1, start)); - if(s!=null) { - output.append(s); - } else { - // support for removing prefix character if binding is null - int curLength = output.length(); - if(curLength>0) { - char c = output.charAt(curLength - 1); - if(c == KEYWORD_SEPCOLON || c == KEYWORD_SEPAT) { - output.deleteCharAt(curLength - 1); - } - } - } - } else { - output.append(format.substring(end, length)); - break; - } - } else { - output.append(format.substring(start + 1, length)); - break; - } - } - return output.toString(); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecoratorPreferencesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecoratorPreferencesPage.java deleted file mode 100644 index 0a9420af5..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecoratorPreferencesPage.java +++ /dev/null @@ -1,471 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import org.eclipse.compare.internal.TabFolderLayout; -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.preference.PreferencePage; -import org.eclipse.jface.viewers.ILabelProvider; -import org.eclipse.jface.viewers.IStructuredContentProvider; -import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.TabFolder; -import org.eclipse.swt.widgets.TabItem; -import org.eclipse.swt.widgets.Text; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.core.client.Command; -import org.eclipse.team.internal.ccvs.core.connection.CVSRepositoryLocation; -import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.IWorkbenchPreferencePage; -import org.eclipse.ui.dialogs.ListSelectionDialog; -import org.eclipse.ui.help.WorkbenchHelp; - -public class CVSDecoratorPreferencesPage extends PreferencePage implements IWorkbenchPreferencePage { - - private Button imageShowDirty; - private Button imageShowHasRemote; - private Button imageShowAdded; - private Button imageShowNewResource; - - private Text fileTextFormat; - private Text fileTextFormatExample; - - private Text folderTextFormat; - private Text folderTextFormatExample; - - private Text projectTextFormat; - private Text projectTextFormatExample; - - private Text dirtyFlag; - private Text addedFlag; - - private Button showDirty; - private Button showSyncInfoInLabel; - - class StringPair { - String s1; - String s2; - } - - class TextPair { - TextPair(Text t1, Text t2) { - this.t1 = t1; - this.t2 = t2; - } - Text t1; - Text t2; - } - - /** - * Constructor for CVSDecoratorPreferencesPage. - */ - public CVSDecoratorPreferencesPage() { - setDescription(Policy.bind("CVSDecoratorPreferencesPage.description")); //$NON-NLS-1$; - } - - protected TextPair createFormatEditorControl(Composite composite, String title, String buttonText, final Map supportedBindings) { - createLabel(composite, title, 1); - Text format = new Text(composite, SWT.BORDER); - format.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - format.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - updateExamples(); - } - }); - Button b = new Button(composite, SWT.NONE); - b.setText(buttonText); - GridData data = new GridData(); - data.horizontalAlignment = GridData.FILL; - data.heightHint = convertVerticalDLUsToPixels(IDialogConstants.BUTTON_HEIGHT); - int widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH); - data.widthHint = Math.max(widthHint, b.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x); - b.setLayoutData(data); - final Text formatToInsert = format; - b.addListener(SWT.Selection, new Listener() { - public void handleEvent (Event event) { - addVariables(formatToInsert, supportedBindings); - } - }); - - createLabel(composite, Policy.bind("Example__1"), 1); //$NON-NLS-1$ - Text example = new Text(composite, SWT.BORDER); - example.setEditable(false); - example.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - createLabel(composite, "", 1); // spacer //$NON-NLS-1$ - return new TextPair(format, example); - } - - protected void updateExamples() { - String example = ""; //$NON-NLS-1$ - Map bindings = new HashMap(); - try { - ICVSRepositoryLocation location = CVSRepositoryLocation.fromString(":pserver:username@host.acme.org:/home/cvsroot"); //$NON-NLS-1$ - bindings.put(CVSDecoratorConfiguration.RESOURCE_TAG, "v2_0"); //$NON-NLS-1$ - bindings.put(CVSDecoratorConfiguration.FILE_KEYWORD, - Command.KSUBST_TEXT.getShortDisplayText()); //$NON-NLS-1$ - bindings.put(CVSDecoratorConfiguration.FILE_REVISION, "1.34"); //$NON-NLS-1$ - bindings.put(CVSDecoratorConfiguration.DIRTY_FLAG, dirtyFlag.getText()); - bindings.put(CVSDecoratorConfiguration.ADDED_FLAG, addedFlag.getText()); - bindings.put(CVSDecoratorConfiguration.REMOTELOCATION_HOST, location.getHost()); - bindings.put(CVSDecoratorConfiguration.REMOTELOCATION_METHOD, location.getMethod().getName()); - bindings.put(CVSDecoratorConfiguration.REMOTELOCATION_USER, location.getUsername()); - bindings.put(CVSDecoratorConfiguration.REMOTELOCATION_ROOT, location.getRootDirectory()); - bindings.put(CVSDecoratorConfiguration.REMOTELOCATION_REPOSITORY, "org.eclipse.project1"); //$NON-NLS-1$ - } catch(CVSException e) { - example = e.getMessage(); - } - bindings.put(CVSDecoratorConfiguration.RESOURCE_NAME, "file.txt"); //$NON-NLS-1$ - setTextFormatExample(bindings); - bindings.remove(CVSDecoratorConfiguration.RESOURCE_NAME); - bindings.put(CVSDecoratorConfiguration.RESOURCE_NAME, "folder"); //$NON-NLS-1$ - setFolderFormatExample(bindings); - bindings.remove(CVSDecoratorConfiguration.RESOURCE_NAME); - bindings.put(CVSDecoratorConfiguration.RESOURCE_NAME, "Project"); //$NON-NLS-1$ - setProjectFormatExample(bindings); - } - - /** - * @see PreferencePage#createContents(Composite) - */ - protected Control createContents(Composite parent) { - - // create a tab folder for the page - TabFolder tabFolder = new TabFolder(parent, SWT.NONE); - tabFolder.setLayout(new TabFolderLayout()); - tabFolder.setLayoutData(new GridData(GridData.FILL_BOTH)); - - // text decoration options - TabItem tabItem = new TabItem(tabFolder, SWT.NONE); - tabItem.setText(Policy.bind("Text_Labels_12"));//$NON-NLS-1$ - tabItem.setControl(createTextDecoratorPage(tabFolder)); - - // image decoration options - tabItem = new TabItem(tabFolder, SWT.NONE); - tabItem.setText(Policy.bind("Icon_Overlays_24"));//$NON-NLS-1$ - tabItem.setControl(createIconDecoratorPage(tabFolder)); - - // general decoration options - tabItem = new TabItem(tabFolder, SWT.NONE); - tabItem.setText(Policy.bind("CVSDecoratorPreferencesPage.generalTabFolder"));//$NON-NLS-1$ - tabItem.setControl(createGeneralDecoratorPage(tabFolder)); - - // synchronize decoration options - tabItem = new TabItem(tabFolder, SWT.NONE); - tabItem.setText(Policy.bind("CVSDecoratorPreferencesPage.synchronizeTabFolder"));//$NON-NLS-1$ - tabItem.setControl(createSynchronizeDecoratorPage(tabFolder)); - - initializeValues(); - WorkbenchHelp.setHelp(tabFolder, IHelpContextIds.DECORATORS_PREFERENCE_PAGE); - Dialog.applyDialogFont(parent); - return tabFolder; - } - - private Control createTextDecoratorPage(Composite parent) { - Composite fileTextGroup = new Composite(parent, SWT.NULL); - GridLayout layout = new GridLayout(); - layout.numColumns = 3; - fileTextGroup.setLayout(layout); - GridData data = new GridData(); - data.horizontalAlignment = GridData.FILL; - fileTextGroup.setLayoutData(data); - - createLabel(fileTextGroup, Policy.bind("Select_the_format_for_file,_folders,_and_project_text_labels__13"), 3); //$NON-NLS-1$ - - TextPair format = createFormatEditorControl(fileTextGroup, Policy.bind("&File_Format__14"), Policy.bind("Add_&Variables_15"), getFileBindingDescriptions()); //$NON-NLS-1$ //$NON-NLS-2$ - fileTextFormat = format.t1; - fileTextFormatExample = format.t2; - format = createFormatEditorControl(fileTextGroup, Policy.bind("F&older_Format__16"), Policy.bind("Add_Varia&bles_17"), getFolderBindingDescriptions()); //$NON-NLS-1$ //$NON-NLS-2$ - folderTextFormat = format.t1; - folderTextFormatExample = format.t2; - format = createFormatEditorControl(fileTextGroup, Policy.bind("&Project_Format__18"), Policy.bind("Add_Variable&s_19"), getFolderBindingDescriptions()); //$NON-NLS-1$ //$NON-NLS-2$ - projectTextFormat = format.t1; - projectTextFormatExample = format.t2; - - createLabel(fileTextGroup, Policy.bind("&Label_decoration_for_outgoing__20"), 1); //$NON-NLS-1$ - dirtyFlag = new Text(fileTextGroup, SWT.BORDER); - dirtyFlag.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - dirtyFlag.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - updateExamples(); - } - }); - createLabel(fileTextGroup, "", 1); // spacer //$NON-NLS-1$ - - createLabel(fileTextGroup, Policy.bind("Label_decorat&ion_for_added__22"), 1); //$NON-NLS-1$ - addedFlag = new Text(fileTextGroup, SWT.BORDER); - addedFlag.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - addedFlag.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - updateExamples(); - } - }); - - return fileTextGroup; - } - - private Control createIconDecoratorPage(Composite parent) { - Composite imageGroup = new Composite(parent, SWT.NULL); - GridLayout layout = new GridLayout(); - imageGroup.setLayout(layout); - GridData data = new GridData(); - data.horizontalAlignment = GridData.FILL; - imageGroup.setLayoutData(data); - - createLabel(imageGroup, Policy.bind("CVSDecoratorPreferencesPage.iconDescription"), 1); //$NON-NLS-1$ - - imageShowDirty = createCheckBox(imageGroup, Policy.bind("Sho&w_outgoing_25")); //$NON-NLS-1$ - imageShowHasRemote = createCheckBox(imageGroup, Policy.bind("Show_has_&remote_26")); //$NON-NLS-1$ - imageShowAdded = createCheckBox(imageGroup, Policy.bind("S&how_is_added_27")); //$NON-NLS-1$ - imageShowNewResource = createCheckBox(imageGroup, Policy.bind("CVSDecoratorPreferencesPage.newResources")); //$NON-NLS-1$ - return imageGroup; - } - - private Control createGeneralDecoratorPage(Composite parent) { - Composite composite = new Composite(parent, SWT.NULL); - GridLayout layout = new GridLayout(); - composite.setLayout(layout); - GridData data = new GridData(); - data.horizontalAlignment = GridData.FILL; - composite.setLayoutData(data); - createLabel(composite, Policy.bind("CVSDecoratorPreferencesPage.generalDescription"), 1); //$NON-NLS-1$ - showDirty = createCheckBox(composite, Policy.bind("&Compute_deep_outgoing_state_for_folders_(disabling_this_will_improve_decorator_performance)_28")); //$NON-NLS-1$ - return composite; - } - - private Control createSynchronizeDecoratorPage(Composite parent) { - Composite composite = new Composite(parent, SWT.NULL); - GridLayout layout = new GridLayout(); - composite.setLayout(layout); - GridData data = new GridData(); - data.horizontalAlignment = GridData.FILL; - composite.setLayoutData(data); - createLabel(composite, Policy.bind("CVSDecoratorPreferencesPage.synchronizeDescription"), 1); //$NON-NLS-1$ - showSyncInfoInLabel = createCheckBox(composite, Policy.bind("CVSDecoratorPreferencesPage.showSyncInfoInLabel")); //$NON-NLS-1$ - return composite; - } - - private Label createLabel(Composite parent, String text, int span) { - Label label = new Label(parent, SWT.LEFT); - label.setText(text); - GridData data = new GridData(); - data.horizontalSpan = span; - data.horizontalAlignment = GridData.FILL; - label.setLayoutData(data); - return label; - } - - private Button createCheckBox(Composite group, String label) { - Button button = new Button(group, SWT.CHECK); - button.setText(label); - return button; - } - - protected void setTextFormatExample(Map bindings) { - String example = CVSDecoratorConfiguration.bind(fileTextFormat.getText(), bindings); - fileTextFormatExample.setText(example); - } - - protected void setFolderFormatExample(Map bindings) { - String example = CVSDecoratorConfiguration.bind(folderTextFormat.getText(), bindings); - folderTextFormatExample.setText(example); - } - - protected void setProjectFormatExample(Map bindings) { - String example = CVSDecoratorConfiguration.bind(projectTextFormat.getText(), bindings); - projectTextFormatExample.setText(example); - } - - /** - * Initializes states of the controls from the preference store. - */ - private void initializeValues() { - IPreferenceStore store = getPreferenceStore(); - - fileTextFormat.setText(store.getString(ICVSUIConstants.PREF_FILETEXT_DECORATION)); - folderTextFormat.setText(store.getString(ICVSUIConstants.PREF_FOLDERTEXT_DECORATION)); - projectTextFormat.setText(store.getString(ICVSUIConstants.PREF_PROJECTTEXT_DECORATION)); - - addedFlag.setText(store.getString(ICVSUIConstants.PREF_ADDED_FLAG)); - dirtyFlag.setText(store.getString(ICVSUIConstants.PREF_DIRTY_FLAG)); - - imageShowDirty.setSelection(store.getBoolean(ICVSUIConstants.PREF_SHOW_DIRTY_DECORATION)); - imageShowAdded.setSelection(store.getBoolean(ICVSUIConstants.PREF_SHOW_ADDED_DECORATION)); - imageShowHasRemote.setSelection(store.getBoolean(ICVSUIConstants.PREF_SHOW_HASREMOTE_DECORATION)); - imageShowNewResource.setSelection(store.getBoolean(ICVSUIConstants.PREF_SHOW_NEWRESOURCE_DECORATION)); - - showDirty.setSelection(store.getBoolean(ICVSUIConstants.PREF_CALCULATE_DIRTY)); - - showSyncInfoInLabel.setSelection(store.getBoolean(ICVSUIConstants.PREF_SHOW_SYNCINFO_AS_TEXT)); - - setValid(true); - } - - /** - * @see IWorkbenchPreferencePage#init(IWorkbench) - */ - public void init(IWorkbench workbench) { - } - - /** - * OK was clicked. Store the CVS preferences. - * - * @return whether it is okay to close the preference page - */ - public boolean performOk() { - IPreferenceStore store = getPreferenceStore(); - store.setValue(ICVSUIConstants.PREF_FILETEXT_DECORATION, fileTextFormat.getText()); - store.setValue(ICVSUIConstants.PREF_FOLDERTEXT_DECORATION, folderTextFormat.getText()); - store.setValue(ICVSUIConstants.PREF_PROJECTTEXT_DECORATION, projectTextFormat.getText()); - - store.setValue(ICVSUIConstants.PREF_ADDED_FLAG, addedFlag.getText()); - store.setValue(ICVSUIConstants.PREF_DIRTY_FLAG, dirtyFlag.getText()); - - store.setValue(ICVSUIConstants.PREF_SHOW_DIRTY_DECORATION, imageShowDirty.getSelection()); - store.setValue(ICVSUIConstants.PREF_SHOW_ADDED_DECORATION, imageShowAdded.getSelection()); - store.setValue(ICVSUIConstants.PREF_SHOW_HASREMOTE_DECORATION, imageShowHasRemote.getSelection()); - store.setValue(ICVSUIConstants.PREF_SHOW_NEWRESOURCE_DECORATION, imageShowNewResource.getSelection()); - - store.setValue(ICVSUIConstants.PREF_CALCULATE_DIRTY, showDirty.getSelection()); - - store.setValue(ICVSUIConstants.PREF_SHOW_SYNCINFO_AS_TEXT, showSyncInfoInLabel.getSelection()); - - CVSLightweightDecorator.refresh(); - - CVSUIPlugin.getPlugin().savePluginPreferences(); - return true; - } - - /** - * Defaults was clicked. Restore the CVS preferences to - * their default values - */ - protected void performDefaults() { - super.performDefaults(); - IPreferenceStore store = getPreferenceStore(); - - fileTextFormat.setText(store.getDefaultString(ICVSUIConstants.PREF_FILETEXT_DECORATION)); - folderTextFormat.setText(store.getDefaultString(ICVSUIConstants.PREF_FOLDERTEXT_DECORATION)); - projectTextFormat.setText(store.getDefaultString(ICVSUIConstants.PREF_PROJECTTEXT_DECORATION)); - - addedFlag.setText(store.getDefaultString(ICVSUIConstants.PREF_ADDED_FLAG)); - dirtyFlag.setText(store.getDefaultString(ICVSUIConstants.PREF_DIRTY_FLAG)); - - imageShowDirty.setSelection(store.getDefaultBoolean(ICVSUIConstants.PREF_SHOW_DIRTY_DECORATION)); - imageShowAdded.setSelection(store.getDefaultBoolean(ICVSUIConstants.PREF_SHOW_ADDED_DECORATION)); - imageShowHasRemote.setSelection(store.getDefaultBoolean(ICVSUIConstants.PREF_SHOW_HASREMOTE_DECORATION)); - imageShowNewResource.setSelection(store.getDefaultBoolean(ICVSUIConstants.PREF_SHOW_NEWRESOURCE_DECORATION)); - - showDirty.setSelection(store.getDefaultBoolean(ICVSUIConstants.PREF_CALCULATE_DIRTY)); - showSyncInfoInLabel.setSelection(store.getDefaultBoolean(ICVSUIConstants.PREF_SHOW_SYNCINFO_AS_TEXT)); - } - - /** - * Returns preference store that belongs to the our plugin. - * This is important because we want to store - * our preferences separately from the desktop. - * - * @return the preference store for this plugin - */ - protected IPreferenceStore doGetPreferenceStore() { - return CVSUIPlugin.getPlugin().getPreferenceStore(); - } - - /** - * Add another project to the list at the end. - */ - private void addVariables(Text target, Map bindings) { - - final List variables = new ArrayList(bindings.size()); - - ILabelProvider labelProvider = new LabelProvider() { - public String getText(Object element) { - return ((StringPair)element).s1 + " - " + ((StringPair)element).s2; //$NON-NLS-1$ - } - }; - - IStructuredContentProvider contentsProvider = new IStructuredContentProvider() { - public Object[] getElements(Object inputElement) { - return (Object[]) variables.toArray(new StringPair[variables.size()]); - } - public void dispose() {} - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {} - }; - - for (Iterator it = bindings.keySet().iterator(); it.hasNext();) { - StringPair variable = new StringPair(); - variable.s1 = (String) it.next(); // variable - variable.s2 = (String) bindings.get(variable.s1); // description - variables.add(variable); - } - - ListSelectionDialog dialog = - new ListSelectionDialog( - this.getShell(), - this, - contentsProvider, - labelProvider, - Policy.bind("Select_the_&variables_to_add_to_the_decoration_format__30")); //$NON-NLS-1$ - dialog.setTitle(Policy.bind("Add_Variables_31")); //$NON-NLS-1$ - if (dialog.open() != ListSelectionDialog.OK) - return; - - Object[] result = dialog.getResult(); - - for (int i = 0; i < result.length; i++) { - target.insert("{"+((StringPair)result[i]).s1 +"}"); //$NON-NLS-1$ //$NON-NLS-2$ - } - } - - private Map getFolderBindingDescriptions() { - Map bindings = new HashMap(); - bindings.put(CVSDecoratorConfiguration.RESOURCE_NAME, Policy.bind("name_of_the_resource_being_decorated_34")); //$NON-NLS-1$ - bindings.put(CVSDecoratorConfiguration.RESOURCE_TAG, Policy.bind("the_tag_applied_to_the_resource_(version,_branch,_or_date)_35")); //$NON-NLS-1$ - bindings.put(CVSDecoratorConfiguration.REMOTELOCATION_HOST, Policy.bind("the_repository_location__s_hostname_36")); //$NON-NLS-1$ - bindings.put(CVSDecoratorConfiguration.REMOTELOCATION_METHOD, Policy.bind("the_connection_method_(e.g._pserver,_ssh)_37")); //$NON-NLS-1$ - bindings.put(CVSDecoratorConfiguration.REMOTELOCATION_USER, Policy.bind("user_name_for_the_connection_38")); //$NON-NLS-1$ - bindings.put(CVSDecoratorConfiguration.REMOTELOCATION_ROOT, Policy.bind("repository_home_directory_on_server_39")); //$NON-NLS-1$ - bindings.put(CVSDecoratorConfiguration.REMOTELOCATION_REPOSITORY, Policy.bind("root_relative_directory_40")); //$NON-NLS-1$ - bindings.put(CVSDecoratorConfiguration.DIRTY_FLAG, Policy.bind("flag_indicating_that_the_folder_has_a_child_resource_with_outgoing_changes_41")); //$NON-NLS-1$ - return bindings; - } - - private Map getFileBindingDescriptions() { - Map bindings = new HashMap(); - bindings.put(CVSDecoratorConfiguration.RESOURCE_NAME, Policy.bind("name_of_the_resource_being_decorated_42")); //$NON-NLS-1$ - bindings.put(CVSDecoratorConfiguration.RESOURCE_TAG, Policy.bind("the_tag_applied_to_the_resource_43")); //$NON-NLS-1$ - bindings.put(CVSDecoratorConfiguration.FILE_KEYWORD, Policy.bind("keyword_substitution_rule_for_the_resource_44")); //$NON-NLS-1$ - bindings.put(CVSDecoratorConfiguration.FILE_REVISION, Policy.bind("last_revision_loaded_into_workspace_45")); //$NON-NLS-1$ - bindings.put(CVSDecoratorConfiguration.DIRTY_FLAG, Policy.bind("flag_indicating_that_the_file_has_outgoing_changes_46")); //$NON-NLS-1$ - bindings.put(CVSDecoratorConfiguration.ADDED_FLAG, Policy.bind("flag_indicating_that_the_file_has_been_added_to_the_server_47")); //$NON-NLS-1$ - return bindings; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFieldEditorPreferencePage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFieldEditorPreferencePage.java deleted file mode 100644 index a60360891..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFieldEditorPreferencePage.java +++ /dev/null @@ -1,76 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.preference.FieldEditorPreferencePage; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.IWorkbenchPreferencePage; -import org.eclipse.ui.help.WorkbenchHelp; - -/** - * This class acts as an abstract superclass for CVS preference pages that use - * field editors. - */ -public abstract class CVSFieldEditorPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage { - - public static IPreferenceStore getCVSPreferenceStore() { - return CVSUIPlugin.getPlugin().getPreferenceStore(); - } - - /** - * Constructor for CVSFieldEditorPreferencePage. - */ - public CVSFieldEditorPreferencePage() { - super(GRID); - setPreferenceStore(getCVSPreferenceStore()); - String description = getPageDescription(); - if (description != null) - setDescription(description); - } - - /** - * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) - */ - protected Control createContents(Composite parent) { - Control control = super.createContents(parent); - String id = getPageHelpContextId(); - if (id != null) - WorkbenchHelp.setHelp(control, id); - Dialog.applyDialogFont(control); - return control; - } - - /** - * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) - */ - public void init(IWorkbench workbench) { - } - - /** - * Method getPageHelpContextId must be overridden by subclasses to provide - * the help context ID of the page. Return null for no page F1 help. - * - * @return String - */ - protected abstract String getPageHelpContextId(); - - /** - * Method getPageDescription must be overridden by subclasses to provide the - * description of the page. Return null for no description. - * @return String - */ - protected abstract String getPageDescription(); - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFilePropertiesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFilePropertiesPage.java deleted file mode 100644 index 0c6fd9019..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFilePropertiesPage.java +++ /dev/null @@ -1,142 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - - -import java.text.DateFormat; -import java.util.Date; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Label; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSFile; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo; -import org.eclipse.team.internal.ccvs.core.util.Util; -import org.eclipse.ui.help.WorkbenchHelp; - -public class CVSFilePropertiesPage extends CVSPropertiesPage { - IFile file; - - /* - * @see PreferencesPage#createContents - */ - protected Control createContents(Composite parent) { - initialize(); - noDefaultAndApplyButton(); - Composite composite = new Composite(parent, SWT.NULL); - composite.setLayoutData(new GridData(GridData.FILL_BOTH)); - GridLayout layout = new GridLayout(); - layout.numColumns = 2; - composite.setLayout(layout); - - try { - ICVSFile cvsResource = CVSWorkspaceRoot.getCVSFileFor(file); - if (!cvsResource.isManaged()) { - if (cvsResource.isIgnored()) { - createLabel(composite, Policy.bind("CVSFilePropertiesPage.ignored")); //$NON-NLS-1$ - } else { - createLabel(composite, Policy.bind("CVSFilePropertiesPage.notManaged")); //$NON-NLS-1$ - } - createLabel(composite, ""); //$NON-NLS-1$ - return composite; - } - ResourceSyncInfo syncInfo = cvsResource.getSyncInfo(); - - - - if (syncInfo.isAdded()) { - createLabel(composite, Policy.bind("CVSFilePropertiesPage.isAdded"), 2); //$NON-NLS-1$ - } else { - // Base - createLabel(composite, Policy.bind("CVSFilePropertiesPage.baseRevision")); //$NON-NLS-1$ - createLabel(composite, syncInfo.getRevision()); - Date baseTime = syncInfo.getTimeStamp(); - if (baseTime != null) { - createLabel(composite, Policy.bind("CVSFilePropertiesPage.baseTimestamp")); //$NON-NLS-1$ - createLabel(composite, DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.FULL).format(syncInfo.getTimeStamp())); - } - - // Modified - createLabel(composite, Policy.bind("CVSFilePropertiesPage.modified")); //$NON-NLS-1$ - createLabel(composite, cvsResource.isModified(null) ? Policy.bind("yes") : Policy.bind("no")); //$NON-NLS-1$ //$NON-NLS-2$ - } - - // Keyword Mode - createLabel(composite, Policy.bind("CVSFilePropertiesPage.keywordMode")); //$NON-NLS-1$ - createLabel(composite, syncInfo.getKeywordMode().getLongDisplayText()); - - // Tag - createLabel(composite, Policy.bind("CVSFilePropertiesPage.tag")); //$NON-NLS-1$ - CVSTag tag = Util.getAccurateFileTag(cvsResource); - createLabel(composite, getTagLabel(tag)); - - // Permissions - createLabel(composite, Policy.bind("CVSFilePropertiesPage.permissions")); //$NON-NLS-1$ - String permissions = syncInfo.getPermissions(); - if (permissions == null) { - createLabel(composite, Policy.bind("CVSFilePropertiesPage.notAvailable")); //$NON-NLS-1$ - } else { - createLabel(composite, syncInfo.getPermissions()); - } - } catch (TeamException e) { - // Display error text - createLabel(composite, Policy.bind("CVSFilePropertiesPage.error")); //$NON-NLS-1$ - createLabel(composite, ""); //$NON-NLS-1$ - } - WorkbenchHelp.setHelp(getControl(), IHelpContextIds.FILE_PROPERTY_PAGE); - return composite; - } - /** - * Utility method that creates a label instance - * and sets the default layout data. - * - * @param parent the parent for the new label - * @param text the text for the new label - * @return the new label - */ - protected Label createLabel(Composite parent, String text, int span) { - Label label = new Label(parent, SWT.LEFT); - label.setText(text); - GridData data = new GridData(); - data.horizontalSpan = span; - data.horizontalAlignment = GridData.FILL; - label.setLayoutData(data); - return label; - } - protected Label createLabel(Composite parent, String text) { - return createLabel(parent, text, 1); - } - /** - * Initializes the page - */ - private void initialize() { - // Get the file that is the source of this property page - file = null; - IAdaptable element = getElement(); - if (element instanceof IFile) { - file = (IFile)element; - } else { - Object adapter = element.getAdapter(IFile.class); - if (adapter instanceof IFile) { - file = (IFile)adapter; - } - } - } -} - diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFolderPropertiesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFolderPropertiesPage.java deleted file mode 100644 index 3f373141e..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFolderPropertiesPage.java +++ /dev/null @@ -1,169 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo; -import org.eclipse.team.internal.ccvs.core.util.Util; -import org.eclipse.ui.help.WorkbenchHelp; - -public class CVSFolderPropertiesPage extends CVSPropertiesPage { - - IFolder folder; - private Label root; - private Label repository; - - /** - * @see PreferencePage#createContents(Composite) - */ - protected Control createContents(Composite parent) { - initialize(); - noDefaultAndApplyButton(); - Composite composite = new Composite(parent, SWT.NULL); - composite.setLayoutData(new GridData(GridData.FILL_BOTH)); - GridLayout layout = new GridLayout(); - layout.numColumns = 2; - composite.setLayout(layout); - - try { - ICVSFolder cvsResource = CVSWorkspaceRoot.getCVSFolderFor(folder); - if (!cvsResource.isManaged()) { - if (cvsResource.isIgnored()) { - createLabel(composite, Policy.bind("CVSFolderPropertiesPage.ignored"), 2); //$NON-NLS-1$ - } else { - createLabel(composite, Policy.bind("CVSFolderPropertiesPage.notManaged"), 2); //$NON-NLS-1$ - } - } else if (!cvsResource.isCVSFolder()) { - // We have a managed folder which is not a cvs folder. - // This is really an invalid state but it does happen once in a while - createLabel(composite, Policy.bind("CVSFolderPropertiesPage.notCVSFolder"), 2); //$NON-NLS-1$ - } else { - FolderSyncInfo syncInfo = cvsResource.getFolderSyncInfo(); - createLabel(composite, Policy.bind("CVSFolderPropertiesPage.root")); //$NON-NLS-1$ - root = createLabel(composite, syncInfo.getRoot()); - createLabel(composite, Policy.bind("CVSFolderPropertiesPage.repository")); //$NON-NLS-1$ - repository = createLabel(composite, syncInfo.getRepository()); - - // Tag - createLabel(composite, Policy.bind("CVSFilePropertiesPage.tag")); //$NON-NLS-1$ - CVSTag tag = syncInfo.getTag(); - - if (tag != null && tag.getType() == CVSTag.BRANCH) { - tag = Util.getAccurateFolderTag(folder, tag); - } - - createLabel(composite, getTagLabel(tag)); - - // Static-ness - if (syncInfo.getIsStatic()) { - createLabel(composite, Policy.bind("CVSFolderPropertiesPage.static")); //$NON-NLS-1$ - createLabel(composite, syncInfo.getIsStatic() ? Policy.bind("yes") : Policy.bind("no")); //$NON-NLS-1$ //$NON-NLS-2$ - } - - createLabel(composite, "", 2); // spacer //$NON-NLS-1$ - - // Allow the folder to be disconnected from CVS control - final Button disconnect = new Button(composite, SWT.NONE); - disconnect.setText(Policy.bind("CVSFolderPropertiesPage.disconnect")); //$NON-NLS-1$ - GridData data = new GridData(GridData.HORIZONTAL_ALIGN_END); - data.heightHint = convertVerticalDLUsToPixels(IDialogConstants.BUTTON_HEIGHT); - int widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH); - data.widthHint = Math.max(widthHint, disconnect.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x); - disconnect.setLayoutData(data); - disconnect.addListener(SWT.Selection, new Listener() { - public void handleEvent (Event event) { - // perform a disconnect - if (disconnectFolder()) { - root.setText(Policy.bind("CVSFilePropertiesPage.none")); //$NON-NLS-1$ - repository.setText(Policy.bind("CVSFilePropertiesPage.none")); //$NON-NLS-1$ - disconnect.setEnabled(false); - } - } - }); - } - } catch (TeamException e) { - // Display error text - createLabel(composite, Policy.bind("CVSFilePropertiesPage.error"), 2); //$NON-NLS-1$ - } - WorkbenchHelp.setHelp(getControl(), IHelpContextIds.FOLDER_PROPERTY_PAGE); - return composite; - } - - /** - * Utility method that creates a label instance - * and sets the default layout data. - * - * @param parent the parent for the new label - * @param text the text for the new label - * @return the new label - */ - protected Label createLabel(Composite parent, String text, int span) { - Label label = new Label(parent, SWT.LEFT); - label.setText(text); - GridData data = new GridData(); - data.horizontalSpan = span; - data.horizontalAlignment = GridData.FILL; - label.setLayoutData(data); - return label; - } - - protected Label createLabel(Composite parent, String text) { - return createLabel(parent, text, 1); - } - /** - * Initializes the page - */ - private void initialize() { - // Get the file that is the source of this property page - folder = null; - IAdaptable element = getElement(); - if (element instanceof IFolder) { - folder = (IFolder)element; - } else { - Object adapter = element.getAdapter(IFolder.class); - if (adapter instanceof IFolder) { - folder = (IFolder)adapter; - } - } - } - - private boolean disconnectFolder() { - if (MessageDialog.openQuestion(getShell(), Policy.bind("CVSFolderPropertiesPage.disconnectTitle"), Policy.bind("CVSFolderPropertiesPage.disconnectQuestion"))) { //$NON-NLS-1$ //$NON-NLS-2$ - ICVSFolder cvsFolder = CVSWorkspaceRoot.getCVSFolderFor(folder); - try { - cvsFolder.unmanage(null); - } catch (CVSException e) { - CVSUIPlugin.openError(getShell(), null, null, e); - return false; - } - return true; - } else { - return false; - } - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSLightweightDecorator.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSLightweightDecorator.java deleted file mode 100644 index 627d9b117..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSLightweightDecorator.java +++ /dev/null @@ -1,525 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IResourceVisitor; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.viewers.IDecoration; -import org.eclipse.jface.viewers.ILightweightLabelDecorator; -import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jface.viewers.LabelProviderChangedEvent; -import org.eclipse.swt.graphics.ImageData; -import org.eclipse.swt.widgets.Display; -import org.eclipse.team.core.RepositoryProvider; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.CVSTeamProvider; -import org.eclipse.team.internal.ccvs.core.ICVSFile; -import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.internal.ccvs.core.IResourceStateChangeListener; -import org.eclipse.team.internal.ccvs.core.client.Command.KSubstOption; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.core.resources.EclipseSynchronizer; -import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo; -import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo; -import org.eclipse.team.internal.ui.TeamUIPlugin; -import org.eclipse.team.ui.ISharedImages; - -public class CVSLightweightDecorator - extends LabelProvider - implements ILightweightLabelDecorator, IResourceStateChangeListener { - - // Images cached for better performance - private static ImageDescriptor dirty; - private static ImageDescriptor checkedIn; - private static ImageDescriptor noRemoteDir; - private static ImageDescriptor added; - private static ImageDescriptor merged; - private static ImageDescriptor newResource; - private static ImageDescriptor edited; - - /* - * Define a cached image descriptor which only creates the image data once - */ - public static class CachedImageDescriptor extends ImageDescriptor { - ImageDescriptor descriptor; - ImageData data; - public CachedImageDescriptor(ImageDescriptor descriptor) { - this.descriptor = descriptor; - } - public ImageData getImageData() { - if (data == null) { - data = descriptor.getImageData(); - } - return data; - } - } - - static { - dirty = new CachedImageDescriptor(TeamUIPlugin.getImageDescriptor(ISharedImages.IMG_DIRTY_OVR)); - checkedIn = new CachedImageDescriptor(TeamUIPlugin.getImageDescriptor(ISharedImages.IMG_CHECKEDIN_OVR)); - added = new CachedImageDescriptor(TeamUIPlugin.getImageDescriptor(ISharedImages.IMG_CHECKEDIN_OVR)); - merged = new CachedImageDescriptor(CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_MERGED)); - newResource = new CachedImageDescriptor(CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_QUESTIONABLE)); - edited = new CachedImageDescriptor(CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_EDITED)); - noRemoteDir = new CachedImageDescriptor(CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_NO_REMOTEDIR)); - } - - public CVSLightweightDecorator() { - CVSProviderPlugin.addResourceStateChangeListener(this); - CVSProviderPlugin.broadcastDecoratorEnablementChanged(true /* enabled */); - } - - public static boolean isDirty(final ICVSResource cvsResource) { - try { - return !cvsResource.isIgnored() && cvsResource.isModified(null); - } catch (CVSException e) { - //if we get an error report it to the log but assume dirty - CVSUIPlugin.log(e); - return true; - } - } - - public static boolean isDirty(IResource resource) { - - // No need to decorate non-existant resources - if (!resource.exists()) return false; - - return isDirty(CVSWorkspaceRoot.getCVSResourceFor(resource)); - - } - - /* - * Answers null if a provider does not exist or the provider is not a CVS provider. These resources - * will be ignored by the decorator. - */ - private CVSTeamProvider getCVSProviderFor(IResource resource) { - RepositoryProvider p = - RepositoryProvider.getProvider( - resource.getProject(), - CVSProviderPlugin.getTypeId()); - if (p == null) { - return null; - } - return (CVSTeamProvider) p; - } - - /** - * Returns the resource for the given input object, or - * null if there is no resource associated with it. - * - * @param object the object to find the resource for - * @return the resource for the given object, or null - */ - private IResource getResource(Object object) { - if (object instanceof IResource) { - return (IResource) object; - } - if (object instanceof IAdaptable) { - return (IResource) ((IAdaptable) object).getAdapter( - IResource.class); - } - return null; - } - /** - * This method should only be called by the decorator thread. - * - * @see org.eclipse.jface.viewers.ILightweightLabelDecorator#decorate(java.lang.Object, org.eclipse.jface.viewers.IDecoration) - */ - public void decorate(Object element, IDecoration decoration) { - - // Make sure that the decorator thread only has read access to the CVS sync info. - // This will register the thread on each decoration but it's the only way we - // know of to ensure the proper thread is registered. - EclipseSynchronizer.getInstance().addReadOnlyThread(Thread.currentThread()); - - IResource resource = getResource(element); - if (resource == null || resource.getType() == IResource.ROOT) - return; - - CVSTeamProvider cvsProvider = getCVSProviderFor(resource); - if (cvsProvider == null) - return; - - - // if the resource is ignored return an empty decoration. This will - // force a decoration update event and clear the existing CVS decoration. - ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource); - try { - if (cvsResource.isIgnored()) { - return; - } - } catch (CVSException e) { - // The was an exception in isIgnored. Don't decorate - //todo should log this error - return; - } - - // determine a if resource has outgoing changes (e.g. is dirty). - IPreferenceStore store = CVSUIPlugin.getPlugin().getPreferenceStore(); - boolean isDirty = false; - boolean computeDeepDirtyCheck = - store.getBoolean(ICVSUIConstants.PREF_CALCULATE_DIRTY); - int type = resource.getType(); - if (type == IResource.FILE || computeDeepDirtyCheck) { - isDirty = CVSLightweightDecorator.isDirty(resource); - } - - decorateTextLabel(resource, decoration, isDirty, true); - - ImageDescriptor overlay = getOverlay(resource, isDirty, cvsProvider); - if(overlay != null) { //actually sending null arg would work but this makes logic clearer - decoration.addOverlay(overlay); - } - } - -//todo the showRevisions flag is temp, a better solution is DecoratorStrategy classes which have most the code below - public static void decorateTextLabel(IResource resource, IDecoration decoration, boolean isDirty, boolean showRevisions) { - try { - Map bindings = new HashMap(3); - String format = ""; //$NON-NLS-1$ - IPreferenceStore store = CVSUIPlugin.getPlugin().getPreferenceStore(); - - // if the resource does not have a location then return. This can happen if the resource - // has been deleted after we where asked to decorate it. - if(resource.getLocation() == null) { - return; - } - - int type = resource.getType(); - - if (type == IResource.FOLDER) { - format = store.getString(ICVSUIConstants.PREF_FOLDERTEXT_DECORATION); - } else if (type == IResource.PROJECT) { - format = store.getString(ICVSUIConstants.PREF_PROJECTTEXT_DECORATION); - } else { - format = store.getString(ICVSUIConstants.PREF_FILETEXT_DECORATION); - } - - if (isDirty) { - bindings.put(CVSDecoratorConfiguration.DIRTY_FLAG, store.getString(ICVSUIConstants.PREF_DIRTY_FLAG)); - } - - CVSTag tag = getTagToShow(resource); - if (tag != null) { - bindings.put(CVSDecoratorConfiguration.RESOURCE_TAG, tag.getName()); - } - - if (type != IResource.FILE) { - ICVSFolder folder = CVSWorkspaceRoot.getCVSFolderFor((IContainer) resource); - FolderSyncInfo folderInfo = folder.getFolderSyncInfo(); - if (folderInfo != null) { - ICVSRepositoryLocation location = CVSProviderPlugin.getPlugin().getRepository(folderInfo.getRoot()); - bindings.put(CVSDecoratorConfiguration.REMOTELOCATION_HOST, location.getHost()); - bindings.put(CVSDecoratorConfiguration.REMOTELOCATION_METHOD, location.getMethod().getName()); - bindings.put(CVSDecoratorConfiguration.REMOTELOCATION_USER, location.getUsername()); - bindings.put(CVSDecoratorConfiguration.REMOTELOCATION_ROOT, location.getRootDirectory()); - bindings.put(CVSDecoratorConfiguration.REMOTELOCATION_REPOSITORY, folderInfo.getRepository()); - } - } else { - format = store.getString(ICVSUIConstants.PREF_FILETEXT_DECORATION); - ICVSFile file = CVSWorkspaceRoot.getCVSFileFor((IFile) resource); - ResourceSyncInfo fileInfo = file.getSyncInfo(); - if (fileInfo != null) { - if (fileInfo.isAdded()) { - bindings.put(CVSDecoratorConfiguration.ADDED_FLAG, store.getString(ICVSUIConstants.PREF_ADDED_FLAG)); - } else { - if(showRevisions) - bindings.put(CVSDecoratorConfiguration.FILE_REVISION, fileInfo.getRevision()); - } - KSubstOption option = fileInfo.getKeywordMode() != null ? - fileInfo.getKeywordMode() : - KSubstOption.fromFile((IFile) resource); - bindings.put(CVSDecoratorConfiguration.FILE_KEYWORD, option.getShortDisplayText()); - } else { - // only show the type that cvs will use when comitting the file - KSubstOption option = KSubstOption.fromFile((IFile) resource); - bindings.put(CVSDecoratorConfiguration.FILE_KEYWORD, option.getShortDisplayText()); - } - } - - CVSDecoratorConfiguration.decorate(decoration, format, bindings); - - } catch (CVSException e) { - CVSUIPlugin.log(e); - return; - } - } - - /** - * Only show the tag if the resources tag is different than the parents. Or else, tag - * names will clutter the text decorations. - */ - protected static CVSTag getTagToShow(IResource resource) throws CVSException { - ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource); - CVSTag tag = null; - - // for unmanaged resources don't show a tag since they will be added in - // the context of their parents tag. For managed resources only show tags - // if different than parent. - boolean managed = false; - - if(cvsResource.isFolder()) { - FolderSyncInfo folderInfo = ((ICVSFolder)cvsResource).getFolderSyncInfo(); - if(folderInfo != null) { - tag = folderInfo.getTag(); - managed = true; - } - } else { - ResourceSyncInfo info = ((ICVSFile)cvsResource).getSyncInfo(); - if(info != null) { - tag = info.getTag(); - managed = true; - } - } - - ICVSFolder parent = cvsResource.getParent(); - if(parent != null && managed) { - FolderSyncInfo parentInfo = parent.getFolderSyncInfo(); - if(parentInfo != null) { - CVSTag parentTag = parentInfo.getTag(); - parentTag = (parentTag == null ? CVSTag.DEFAULT : parentTag); - tag = (tag == null ? CVSTag.DEFAULT : tag); - // must compare tags by name because CVS doesn't do a good job of - // using T and N prefixes for folders and files. - if( parentTag.getName().equals(tag.getName())) { - tag = null; - } - } - } - return tag; - } - - /* Determine and return the overlay icon to use. - * We only get to use one, so if many are applicable at once we chose the - * one we think is the most important to show. - * Return null if no overlay is to be used. - */ - public static ImageDescriptor getOverlay(IResource resource, boolean isDirty, CVSTeamProvider provider) { - - // for efficiency don't look up a pref until its needed - IPreferenceStore store = CVSUIPlugin.getPlugin().getPreferenceStore(); - boolean showNewResources = store.getBoolean(ICVSUIConstants.PREF_SHOW_NEWRESOURCE_DECORATION); - - // show newResource icon - if (showNewResources) { - ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource); - try { - if (cvsResource.exists()) { - boolean isNewResource = false; - if (cvsResource.isFolder()) { - if (!((ICVSFolder)cvsResource).isCVSFolder()) { - isNewResource = true; - } - } else if (!cvsResource.isManaged()) { - isNewResource = true; - } - if (isNewResource) { - return newResource; - } - } - } catch (CVSException e) { - CVSUIPlugin.log(e); - return null; - } - } - - boolean showDirty = store.getBoolean(ICVSUIConstants.PREF_SHOW_DIRTY_DECORATION); - - // show dirty icon - if(showDirty && isDirty) { - return dirty; - } - - boolean showAdded = store.getBoolean(ICVSUIConstants.PREF_SHOW_ADDED_DECORATION); - - if (showAdded && resource.getType() == IResource.FILE) { - try { - if (resource.getLocation() != null) { - ICVSFile cvsFile = CVSWorkspaceRoot.getCVSFileFor((IFile) resource); - ResourceSyncInfo info = cvsFile.getSyncInfo(); - // show merged icon if file has been merged but has not been edited (e.g. on commit it will be ignored) - if (info != null && info.isNeedsMerge(cvsFile.getTimeStamp())) { - return merged; - // show added icon if file has been added locally. - } else if (info != null && info.isAdded()) { - // todo - return added; - } - } - } catch (CVSException e) { - CVSUIPlugin.log(e); - return null; - } - } - - // if watch/edit is enabled, show non-read-only files as being edited - boolean decorateEdited; - try { - decorateEdited = provider.isWatchEditEnabled(); - } catch (CVSException e1) { - CVSUIPlugin.log(e1); - decorateEdited = false; - } - - if (decorateEdited && resource.getType() == IResource.FILE && !resource.isReadOnly() && CVSWorkspaceRoot.hasRemote(resource)) { - return edited; - } - - boolean showHasRemote = store.getBoolean(ICVSUIConstants.PREF_SHOW_HASREMOTE_DECORATION); - - // Simplest is that is has remote. - if (showHasRemote && CVSWorkspaceRoot.hasRemote(resource)) { - if (resource.getType() != IResource.FILE) { - // check if the folder is local diectory with no remote - ICVSFolder cvsFolder = CVSWorkspaceRoot.getCVSFolderFor((IContainer)resource); - try { - if (cvsFolder.getFolderSyncInfo().getRepository().equals(FolderSyncInfo.VIRTUAL_DIRECTORY)) { - return noRemoteDir; - } - } catch (CVSException e) { - // log the exception and show the shared overlay - CVSUIPlugin.log(e); - } - } - return checkedIn; - } - - //nothing matched - return null; - - } - - /* - * Add resource and its parents to the List - */ - - private void addWithParents(IResource resource, List resources) { - IResource current = resource; - - while (current.getType() != IResource.ROOT) { - resources.add(current); - current = current.getParent(); - } - } - - /* - * Perform a blanket refresh of all CVS decorations - */ - public static void refresh() { - CVSUIPlugin.getPlugin().getWorkbench().getDecoratorManager().update(CVSUIPlugin.DECORATOR_ID); - } - - /* - * Update the decorators for every resource in project - */ - - public void refresh(IProject project) { - final List resources = new ArrayList(); - try { - project.accept(new IResourceVisitor() { - public boolean visit(IResource resource) { - resources.add(resource); - return true; - } - }); - postLabelEvent(new LabelProviderChangedEvent(this, resources.toArray())); - } catch (CoreException e) { - CVSProviderPlugin.log(e); - } - } - - /** - * @see org.eclipse.team.internal.ccvs.core.IResourceStateChangeListener#resourceSyncInfoChanged(org.eclipse.core.resources.IResource[]) - */ - public void resourceSyncInfoChanged(IResource[] changedResources) { - resourceStateChanged(changedResources); - } - - /** - * @see org.eclipse.team.internal.ccvs.core.IResourceStateChangeListener#resourceModificationStateChanged(org.eclipse.core.resources.IResource[]) - */ - public void resourceModified(IResource[] changedResources) { - resourceStateChanged(changedResources); - } - - /** - * @see org.eclipse.team.internal.ccvs.core.IResourceStateChangeListener#resourceStateChanged(org.eclipse.core.resources.IResource[]) - */ - public void resourceStateChanged(IResource[] changedResources) { - // add depth first so that update thread processes parents first. - //System.out.println(">> State Change Event"); - List resourcesToUpdate = new ArrayList(); - - boolean showingDeepDirtyIndicators = CVSUIPlugin.getPlugin().getPreferenceStore().getBoolean(ICVSUIConstants.PREF_CALCULATE_DIRTY); - - for (int i = 0; i < changedResources.length; i++) { - IResource resource = changedResources[i]; - - if(showingDeepDirtyIndicators) { - addWithParents(resource, resourcesToUpdate); - } else { - resourcesToUpdate.add(resource); - } - } - - postLabelEvent(new LabelProviderChangedEvent(this, resourcesToUpdate.toArray())); - } - - /** - * @see org.eclipse.team.internal.ccvs.core.IResourceStateChangeListener#projectConfigured(org.eclipse.core.resources.IProject) - */ - public void projectConfigured(IProject project) { - refresh(project); - } - /** - * @see org.eclipse.team.internal.ccvs.core.IResourceStateChangeListener#projectDeconfigured(org.eclipse.core.resources.IProject) - */ - public void projectDeconfigured(IProject project) { - refresh(project); - } - - /** - * Post the label event to the UI thread - * - * @param events the events to post - */ - private void postLabelEvent(final LabelProviderChangedEvent event) { - Display.getDefault().asyncExec(new Runnable() { - public void run() { - fireLabelProviderChanged(event); - } - }); - } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose() - */ - public void dispose() { - super.dispose(); - CVSProviderPlugin.broadcastDecoratorEnablementChanged(false /* disabled */); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSLocalCompareEditorInput.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSLocalCompareEditorInput.java deleted file mode 100644 index 800688dc1..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSLocalCompareEditorInput.java +++ /dev/null @@ -1,84 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - - -import org.eclipse.compare.structuremergeviewer.ICompareInput; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.core.sync.IRemoteResource; -import org.eclipse.team.core.sync.IRemoteSyncElement; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.resources.CVSRemoteSyncElement; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.core.util.Assert; -import org.eclipse.team.internal.ccvs.ui.sync.CVSSyncCompareInput; -import org.eclipse.team.internal.ui.sync.SyncView; - -public class CVSLocalCompareEditorInput extends CVSSyncCompareInput { - CVSTag[] tags; - - public CVSLocalCompareEditorInput(IResource[] resources, CVSTag[] tags) { - super(resources); - Assert.isTrue(resources.length == tags.length); - this.tags = tags; - } - - public CVSLocalCompareEditorInput(IResource[] resources, CVSTag tag) { - super(resources); - Assert.isTrue(tag != null); - this.tags = new CVSTag[] {tag}; - } - - public Viewer createDiffViewer(Composite parent) { - Viewer viewer = super.createDiffViewer(parent); - getViewer().syncModeChanged(SyncView.SYNC_COMPARE); - return viewer; - } - - protected IRemoteSyncElement[] createSyncElements(IProgressMonitor monitor) throws TeamException { - IResource[] resources = getResources(); - IRemoteSyncElement[] trees = new IRemoteSyncElement[resources.length]; - int work = 100 * resources.length; - monitor.beginTask(null, work); - try { - for (int i = 0; i < trees.length; i++) { - IResource resource = resources[i]; - CVSTag tag; - if(tags.length != resources.length) { - tag = tags[0]; - } else { - tag = tags[i]; - } - IRemoteResource remote = CVSWorkspaceRoot.getRemoteTree(resource, tag, Policy.subMonitorFor(monitor, 50)); - trees[i] = new CVSRemoteSyncElement(false /* two-way */, resource, null, remote); - } - } finally { - monitor.done(); - } - //getViewer().resetFilters(); - return trees; - } - - public String getTitle() { - return Policy.bind("CVSLocalCompareEditorInput.title", tags[0].getName()); //$NON-NLS-1$ - } - - protected void contentsChanged(ICompareInput source) { - } - - public String getToolTipText() { - return getTitle(); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPerspective.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPerspective.java deleted file mode 100644 index 025bd64c0..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPerspective.java +++ /dev/null @@ -1,57 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - - -import org.eclipse.team.internal.ccvs.ui.repo.*; -import org.eclipse.ui.*; - -public class CVSPerspective implements IPerspectiveFactory { - - /* (Non-javadoc) - * Method declared on IPerpsectiveFactory - */ - public void createInitialLayout(IPageLayout layout) { - defineActions(layout); - defineLayout(layout); - } - - /** - * Defines the initial actions for a page. - */ - - public void defineActions(IPageLayout layout) { - - // Add "new wizards". - layout.addNewWizardShortcut("org.eclipse.ui.wizards.new.project"); //$NON-NLS-1$ - layout.addNewWizardShortcut("org.eclipse.ui.wizards.new.folder"); //$NON-NLS-1$ - layout.addNewWizardShortcut("org.eclipse.ui.wizards.new.file"); //$NON-NLS-1$ - - // Add "show views". - layout.addShowViewShortcut(IPageLayout.ID_RES_NAV); - layout.addShowViewShortcut(IPageLayout.ID_OUTLINE); - layout.addShowViewShortcut(IPageLayout.ID_TASK_LIST); - layout.addShowViewShortcut(HistoryView.VIEW_ID); - layout.addShowViewShortcut(RepositoriesView.VIEW_ID); - } - - /** - * Defines the initial layout for a page. - */ - public void defineLayout(IPageLayout layout) { - String editorArea = layout.getEditorArea(); - IFolderLayout top = - layout.createFolder("top", IPageLayout.LEFT, 0.40f, editorArea); //$NON-NLS-1$ - top.addView(RepositoriesView.VIEW_ID); - layout.addView(HistoryView.VIEW_ID, IPageLayout.BOTTOM, 0.70f, editorArea); - layout.setEditorAreaVisible(true); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java deleted file mode 100644 index a7d8c6d62..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java +++ /dev/null @@ -1,478 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.team.internal.ccvs.ui; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.Iterator; -import java.util.List; - -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.preference.PreferencePage; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.graphics.FontMetrics; -import org.eclipse.swt.graphics.GC; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Combo; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Group; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Text; -import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; -import org.eclipse.team.internal.ccvs.core.client.Command; -import org.eclipse.team.internal.ccvs.core.client.Command.KSubstOption; -import org.eclipse.team.internal.ccvs.core.client.Command.QuietOption; -import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.IWorkbenchPreferencePage; -import org.eclipse.ui.help.WorkbenchHelp; - -/** - * CVS Preference Page - * - * Allows the configuration of CVS specific options. - * The currently supported options are: - * - Allow loading of CVS administration directory (CVSROOT) - * - * There are currently a couple of deficiencies: - * 1. The Repository view is not refreshed when the show CVSROOT option is changed - * 2. There is no help associated with the page - */ -public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPreferencePage { - - private Button pruneEmptyDirectoriesField; - private Text timeoutValue; - private Combo quietnessCombo; - private Combo compressionLevelCombo; - private Combo ksubstCombo; - private List ksubstOptions; - private Button considerContentsInCompare; - private Button replaceUnmanaged; - private Button repositoriesAreBinary; - private Button determineVersionEnabled; - private Button confirmMoveTag; - - private Button never; - private Button prompt; - private Button auto; - - public CVSPreferencesPage() { - // sort the options by display text - setDescription(Policy.bind("CVSPreferencePage.description")); //$NON-NLS-1$ - KSubstOption[] options = KSubstOption.getAllKSubstOptions(); - this.ksubstOptions = new ArrayList(); - for (int i = 0; i < options.length; i++) { - KSubstOption option = options[i]; - if (! option.isBinary()) { - ksubstOptions.add(option); - } - } - Collections.sort(ksubstOptions, new Comparator() { - public int compare(Object a, Object b) { - String aKey = ((KSubstOption) a).getLongDisplayText(); - String bKey = ((KSubstOption) b).getLongDisplayText(); - return aKey.compareTo(bKey); - } - }); - } - - /** - * Utility method that creates a combo box - * - * @param parent the parent for the new label - * @return the new widget - */ - protected Combo createCombo(Composite parent, int widthChars) { - Combo combo = new Combo(parent, SWT.READ_ONLY); - GridData data = new GridData(GridData.FILL_HORIZONTAL); - GC gc = new GC(combo); - gc.setFont(combo.getFont()); - FontMetrics fontMetrics = gc.getFontMetrics(); - data.widthHint = Dialog.convertWidthInCharsToPixels(fontMetrics, widthChars); - gc.dispose(); - combo.setLayoutData(data); - return combo; - } - - /** - * Utility method that creates a combo box - * - * @param parent the parent for the new label - * @return the new widget - */ - protected Combo createCombo(Composite parent) { - Combo combo = new Combo(parent, SWT.READ_ONLY); - GridData data = new GridData(GridData.FILL_HORIZONTAL); - data.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH; - combo.setLayoutData(data); - return combo; - } - - /** - * Creates composite control and sets the default layout data. - * - * @param parent the parent of the new composite - * @param numColumns the number of columns for the new composite - * @return the newly-created coposite - */ - private Composite createComposite(Composite parent, int numColumns) { - Composite composite = new Composite(parent, SWT.NULL); - - //GridLayout - GridLayout layout = new GridLayout(); - layout.numColumns = numColumns; - layout.marginWidth = 0; - layout.marginHeight = 0; - composite.setLayout(layout); - - //GridData - GridData data = new GridData(); - data.verticalAlignment = GridData.FILL; - data.horizontalAlignment = GridData.FILL; - composite.setLayoutData(data); - return composite; - } - - /** - * Creates an new checkbox instance and sets the default - * layout data. - * - * @param group the composite in which to create the checkbox - * @param label the string to set into the checkbox - * @return the new checkbox - */ - private Button createCheckBox(Composite group, String label) { - Button button = new Button(group, SWT.CHECK | SWT.LEFT); - button.setText(label); - GridData data = new GridData(); - data.horizontalSpan = 2; - button.setLayoutData(data); - return button; - } - - /** - * @see PreferencePage#createContents(Composite) - */ - protected Control createContents(Composite parent) { - Composite composite = createComposite(parent, 2); - - pruneEmptyDirectoriesField = createCheckBox(composite, Policy.bind("CVSPreferencePage.pruneEmptyDirectories")); //$NON-NLS-1$ - considerContentsInCompare = createCheckBox(composite, Policy.bind("CVSPreferencePage.considerContentsInCompare")); //$NON-NLS-1$ - replaceUnmanaged = createCheckBox(composite, Policy.bind("CVSPreferencePage.replaceUnmanaged")); //$NON-NLS-1$ - repositoriesAreBinary = createCheckBox(composite, Policy.bind("CVSPreferencePage.repositoriesAreBinary")); //$NON-NLS-1$ - determineVersionEnabled = createCheckBox(composite, Policy.bind("CVSPreferencePage.determineVersionEnabled")); //$NON-NLS-1$ - confirmMoveTag = createCheckBox(composite, Policy.bind("CVSPreferencePage.confirmMoveTag")); //$NON-NLS-1$ - - createLabel(composite, ""); createLabel(composite, ""); //$NON-NLS-1$ //$NON-NLS-2$ - - createLabel(composite, Policy.bind("CVSPreferencePage.timeoutValue")); //$NON-NLS-1$ - timeoutValue = createTextField(composite); - timeoutValue.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - // Parse the timeout value - try { - int x = Integer.parseInt(timeoutValue.getText()); - if (x >= 0) { - setErrorMessage(null); - setValid(true); - } else { - setErrorMessage(Policy.bind("CVSPreferencesPage.Timeout_must_not_be_negative_1")); //$NON-NLS-1$ - setValid(false); - } - } catch (NumberFormatException ex) { - setErrorMessage(Policy.bind("CVSPreferencesPage.Timeout_must_be_a_number_2")); //$NON-NLS-1$ - setValid(false); - } - } - }); - - createLabel(composite, Policy.bind("CVSPreferencePage.quietness")); //$NON-NLS-1$ - quietnessCombo = createCombo(composite); - - createLabel(composite, Policy.bind("CVSPreferencePage.compressionLevel")); //$NON-NLS-1$ - compressionLevelCombo = createCombo(composite); - - createLabel(composite, Policy.bind("CVSPreferencePage.defaultTextKSubst")); //$NON-NLS-1$ - int chars = 0; - for (Iterator it = ksubstOptions.iterator(); it.hasNext();) { - KSubstOption option = (KSubstOption) it.next(); - int c = option.getLongDisplayText().length(); - if(c > chars) { - chars = c; - } - } - ksubstCombo = createCombo(composite, chars); - - createLabel(composite, ""); createLabel(composite, ""); //$NON-NLS-1$ //$NON-NLS-2$ - - createSaveCombo(composite); - - initializeValues(); - - quietnessCombo.addSelectionListener(new SelectionListener() { - public void widgetSelected(SelectionEvent e) { - if (getQuietnessOptionFor(quietnessCombo.getSelectionIndex()).equals(Command.SILENT)) { - MessageDialog.openWarning(getShell(), Policy.bind("CVSPreferencePage.silentWarningTitle"), Policy.bind("CVSPreferencePage.silentWarningMessage")); //$NON-NLS-1$ //$NON-NLS-2$ - } - } - public void widgetDefaultSelected(SelectionEvent e) { - widgetSelected(e); - } - }); - - WorkbenchHelp.setHelp(pruneEmptyDirectoriesField, IHelpContextIds.PREF_PRUNE); - WorkbenchHelp.setHelp(compressionLevelCombo, IHelpContextIds.PREF_COMPRESSION); - WorkbenchHelp.setHelp(quietnessCombo, IHelpContextIds.PREF_QUIET); - WorkbenchHelp.setHelp(ksubstCombo, IHelpContextIds.PREF_KEYWORDMODE); - WorkbenchHelp.setHelp(timeoutValue, IHelpContextIds.PREF_COMMS_TIMEOUT); - WorkbenchHelp.setHelp(considerContentsInCompare, IHelpContextIds.PREF_CONSIDER_CONTENT); - WorkbenchHelp.setHelp(replaceUnmanaged, IHelpContextIds.PREF_REPLACE_DELETE_UNMANAGED); - WorkbenchHelp.setHelp(repositoriesAreBinary, IHelpContextIds.PREF_TREAT_NEW_FILE_AS_BINARY); - WorkbenchHelp.setHelp(determineVersionEnabled, IHelpContextIds.PREF_DETERMINE_SERVER_VERSION); - WorkbenchHelp.setHelp(confirmMoveTag, IHelpContextIds.PREF_CONFIRM_MOVE_TAG); - Dialog.applyDialogFont(parent); - return composite; - } - /** - * Utility method that creates a label instance - * and sets the default layout data. - * - * @param parent the parent for the new label - * @param text the text for the new label - * @return the new label - */ - private Label createLabel(Composite parent, String text) { - Label label = new Label(parent, SWT.LEFT); - label.setText(text); - GridData data = new GridData(); - data.horizontalSpan = 1; - data.horizontalAlignment = GridData.FILL; - label.setLayoutData(data); - return label; - } - /** - * Creates an new text widget and sets the default - * layout data. - * - * @param group the composite in which to create the checkbox - * @return the new text widget - */ - private Text createTextField(Composite group) { - Text text = new Text(group, SWT.BORDER); - text.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - return text; - } - /** - * Initializes states of the controls from the preference store. - */ - private void initializeValues() { - IPreferenceStore store = getPreferenceStore(); - pruneEmptyDirectoriesField.setSelection(store.getBoolean(ICVSUIConstants.PREF_PRUNE_EMPTY_DIRECTORIES)); - timeoutValue.setText(new Integer(store.getInt(ICVSUIConstants.PREF_TIMEOUT)).toString()); - repositoriesAreBinary.setSelection(store.getBoolean(ICVSUIConstants.PREF_REPOSITORIES_ARE_BINARY)); - quietnessCombo.add(Policy.bind("CVSPreferencePage.notquiet")); //$NON-NLS-1$ - quietnessCombo.add(Policy.bind("CVSPreferencePage.somewhatquiet")); //$NON-NLS-1$ - quietnessCombo.add(Policy.bind("CVSPreferencePage.reallyquiet")); //$NON-NLS-1$ - quietnessCombo.select(store.getInt(ICVSUIConstants.PREF_QUIETNESS)); - for (int i = 0; i < 10; ++i) { - compressionLevelCombo.add(Policy.bind("CVSPreferencePage.level" + i)); //$NON-NLS-1$ - } - compressionLevelCombo.select(store.getInt(ICVSUIConstants.PREF_COMPRESSION_LEVEL)); - for (Iterator it = ksubstOptions.iterator(); it.hasNext();) { - KSubstOption option = (KSubstOption) it.next(); - ksubstCombo.add(option.getLongDisplayText()); - } - ksubstCombo.select(getKSubstComboIndexFor(store.getString(ICVSUIConstants.PREF_TEXT_KSUBST))); - considerContentsInCompare.setSelection(store.getBoolean(ICVSUIConstants.PREF_CONSIDER_CONTENTS)); - replaceUnmanaged.setSelection(store.getBoolean(ICVSUIConstants.PREF_REPLACE_UNMANAGED)); - determineVersionEnabled.setSelection(store.getBoolean(ICVSUIConstants.PREF_DETERMINE_SERVER_VERSION)); - confirmMoveTag.setSelection(store.getBoolean(ICVSUIConstants.PREF_CONFIRM_MOVE_TAG)); - - - initializeSaveRadios(store.getInt(ICVSUIConstants.PREF_SAVE_DIRTY_EDITORS)); - } - - /** - * @see IWorkbenchPreferencePage#init(IWorkbench) - */ - public void init(IWorkbench workbench) { - } - - /** - * OK was clicked. Store the CVS preferences. - * - * @return whether it is okay to close the preference page - */ - public boolean performOk() { - - // Parse the timeout value - int timeout = Integer.parseInt(timeoutValue.getText()); - - IPreferenceStore store = getPreferenceStore(); - - // set the provider preferences first because the preference change - // listeners invoked from the preference store change may need these - // values - - store.setValue(ICVSUIConstants.PREF_PRUNE_EMPTY_DIRECTORIES, pruneEmptyDirectoriesField.getSelection()); - store.setValue(ICVSUIConstants.PREF_TIMEOUT, timeout); - store.setValue(ICVSUIConstants.PREF_QUIETNESS, quietnessCombo.getSelectionIndex()); - store.setValue(ICVSUIConstants.PREF_COMPRESSION_LEVEL, compressionLevelCombo.getSelectionIndex()); - // Text mode processed separately to avoid empty string in properties file. - String mode =((KSubstOption)ksubstOptions.get(ksubstCombo.getSelectionIndex())).toMode(); - if (mode.length() == 0) { - mode = "-kkv"; //$NON-NLS-1$ - } - store.setValue(ICVSUIConstants.PREF_TEXT_KSUBST, mode); - store.setValue(ICVSUIConstants.PREF_CONSIDER_CONTENTS, considerContentsInCompare.getSelection()); - store.setValue(ICVSUIConstants.PREF_REPLACE_UNMANAGED, replaceUnmanaged.getSelection()); - store.setValue(ICVSUIConstants.PREF_SAVE_DIRTY_EDITORS, getSaveRadio()); - store.setValue(ICVSUIConstants.PREF_REPOSITORIES_ARE_BINARY, repositoriesAreBinary.getSelection()); - store.setValue(ICVSUIConstants.PREF_DETERMINE_SERVER_VERSION, determineVersionEnabled.getSelection()); - store.setValue(ICVSUIConstants.PREF_CONFIRM_MOVE_TAG, confirmMoveTag.getSelection()); - - CVSProviderPlugin.getPlugin().setReplaceUnmanaged( - store.getBoolean(ICVSUIConstants.PREF_REPLACE_UNMANAGED)); - CVSProviderPlugin.getPlugin().setPruneEmptyDirectories( - store.getBoolean(ICVSUIConstants.PREF_PRUNE_EMPTY_DIRECTORIES)); - CVSProviderPlugin.getPlugin().setTimeout( - store.getInt(ICVSUIConstants.PREF_TIMEOUT)); - CVSProviderPlugin.getPlugin().setQuietness( - getQuietnessOptionFor(store.getInt(ICVSUIConstants.PREF_QUIETNESS))); - CVSProviderPlugin.getPlugin().setCompressionLevel( - store.getInt(ICVSUIConstants.PREF_COMPRESSION_LEVEL)); - CVSProviderPlugin.getPlugin().setRepositoriesAreBinary(store.getBoolean(ICVSUIConstants.PREF_REPOSITORIES_ARE_BINARY)); - KSubstOption oldKSubst = CVSProviderPlugin.getPlugin().getDefaultTextKSubstOption(); - KSubstOption newKSubst = KSubstOption.fromMode(store.getString(ICVSUIConstants.PREF_TEXT_KSUBST)); - CVSProviderPlugin.getPlugin().setDefaultTextKSubstOption(newKSubst); - CVSProviderPlugin.getPlugin().setDetermineVersionEnabled(store.getBoolean(ICVSUIConstants.PREF_DETERMINE_SERVER_VERSION)); - CVSProviderPlugin.getPlugin().setConfirmMoveTagEnabled(store.getBoolean(ICVSUIConstants.PREF_CONFIRM_MOVE_TAG)); - - // changing the default keyword substitution mode for text files may affect - // information displayed in the decorators - if (! oldKSubst.equals(newKSubst)) CVSLightweightDecorator.refresh(); - - CVSUIPlugin.getPlugin().savePluginPreferences(); - return true; - } - - /** - * Defaults was clicked. Restore the CVS preferences to - * their default values - */ - protected void performDefaults() { - super.performDefaults(); - IPreferenceStore store = getPreferenceStore(); - pruneEmptyDirectoriesField.setSelection( - store.getDefaultBoolean(ICVSUIConstants.PREF_PRUNE_EMPTY_DIRECTORIES)); - timeoutValue.setText(new Integer(store.getDefaultInt(ICVSUIConstants.PREF_TIMEOUT)).toString()); - quietnessCombo.select(store.getDefaultInt(ICVSUIConstants.PREF_QUIETNESS)); - compressionLevelCombo.select(store.getDefaultInt(ICVSUIConstants.PREF_COMPRESSION_LEVEL)); - ksubstCombo.select(getKSubstComboIndexFor(store.getDefaultString(ICVSUIConstants.PREF_TEXT_KSUBST))); - replaceUnmanaged.setSelection(store.getDefaultBoolean(ICVSUIConstants.PREF_REPLACE_UNMANAGED)); - initializeSaveRadios(store.getDefaultInt(ICVSUIConstants.PREF_SAVE_DIRTY_EDITORS)); - repositoriesAreBinary.setSelection(store.getDefaultBoolean(ICVSUIConstants.PREF_REPOSITORIES_ARE_BINARY)); - confirmMoveTag.setSelection(store.getDefaultBoolean(ICVSUIConstants.PREF_CONFIRM_MOVE_TAG)); - } - - private void createSaveCombo(Composite composite) { - Group group = new Group(composite, SWT.NULL); - GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL); - data.horizontalSpan = 2; - group.setLayoutData(data); - GridLayout layout = new GridLayout(); - group.setLayout(layout); - group.setText(Policy.bind("CVSPreferencePage.Save_dirty_editors_before_CVS_operations_1")); //$NON-NLS-1$ - - never = new Button(group, SWT.RADIO | SWT.LEFT); - never.setLayoutData(new GridData()); - never.setText(Policy.bind("CVSPreferencePage.&Never_2")); //$NON-NLS-1$ - - prompt = new Button(group, SWT.RADIO | SWT.LEFT); - prompt.setLayoutData(new GridData()); - prompt.setText(Policy.bind("CVSPreferencePage.&Prompt_3")); //$NON-NLS-1$ - - auto = new Button(group, SWT.RADIO | SWT.LEFT); - auto.setLayoutData(new GridData()); - auto.setText(Policy.bind("CVSPreferencePage.Auto-&save_4")); //$NON-NLS-1$ - - WorkbenchHelp.setHelp(group, IHelpContextIds.PREF_SAVE_DIRTY_EDITORS); - } - - /** - * Returns preference store that belongs to the our plugin. - * This is important because we want to store - * our preferences separately from the desktop. - * - * @return the preference store for this plugin - */ - protected IPreferenceStore doGetPreferenceStore() { - return CVSUIPlugin.getPlugin().getPreferenceStore(); - } - - protected static QuietOption getQuietnessOptionFor(int option) { - switch (option) { - case 0: return Command.VERBOSE; - case 1: return Command.PARTLY_QUIET; - case 2: return Command.SILENT; - } - return null; - } - - protected int getKSubstComboIndexFor(String mode) { - KSubstOption ksubst = KSubstOption.fromMode(mode); - int i = 0; - for (Iterator it = ksubstOptions.iterator(); it.hasNext();) { - KSubstOption option = (KSubstOption) it.next(); - if (ksubst.equals(option)) return i; - i++; - } - // unknown option, add it to the list - ksubstOptions.add(ksubst); - ksubstCombo.add(ksubst.getLongDisplayText()); - return i; - } - - protected void initializeSaveRadios(int option) { - auto.setSelection(false); - never.setSelection(false); - prompt.setSelection(false); - switch(option) { - case ICVSUIConstants.OPTION_AUTOMATIC: - auto.setSelection(true); break; - case ICVSUIConstants.OPTION_NEVER: - never.setSelection(true); break; - case ICVSUIConstants.OPTION_PROMPT: - prompt.setSelection(true); break; - } - } - - protected int getSaveRadio() { - if(auto.getSelection()) { - return ICVSUIConstants.OPTION_AUTOMATIC; - } else if(never.getSelection()) { - return ICVSUIConstants.OPTION_NEVER; - } else { - return ICVSUIConstants.OPTION_PROMPT; - } - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectPropertiesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectPropertiesPage.java deleted file mode 100644 index cef9cf736..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectPropertiesPage.java +++ /dev/null @@ -1,430 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.dialogs.ProgressMonitorDialog; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.jface.viewers.DoubleClickEvent; -import org.eclipse.jface.viewers.IDoubleClickListener; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.TableViewer; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.Table; -import org.eclipse.team.core.RepositoryProvider; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.CVSTeamProvider; -import org.eclipse.team.internal.ccvs.core.ICVSFile; -import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.core.ICVSResourceVisitor; -import org.eclipse.team.internal.ccvs.core.IUserInfo; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo; -import org.eclipse.ui.help.WorkbenchHelp; -import org.eclipse.ui.model.WorkbenchContentProvider; -import org.eclipse.ui.model.WorkbenchLabelProvider; - -public class CVSProjectPropertiesPage extends CVSPropertiesPage { - IProject project; - ICVSRepositoryLocation oldLocation; - ICVSRepositoryLocation newLocation = null; - - private static final int TABLE_HEIGHT_HINT = 150; - private static final int TABLE_WIDTH_HINT = 300; - - // Widgets - Label methodLabel; - Label userLabel; - Label hostLabel; - Label pathLabel; - Label moduleLabel; - Label portLabel; - Label tagLabel; - private Button fetchButton; - private Button watchEditButton; - - IUserInfo info; - CVSTeamProvider provider; - private boolean fetch; - private boolean watchEdit; - - private class RepositorySelectionDialog extends Dialog { - ICVSRepositoryLocation[] locations; - ICVSRepositoryLocation location; - - TableViewer viewer; - Button okButton; - public RepositorySelectionDialog(Shell shell) { - super(shell); - } - protected void createButtonsForButtonBar(Composite parent) { - // create OK and Cancel buttons by default - okButton = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true); - okButton.setEnabled(false); - createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false); - } - protected Control createDialogArea(Composite parent) { - parent.getShell().setText(Policy.bind("CVSProjectPropertiesPage.Select_a_Repository_1")); //$NON-NLS-1$ - Composite composite = new Composite(parent, SWT.NONE); - composite.setLayout(new GridLayout()); - composite.setLayoutData(new GridData(GridData.FILL_BOTH)); - - createLabel(composite, Policy.bind("CVSProjectPropertiesPage.Select_a_CVS_repository_location_to_share_the_project_with__2"), 1); //$NON-NLS-1$ - Table table = new Table(composite, SWT.SINGLE | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL); - GridData data = new GridData(); - data.widthHint = TABLE_WIDTH_HINT; - data.heightHint = TABLE_HEIGHT_HINT; - table.setLayoutData(data); - viewer = new TableViewer(table); - viewer.setLabelProvider(new WorkbenchLabelProvider()); - viewer.setContentProvider(new WorkbenchContentProvider() { - public Object[] getElements(Object inputElement) { - return locations; - } - }); - viewer.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - IStructuredSelection selection = (IStructuredSelection)event.getSelection(); - if (selection.isEmpty()) { - location = null; - okButton.setEnabled(false); - } else { - location = (ICVSRepositoryLocation)selection.getFirstElement(); - okButton.setEnabled(true); - } - } - }); - viewer.addDoubleClickListener(new IDoubleClickListener() { - public void doubleClick(DoubleClickEvent event) { - okPressed(); - } - }); - viewer.setInput(locations); - return composite; - } - protected void cancelPressed() { - location = null; - super.cancelPressed(); - } - public void setLocations(ICVSRepositoryLocation[] locations) { - this.locations = locations; - } - public ICVSRepositoryLocation getLocation() { - return location; - } - }; - - /* - * @see PreferencesPage#createContents - */ - protected Control createContents(Composite parent) { - initialize(); - - Composite composite = new Composite(parent, SWT.NULL); - composite.setLayoutData(new GridData(GridData.FILL_BOTH)); - GridLayout layout = new GridLayout(); - layout.numColumns = 2; - composite.setLayout(layout); - - Label label = createLabel(composite, Policy.bind("CVSProjectPropertiesPage.connectionType"), 1); //$NON-NLS-1$ - methodLabel = createLabel(composite, "", 1); //$NON-NLS-1$ - - label = createLabel(composite, Policy.bind("CVSProjectPropertiesPage.user"), 1); //$NON-NLS-1$ - userLabel = createLabel(composite, "", 1); //$NON-NLS-1$ - - label = createLabel(composite, Policy.bind("CVSPropertiesPage.host"), 1); //$NON-NLS-1$ - hostLabel = createLabel(composite, "", 1); //$NON-NLS-1$ - - label = createLabel(composite, Policy.bind("CVSPropertiesPage.port"), 1); //$NON-NLS-1$ - portLabel = createLabel(composite, "", 1); //$NON-NLS-1$ - - label = createLabel(composite, Policy.bind("CVSPropertiesPage.path"), 1); //$NON-NLS-1$ - pathLabel = createLabel(composite, "", 1); //$NON-NLS-1$ - - label = createLabel(composite, Policy.bind("CVSPropertiesPage.module"), 1); //$NON-NLS-1$ - moduleLabel = createLabel(composite, "", 1); //$NON-NLS-1$ - - label = createLabel(composite, Policy.bind("CVSPropertiesPage.tag"), 1); //$NON-NLS-1$ - tagLabel = createLabel(composite, "", 1); //$NON-NLS-1$ - - createLabel(composite, "", 1); //$NON-NLS-1$ - - // Should absent directories be fetched on update - fetchButton = createCheckBox(composite, Policy.bind("CVSProjectPropertiesPage.fetchAbsentDirectoriesOnUpdate")); //$NON-NLS-1$ - fetchButton.addListener(SWT.Selection, new Listener() { - public void handleEvent(Event event) { - fetch = fetchButton.getSelection(); - } - }); - - // Should the project be configured for watch/edit - watchEditButton = createCheckBox(composite, Policy.bind("CVSProjectPropertiesPage.configureForWatchEdit")); //$NON-NLS-1$ - watchEditButton.addListener(SWT.Selection, new Listener() { - public void handleEvent(Event event) { - watchEdit = watchEditButton.getSelection(); - } - }); - - createLabel(composite, "", 1); //$NON-NLS-1$ - createLabel(composite, "", 1); //$NON-NLS-1$ - createLabel(composite, "", 1); //$NON-NLS-1$ - createLabel(composite, "", 1); //$NON-NLS-1$ - - label = new Label(composite, SWT.WRAP); - label.setText(Policy.bind("CVSProjectPropertiesPage.You_can_change_the_sharing_of_this_project_to_another_repository_location._However,_this_is_only_possible_if_the_new_location_is___compatible___(on_the_same_host_with_the_same_repository_path)._1")); //$NON-NLS-1$ - GridData data = new GridData(GridData.FILL_HORIZONTAL); - data.widthHint = 200; - data.horizontalSpan = 2; - label.setLayoutData(data); - - Button changeButton = new Button(composite, SWT.PUSH); - changeButton.setText(Policy.bind("CVSProjectPropertiesPage.Change_Sharing_5")); //$NON-NLS-1$ - data = new GridData(); - data.horizontalAlignment = GridData.FILL; - data.heightHint = convertVerticalDLUsToPixels(IDialogConstants.BUTTON_HEIGHT); - int widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH); - data.widthHint = Math.max(widthHint, changeButton.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x); - changeButton.setLayoutData(data); - changeButton.addListener(SWT.Selection, new Listener() { - public void handleEvent(Event e) { - // Find out which repo locations are appropriate - ICVSRepositoryLocation[] locations = CVSUIPlugin.getPlugin().getRepositoryManager().getKnownRepositoryLocations(); - List compatibleLocations = new ArrayList(); - for (int i = 0; i < locations.length; i++) { - ICVSRepositoryLocation location = locations[i]; - // Only locations with the same host and root are eligible - if (!location.getHost().equals(hostLabel.getText())) continue; - if (!location.getRootDirectory().equals(pathLabel.getText())) continue; - if (location.equals(oldLocation)) continue; - compatibleLocations.add(location); - } - RepositorySelectionDialog dialog = new RepositorySelectionDialog(getShell()); - dialog.setLocations((ICVSRepositoryLocation[])compatibleLocations.toArray(new ICVSRepositoryLocation[compatibleLocations.size()])); - dialog.open(); - ICVSRepositoryLocation location = dialog.getLocation(); - if (location == null) return; - newLocation = location; - initializeValues(newLocation); - } - }); - - initializeValues(oldLocation); - WorkbenchHelp.setHelp(getControl(), IHelpContextIds.PROJECT_PROPERTY_PAGE); - return composite; - } - /** - * Utility method that creates a label instance - * and sets the default layout data. - * - * @param parent the parent for the new label - * @param text the text for the new label - * @return the new label - */ - protected Label createLabel(Composite parent, String text, int span) { - Label label = new Label(parent, SWT.LEFT); - label.setText(text); - GridData data = new GridData(); - data.horizontalSpan = span; - data.horizontalAlignment = GridData.FILL; - label.setLayoutData(data); - return label; - } - /** - * Creates a new checkbox instance and sets the default layout data. - * - * @param group the composite in which to create the checkbox - * @param label the string to set into the checkbox - * @return the new checkbox - */ - protected Button createCheckBox(Composite group, String label) { - Button button = new Button(group, SWT.CHECK | SWT.LEFT); - button.setText(label); - GridData data = new GridData(); - data.horizontalSpan = 2; - button.setLayoutData(data); - return button; - } - /** - * Initializes the page - */ - private void initialize() { - // Get the project that is the source of this property page - project = null; - IAdaptable element = getElement(); - if (element instanceof IProject) { - project = (IProject)element; - } else { - Object adapter = element.getAdapter(IProject.class); - if (adapter instanceof IProject) { - project = (IProject)adapter; - } - } - // Do some pre-checks to ensure we're in a good state - provider = (CVSTeamProvider)RepositoryProvider.getProvider(project, CVSProviderPlugin.getTypeId()); - if (provider == null) return; - CVSWorkspaceRoot cvsRoot = provider.getCVSWorkspaceRoot(); - try { - oldLocation = cvsRoot.getRemoteLocation(); - fetch = provider.getFetchAbsentDirectories(); - watchEdit = provider.isWatchEditEnabled(); - } catch (TeamException e) { - handle(e); - } - } - /** - * Set the initial values of the widgets - */ - private void initializeValues(ICVSRepositoryLocation location) { - if (provider == null) return; - CVSWorkspaceRoot cvsRoot = provider.getCVSWorkspaceRoot(); - ICVSFolder folder = cvsRoot.getLocalRoot(); - - try { - if (!folder.isCVSFolder()) return; - methodLabel.setText(location.getMethod().getName()); - info = location.getUserInfo(true); - userLabel.setText(info.getUsername()); - hostLabel.setText(location.getHost()); - int port = location.getPort(); - if (port == ICVSRepositoryLocation.USE_DEFAULT_PORT) { - portLabel.setText(Policy.bind("CVSPropertiesPage.defaultPort")); //$NON-NLS-1$ - } else { - portLabel.setText("" + port); //$NON-NLS-1$ - } - pathLabel.setText(location.getRootDirectory()); - FolderSyncInfo syncInfo = folder.getFolderSyncInfo(); - if (syncInfo == null) return; - String label = syncInfo.getRepository(); - if (label.equals(FolderSyncInfo.VIRTUAL_DIRECTORY)) { - label = Policy.bind("CVSPropertiesPage.virtualModule", label); //$NON-NLS-1$ - } - moduleLabel.setText(label); - fetchButton.setSelection(fetch); - watchEditButton.setSelection(watchEdit); - } catch (TeamException e) { - handle(e); - } - - initializeTag(); - } - - private void initializeTag() { - provider = (CVSTeamProvider)RepositoryProvider.getProvider(project, CVSProviderPlugin.getTypeId()); - if (provider == null) return; - try { - ICVSFolder local = CVSWorkspaceRoot.getCVSFolderFor(project); - CVSTag tag = local.getFolderSyncInfo().getTag(); - - tagLabel.setText(getTagLabel(tag)); - - } catch (TeamException e) { - handle(e); - } - } - /* - * @see PreferencesPage#performOk - */ - public boolean performOk() { - final boolean[] changeReadOnly = { false }; - try { - if (fetch != provider.getFetchAbsentDirectories()) - provider.setFetchAbsentDirectories(fetch); - if (watchEdit != provider.isWatchEditEnabled()) { - provider.setWatchEditEnabled(watchEdit); - changeReadOnly[0] = true; - } - } catch (CVSException e) { - handle(e); - } - if (newLocation == null && !changeReadOnly[0]) { - return true; - } - try { - new ProgressMonitorDialog(getShell()).run(true, false, new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - try { - monitor.beginTask(Policy.bind("CVSProjectPropertiesPage.progressTaskName"), //$NON-NLS-1$ - ((newLocation == null)?0:100) + (changeReadOnly[0]?100:0)); - if (newLocation != null) - provider.setRemoteRoot(newLocation, Policy.subMonitorFor(monitor, 100)); - if (changeReadOnly[0]) - setReadOnly(watchEdit, Policy.infiniteSubMonitorFor(monitor, 100)); - } catch (TeamException e) { - throw new InvocationTargetException(e); - } - } - }); - newLocation = null; - if (changeReadOnly[0]) - CVSLightweightDecorator.refresh(); - } catch (InvocationTargetException e) { - handle(e); - } catch (InterruptedException e) { - return false; - } - - return true; - } - /** - * @param watchEdit - */ - protected void setReadOnly(final boolean watchEdit, final IProgressMonitor monitor) throws CVSException { - monitor.beginTask(null, 512); - String taskName = watchEdit? - Policy.bind("CVSProjectPropertiesPage.setReadOnly"): //$NON-NLS-1$ - Policy.bind("CVSProjectPropertiesPage.clearReadOnly"); //$NON-NLS-1$ - monitor.subTask(taskName); - ICVSFolder root = CVSWorkspaceRoot.getCVSFolderFor(project); - root.accept(new ICVSResourceVisitor() { - public void visitFile(ICVSFile file) throws CVSException { - // only change managed, unmodified files - if (file.isManaged() && !file.isModified(null)) - file.setReadOnly(watchEdit); - monitor.worked(1); - } - - public void visitFolder(ICVSFolder folder) throws CVSException { - folder.acceptChildren(this); - } - }); - monitor.done(); - } - /** - * Shows the given errors to the user. - */ - protected void handle(Throwable t) { - CVSUIPlugin.openError(getShell(), null, null, t); - } -} - diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectSetSerializer.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectSetSerializer.java deleted file mode 100644 index a520ede7c..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectSetSerializer.java +++ /dev/null @@ -1,216 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.List; -import java.util.StringTokenizer; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.SubProgressMonitor; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.core.IProjectSetSerializer; -import org.eclipse.team.core.RepositoryProvider; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.CVSTeamProvider; -import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.core.connection.CVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo; -import org.eclipse.ui.actions.WorkspaceModifyOperation; - -public class CVSProjectSetSerializer implements IProjectSetSerializer { - - /** - * @see IProjectSetSerializer#asReference(IProject[]) - * - * "1.0,repoLocation,module,projectName[,tag]" - */ - public String[] asReference(IProject[] providerProjects, Object context, IProgressMonitor monitor) throws TeamException { - String[] result = new String[providerProjects.length]; - for (int i = 0; i < providerProjects.length; i++) { - StringBuffer buffer = new StringBuffer(); - buffer.append("1.0,"); //$NON-NLS-1$ - - IProject project = providerProjects[i]; - CVSTeamProvider provider = (CVSTeamProvider)RepositoryProvider.getProvider(project); - CVSWorkspaceRoot root = provider.getCVSWorkspaceRoot(); - CVSRepositoryLocation location = CVSRepositoryLocation.fromString(root.getRemoteLocation().getLocation()); - location.setUserMuteable(true); - String repoLocation = location.getLocation(); - buffer.append(repoLocation); - buffer.append(","); //$NON-NLS-1$ - - ICVSFolder folder = root.getLocalRoot(); - FolderSyncInfo syncInfo = folder.getFolderSyncInfo(); - String module = syncInfo.getRepository(); - buffer.append(module); - buffer.append(","); //$NON-NLS-1$ - - String projectName = folder.getName(); - buffer.append(projectName); - CVSTag tag = syncInfo.getTag(); - if (tag != null) { - if (tag.getType() != CVSTag.DATE) { - buffer.append(","); //$NON-NLS-1$ - String tagName = tag.getName(); - buffer.append(tagName); - } - } - result[i] = buffer.toString(); - } - return result; - } - - /** - * @see IProjectSetSerializer#addToWorkspace(String[]) - */ - public IProject[] addToWorkspace(String[] referenceStrings, String filename, Object context, IProgressMonitor monitor) throws TeamException { - final int size = referenceStrings.length; - final IProject[] projects = new IProject[size]; - final ICVSRepositoryLocation[] locations = new ICVSRepositoryLocation[size]; - final String[] modules = new String[size]; - final CVSTag[] tags = new CVSTag[size]; - - for (int i = 0; i < size; i++) { - StringTokenizer tokenizer = new StringTokenizer(referenceStrings[i], ","); //$NON-NLS-1$ - String version = tokenizer.nextToken(); - if (!version.equals("1.0")) { //$NON-NLS-1$ - // Bail out, this is a newer version - return null; - } - String repo = tokenizer.nextToken(); - locations[i] = getLocationFromString(repo); - modules[i] = tokenizer.nextToken(); - String projectName = tokenizer.nextToken(); - projects[i] = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); - if (tokenizer.hasMoreTokens()) { - String tagName = tokenizer.nextToken(); - tags[i] = new CVSTag(tagName, CVSTag.BRANCH); - } - } - // Check if any projects will be overwritten, and warn the user. - boolean yesToAll = false; - int action; - final int[] num = new int[] {size}; - for (int i = 0; i < size; i++) { - Shell shell = null; - IProject project = projects[i]; - if (project.exists()) { - if (shell == null) { - if (context instanceof Shell) { - shell = (Shell)context; - } else { - return null; - } - } - action = confirmOverwrite(project, yesToAll, shell); - yesToAll = action == 2; - - // message dialog - switch (action) { - // no - case 1: - // Remove it from the set - locations[i] = null; - num[0]--; - break; - // yes to all - case 2: - // yes - case 0: - break; - // cancel - case 3: - default: - return null; - } - } - } - WorkspaceModifyOperation op = new WorkspaceModifyOperation() { - public void execute(IProgressMonitor monitor) throws InterruptedException, InvocationTargetException { - monitor.beginTask("", 1000 * num[0]); //$NON-NLS-1$ - try { - for (int i = 0; i < size; i++) { - if (locations[i] != null) { - CVSWorkspaceRoot.checkout(locations[i], projects[i], modules[i], tags[i], new SubProgressMonitor(monitor, 1000)); - } - } - } catch (TeamException e) { - throw new InvocationTargetException(e); - } finally { - monitor.done(); - } - } - }; - try { - op.run(monitor); - } catch (InterruptedException e) { - } catch (InvocationTargetException e) { - Throwable t = e.getTargetException(); - if (t instanceof TeamException) { - throw (TeamException)t; - } - } - List result = new ArrayList(); - for (int i = 0; i < projects.length; i++) { - if (projects[i] != null) result.add(projects[i]); - } - return (IProject[])result.toArray(new IProject[result.size()]); - } - - private ICVSRepositoryLocation getLocationFromString(String repo) throws CVSException { - // create the new location - ICVSRepositoryLocation newLocation = CVSRepositoryLocation.fromString(repo); - if (newLocation.getUsername() == null || newLocation.getUsername().length() == 0) { - // look for an existing location that matched - ICVSRepositoryLocation[] locations = CVSProviderPlugin.getPlugin().getKnownRepositories(); - for (int i = 0; i < locations.length; i++) { - ICVSRepositoryLocation location = locations[i]; - if (location.getMethod() == newLocation.getMethod() - && location.getHost().equals(newLocation.getHost()) - && location.getPort() == newLocation.getPort() - && location.getRootDirectory().equals(newLocation.getRootDirectory())) - return location; - } - } - return newLocation; - } - - private int confirmOverwrite(IProject project, boolean yesToAll, Shell shell) { - if (yesToAll) return 2; - if (!project.exists()) return 0; - final MessageDialog dialog = - new MessageDialog(shell, Policy.bind("CVSProjectSetSerializer.Confirm_Overwrite_Project_8"), null, Policy.bind("CVSProjectSetSerializer.The_project_{0}_already_exists._Do_you_wish_to_overwrite_it__9", project.getName()), MessageDialog.QUESTION, //$NON-NLS-1$ //$NON-NLS-2$ - new String[] { - IDialogConstants.YES_LABEL, - IDialogConstants.NO_LABEL, - IDialogConstants.YES_TO_ALL_LABEL, - IDialogConstants.CANCEL_LABEL}, - 0); - final int[] result = new int[1]; - shell.getDisplay().syncExec(new Runnable() { - public void run() { - result[0] = dialog.open(); - } - }); - return result[0]; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPropertiesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPropertiesPage.java deleted file mode 100644 index 552c75f18..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPropertiesPage.java +++ /dev/null @@ -1,44 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.ui.dialogs.PropertyPage; - -public abstract class CVSPropertiesPage extends PropertyPage { - - /** - * Return the appropriate Tag label for properties pages - * based on the tag type. - * @param tag - * @return String - */ - - public static String getTagLabel(CVSTag tag) { - - if (tag == null) { - return Policy.bind("CVSFilePropertiesPage.none"); //$NON-NLS-1$ - } - - switch (tag.getType()) { - case CVSTag.HEAD: - return tag.getName(); - case CVSTag.VERSION: - return Policy.bind("CVSFilePropertiesPage.version", tag.getName()); //$NON-NLS-1$ - case CVSTag.BRANCH: - return Policy.bind("CVSFilePropertiesPage.branch", tag.getName()); //$NON-NLS-1$ - case CVSTag.DATE: - return Policy.bind("CVSFilePropertiesPage.date", tag.getName()); //$NON-NLS-1$ - default : - return tag.getName(); - } - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java deleted file mode 100644 index 2506ec37b..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java +++ /dev/null @@ -1,658 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.team.internal.ccvs.ui; - -import java.lang.reflect.InvocationTargetException; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Hashtable; - -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IResourceStatus; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPluginDescriptor; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Preferences; -import org.eclipse.core.runtime.Status; -import org.eclipse.jface.dialogs.ErrorDialog; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.preference.PreferenceConverter; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.util.IPropertyChangeListener; -import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.swt.graphics.RGB; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; -import org.eclipse.team.internal.ccvs.core.CVSStatus; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFile; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.core.client.Command.KSubstOption; -import org.eclipse.team.internal.ccvs.ui.model.CVSAdapterFactory; -import org.eclipse.team.internal.ccvs.ui.repo.RepositoryManager; -import org.eclipse.team.internal.ccvs.ui.repo.RepositoryRoot; -import org.eclipse.team.internal.ui.TeamUIPlugin; -import org.eclipse.team.internal.ui.Utils; -import org.eclipse.team.ui.TeamUI; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.ui.plugin.AbstractUIPlugin; -/** - * UI Plugin for CVS provider-specific workbench functionality. - */ -public class CVSUIPlugin extends AbstractUIPlugin { - /** - * The id of the CVS plug-in - */ - public static final String ID = "org.eclipse.team.cvs.ui"; //$NON-NLS-1$ - public static final String DECORATOR_ID = "org.eclipse.team.cvs.ui.decorator"; //$NON-NLS-1$ - - private Hashtable imageDescriptors = new Hashtable(20); - - // timeout in milliseconds before displaying a progress monitor dialog - // (used for normally short-running interactive operations) - private static final int TIMEOUT = 2000; - - /** - * The singleton plug-in instance - */ - private static CVSUIPlugin plugin; - - /** - * The repository manager - */ - private RepositoryManager repositoryManager; - - // constants used by watch/edit as values for string preference - public static final String EDIT = "edit"; //$NON-NLS-1$ - public static final String HIGHJACK = "highjack"; //$NON-NLS-1$ - - // Property change listener - IPropertyChangeListener listener = new IPropertyChangeListener() { - public void propertyChange(PropertyChangeEvent event) { - if (event.getProperty().equals(TeamUI.GLOBAL_IGNORES_CHANGED)) { - CVSLightweightDecorator.refresh(); - } - } - }; - - /** - * CVSUIPlugin constructor - * - * @param descriptor the plugin descriptor - */ - public CVSUIPlugin(IPluginDescriptor descriptor) { - super(descriptor); - plugin = this; - } - - /** - * Creates an image and places it in the image registry. - */ - protected void createImageDescriptor(String id, URL baseURL) { - URL url = null; - try { - url = new URL(baseURL, ICVSUIConstants.ICON_PATH + id); - } catch (MalformedURLException e) { - } - ImageDescriptor desc = ImageDescriptor.createFromURL(url); - imageDescriptors.put(id, desc); - } - - /** - * Returns the active workbench page. Note that the active page may not be - * the one that the usr perceives as active in some situations so this - * method of obtaining the activae page should only be used if no other - * method is available. - * - * @return the active workbench page - */ - public static IWorkbenchPage getActivePage() { - return TeamUIPlugin.getActivePage(); - } - - /** - * Extract or convert to a TeamException - */ - public static TeamException asTeamException(InvocationTargetException e) { - Throwable exception = e.getTargetException(); - if (exception instanceof TeamException) { - return (TeamException)exception; - } else if (exception instanceof CoreException) { - return new TeamException(((CoreException)exception).getStatus()); - } else { - return new TeamException(new Status(IStatus.ERROR, CVSUIPlugin.ID, 0, Policy.bind("internal"), exception)); //$NON-NLS-1$ - } - } - - /** - * Run an operation involving the given resource. If an exception is thrown - * and the code on the status is IResourceStatus.OUT_OF_SYNC_LOCAL then - * the user will be prompted to refresh and try again. If they agree, then the - * supplied operation will be run again. - */ - public static void runWithRefresh(Shell parent, IResource[] resources, - IRunnableWithProgress runnable, IProgressMonitor monitor) - throws InvocationTargetException, InterruptedException { - boolean firstTime = true; - while(true) { - try { - runnable.run(monitor); - return; - } catch (InvocationTargetException e) { - if (! firstTime) throw e; - IStatus status = null; - if (e.getTargetException() instanceof CoreException) { - status = ((CoreException)e.getTargetException()).getStatus(); - } else if (e.getTargetException() instanceof TeamException) { - status = ((TeamException)e.getTargetException()).getStatus(); - } else { - throw e; - } - if (status.getCode() == IResourceStatus.OUT_OF_SYNC_LOCAL) { - if (promptToRefresh(parent, resources, status)) { - try { - for (int i = 0; i < resources.length; i++) { - resources[i].refreshLocal(IResource.DEPTH_INFINITE, null); - } - } catch (CoreException coreEx) { - // Throw the original exception to the caller - log(coreEx); - throw e; - } - firstTime = false; - // Fall through and the operation will be tried again - } else { - // User chose not to continue. Treat it as a cancel. - throw new InterruptedException(); - } - } else { - throw e; - } - } - } - } - - private static boolean promptToRefresh(final Shell shell, final IResource[] resources, final IStatus status) { - final boolean[] result = new boolean[] { false}; - Runnable runnable = new Runnable() { - public void run() { - Shell shellToUse = shell; - if (shell == null) { - shellToUse = new Shell(Display.getCurrent()); - } - String question; - if (resources.length == 1) { - question = Policy.bind("CVSUIPlugin.refreshQuestion", status.getMessage(), resources[0].getFullPath().toString()); //$NON-NLS-1$ - } else { - question = Policy.bind("CVSUIPlugin.refreshMultipleQuestion", status.getMessage()); //$NON-NLS-1$ - } - result[0] = MessageDialog.openQuestion(shellToUse, Policy.bind("CVSUIPlugin.refreshTitle"), question); //$NON-NLS-1$ - } - }; - Display.getDefault().syncExec(runnable); - return result[0]; - } - - /** - * Creates a busy cursor and runs the specified runnable. - * May be called from a non-UI thread. - * - * @param parent the parent Shell for the dialog - * @param cancelable if true, the dialog will support cancelation - * @param runnable the runnable - * - * @exception InvocationTargetException when an exception is thrown from the runnable - * @exception InterruptedException when the progress monitor is cancelled - */ - public static void runWithProgress(Shell parent, boolean cancelable, - final IRunnableWithProgress runnable) throws InvocationTargetException, InterruptedException { - Utils.runWithProgress(parent, cancelable, runnable); - } - - /** - * Creates a busy cursor and runs the specified runnable. - * May be called from a non-UI thread. - * - * @param parent the parent Shell for the dialog - * @param cancelable if true, the dialog will support cancelation - * @param runnable the runnable - * @param flags customizing attributes for the error handling - * - * @exception InvocationTargetException when an exception is thrown from the runnable - * @exception InterruptedException when the progress monitor is cancelled - */ - public static void runWithProgress(final Shell parent, final boolean cancelable, - final IRunnableWithProgress runnable, int flags) throws InvocationTargetException, InterruptedException { - - if ((flags & PERFORM_SYNC_EXEC) > 0) { - - // create a runnable that deals with exceptions - final Exception exception[] = new Exception[] { null }; - Runnable outerRunnable = new Runnable() { - public void run() { - try { - Utils.runWithProgress(parent, cancelable, runnable); - } catch (InvocationTargetException e) { - exception[1] = e; - } catch (InterruptedException e) { - exception[1] = e; - } - } - }; - - // get a Display and perform the syncExec - Display display; - if (parent == null) { - display = Display.getCurrent(); - if (display == null) { - display = Display.getDefault(); - } - } else { - display = parent.getDisplay(); - } - display.syncExec(outerRunnable); - - // handle any exception - if (exception[0] != null) { - Exception e = exception[0]; - if (e instanceof InvocationTargetException) { - throw (InvocationTargetException) e; - } else if (e instanceof InterruptedException) { - throw (InterruptedException) e; - } else { - // impossible but we'll handle it anyway - throw new InvocationTargetException(e); - } - } - } else { - Utils.runWithProgress(parent, cancelable, runnable); - } - } - - /** - * Returns the image descriptor for the given image ID. - * Returns null if there is no such image. - */ - public ImageDescriptor getImageDescriptor(String id) { - return (ImageDescriptor)imageDescriptors.get(id); - } - - /** - * Returns the singleton plug-in instance. - * - * @return the plugin instance - */ - public static CVSUIPlugin getPlugin() { - // If the instance has not been initialized, we will wait. - // This can occur if multiple threads try to load the plugin at the same - // time (see bug 33825: http://bugs.eclipse.org/bugs/show_bug.cgi?id=33825) - while (plugin == null) { - try { - Thread.sleep(50); - } catch (InterruptedException e) { - // ignore and keep trying - } - } - return plugin; - } - - /** - * Returns the repository manager - * - * @return the repository manager - */ - public synchronized RepositoryManager getRepositoryManager() { - if (repositoryManager == null) { - repositoryManager = new RepositoryManager(); - try { - repositoryManager.startup(); - } catch (TeamException e) { - CVSUIPlugin.log(e); - } - } - return repositoryManager; - } - - /** - * Initializes the table of images used in this plugin. - */ - private void initializeImages() { - URL baseURL = getDescriptor().getInstallURL(); - - // objects - createImageDescriptor(ICVSUIConstants.IMG_REPOSITORY, baseURL); - createImageDescriptor(ICVSUIConstants.IMG_REFRESH, baseURL); - createImageDescriptor(ICVSUIConstants.IMG_REFRESH_ENABLED, baseURL); - createImageDescriptor(ICVSUIConstants.IMG_REFRESH_DISABLED, baseURL); - createImageDescriptor(ICVSUIConstants.IMG_COLLAPSE_ALL, baseURL); - createImageDescriptor(ICVSUIConstants.IMG_COLLAPSE_ALL_ENABLED, baseURL); - createImageDescriptor(ICVSUIConstants.IMG_NEWLOCATION, baseURL); - createImageDescriptor(ICVSUIConstants.IMG_TAG, baseURL); - createImageDescriptor(ICVSUIConstants.IMG_MODULE, baseURL); - createImageDescriptor(ICVSUIConstants.IMG_CLEAR, baseURL); - createImageDescriptor(ICVSUIConstants.IMG_CLEAR_ENABLED, baseURL); - createImageDescriptor(ICVSUIConstants.IMG_CLEAR_DISABLED, baseURL); - createImageDescriptor(ICVSUIConstants.IMG_BRANCHES_CATEGORY, baseURL); - createImageDescriptor(ICVSUIConstants.IMG_VERSIONS_CATEGORY, baseURL); - createImageDescriptor(ICVSUIConstants.IMG_PROJECT_VERSION, baseURL); - createImageDescriptor(ICVSUIConstants.IMG_WIZBAN_MERGE, baseURL); - createImageDescriptor(ICVSUIConstants.IMG_WIZBAN_SHARE, baseURL); - createImageDescriptor(ICVSUIConstants.IMG_WIZBAN_DIFF, baseURL); - createImageDescriptor(ICVSUIConstants.IMG_WIZBAN_KEYWORD, baseURL); - createImageDescriptor(ICVSUIConstants.IMG_WIZBAN_NEW_LOCATION, baseURL); - createImageDescriptor(ICVSUIConstants.IMG_MERGEABLE_CONFLICT, baseURL); - createImageDescriptor(ICVSUIConstants.IMG_QUESTIONABLE, baseURL); - createImageDescriptor(ICVSUIConstants.IMG_MERGED, baseURL); - createImageDescriptor(ICVSUIConstants.IMG_EDITED, baseURL); - createImageDescriptor(ICVSUIConstants.IMG_NO_REMOTEDIR, baseURL); - - // special - createImageDescriptor("glyphs/glyph1.gif", baseURL); //$NON-NLS-1$ - createImageDescriptor("glyphs/glyph2.gif", baseURL); //$NON-NLS-1$ - createImageDescriptor("glyphs/glyph3.gif", baseURL); //$NON-NLS-1$ - createImageDescriptor("glyphs/glyph4.gif", baseURL); //$NON-NLS-1$ - createImageDescriptor("glyphs/glyph5.gif", baseURL); //$NON-NLS-1$ - createImageDescriptor("glyphs/glyph6.gif", baseURL); //$NON-NLS-1$ - createImageDescriptor("glyphs/glyph7.gif", baseURL); //$NON-NLS-1$ - createImageDescriptor("glyphs/glyph8.gif", baseURL); //$NON-NLS-1$ - } - /** - * Convenience method for logging statuses to the plugin log - * - * @param status the status to log - */ - public static void log(IStatus status) { - getPlugin().getLog().log(status); - } - - public static void log(CoreException e) { - log(e.getStatus().getSeverity(), Policy.bind("simpleInternal"), e); //$NON-NLS-1$ - } - - /** - * Log the given exception along with the provided message and severity indicator - */ - public static void log(int severity, String message, Throwable e) { - log(new Status(severity, ID, 0, message, e)); - } - - // flags to tailor error reporting - public static final int PERFORM_SYNC_EXEC = 1; - public static final int LOG_TEAM_EXCEPTIONS = 2; - public static final int LOG_CORE_EXCEPTIONS = 4; - public static final int LOG_OTHER_EXCEPTIONS = 8; - public static final int LOG_NONTEAM_EXCEPTIONS = LOG_CORE_EXCEPTIONS | LOG_OTHER_EXCEPTIONS; - - /** - * Convenience method for showing an error dialog - * @param shell a valid shell or null - * @param exception the exception to be report - * @param title the title to be displayed - * @return IStatus the status that was displayed to the user - */ - public static IStatus openError(Shell shell, String title, String message, Throwable exception) { - return openError(shell, title, message, exception, LOG_OTHER_EXCEPTIONS); - } - - /** - * Convenience method for showing an error dialog - * @param shell a valid shell or null - * @param exception the exception to be report - * @param title the title to be displayed - * @param flags customizing attributes for the error handling - * @return IStatus the status that was displayed to the user - */ - public static IStatus openError(Shell providedShell, String title, String message, Throwable exception, int flags) { - // Unwrap InvocationTargetExceptions - if (exception instanceof InvocationTargetException) { - Throwable target = ((InvocationTargetException)exception).getTargetException(); - // re-throw any runtime exceptions or errors so they can be handled by the workbench - if (target instanceof RuntimeException) { - throw (RuntimeException)target; - } - if (target instanceof Error) { - throw (Error)target; - } - return openError(providedShell, title, message, target, flags); - } - - // Determine the status to be displayed (and possibly logged) - IStatus status = null; - boolean log = false; - if (exception instanceof CoreException) { - status = ((CoreException)exception).getStatus(); - log = ((flags & LOG_CORE_EXCEPTIONS) > 0); - } else if (exception instanceof TeamException) { - status = ((TeamException)exception).getStatus(); - log = ((flags & LOG_TEAM_EXCEPTIONS) > 0); - } else if (exception instanceof InterruptedException) { - return new CVSStatus(IStatus.OK, Policy.bind("ok")); //$NON-NLS-1$ - } else if (exception != null) { - status = new CVSStatus(IStatus.ERROR, Policy.bind("internal"), exception); //$NON-NLS-1$ - log = ((flags & LOG_OTHER_EXCEPTIONS) > 0); - if (title == null) title = Policy.bind("SimpleInternal"); //$NON-NLS-1$ - } - - // Check for a build error and report it differently - if (status.getCode() == IResourceStatus.BUILD_FAILED) { - message = Policy.bind("buildError"); //$NON-NLS-1$ - log = true; - } - - // Check for multi-status with only one child - if (status.isMultiStatus() && status.getChildren().length == 1) { - status = status.getChildren()[0]; - } - if (status.isOK()) return status; - - // Log if the user requested it - if (log) CVSUIPlugin.log(status.getSeverity(), status.getMessage(), exception); - - // Create a runnable that will display the error status - final String displayTitle = title; - final String displayMessage = message; - final IStatus displayStatus = status; - final IOpenableInShell openable = new IOpenableInShell() { - public void open(Shell shell) { - if (displayStatus.getSeverity() == IStatus.INFO && !displayStatus.isMultiStatus()) { - MessageDialog.openInformation(shell, Policy.bind("information"), displayStatus.getMessage()); //$NON-NLS-1$ - } else { - ErrorDialog.openError(shell, displayTitle, displayMessage, displayStatus); - } - } - }; - openDialog(providedShell, openable, flags); - - // return the status we display - return status; - } - - /** - * Interface that allows a shell to be passed to an open method. The - * provided shell can be used without sync-execing, etc. - */ - public interface IOpenableInShell { - public void open(Shell shell); - } - - /** - * Open the dialog code provided in the IOpenableInShell, ensuring that - * the provided whll is valid. This method will provide a shell to the - * IOpenableInShell if one is not provided to the method. - * - * @param providedShell - * @param openable - * @param flags - */ - public static void openDialog(Shell providedShell, final IOpenableInShell openable, int flags) { - // If no shell was provided, try to get one from the active window - if (providedShell == null) { - IWorkbenchWindow window = CVSUIPlugin.getPlugin().getWorkbench().getActiveWorkbenchWindow(); - if (window != null) { - providedShell = window.getShell(); - // sync-exec when we do this just in case - flags = flags | PERFORM_SYNC_EXEC; - } - } - - // Create a runnable that will display the error status - final Shell shell = providedShell; - Runnable outerRunnable = new Runnable() { - public void run() { - Shell displayShell; - if (shell == null) { - Display display = Display.getCurrent(); - displayShell = new Shell(display); - } else { - displayShell = shell; - } - openable.open(displayShell); - if (shell == null) { - displayShell.dispose(); - } - } - }; - - // Execute the above runnable as determined by the parameters - if (shell == null || (flags & PERFORM_SYNC_EXEC) > 0) { - Display display; - if (shell == null) { - display = Display.getCurrent(); - if (display == null) { - display = Display.getDefault(); - } - } else { - display = shell.getDisplay(); - } - display.syncExec(outerRunnable); - } else { - outerRunnable.run(); - } - } - - - /** - * Initializes the preferences for this plugin if necessary. - */ - protected void initializePreferences() { - IPreferenceStore store = getPreferenceStore(); - // Get the plugin preferences for CVS Core - Preferences corePrefs = CVSProviderPlugin.getPlugin().getPluginPreferences(); - - // work in progress START - store.setDefault(ICVSUIConstants.BACKGROUND_REPOVIEW, false); - store.setDefault(ICVSUIConstants.BACKGROUND_OPERATIONS, false); - // work in progress END - - store.setDefault(ICVSUIConstants.PREF_REPOSITORIES_ARE_BINARY, false); - store.setDefault(ICVSUIConstants.PREF_SHOW_COMMENTS, true); - store.setDefault(ICVSUIConstants.PREF_SHOW_TAGS, true); - store.setDefault(ICVSUIConstants.PREF_PRUNE_EMPTY_DIRECTORIES, CVSProviderPlugin.DEFAULT_PRUNE); - store.setDefault(ICVSUIConstants.PREF_TIMEOUT, CVSProviderPlugin.DEFAULT_TIMEOUT); - store.setDefault(ICVSUIConstants.PREF_CONSIDER_CONTENTS, false); - store.setDefault(ICVSUIConstants.PREF_COMPRESSION_LEVEL, CVSProviderPlugin.DEFAULT_COMPRESSION_LEVEL); - store.setDefault(ICVSUIConstants.PREF_TEXT_KSUBST, CVSProviderPlugin.DEFAULT_TEXT_KSUBST_OPTION.toMode()); - store.setDefault(ICVSUIConstants.PREF_REPLACE_UNMANAGED, true); - store.setDefault(ICVSUIConstants.PREF_CVS_RSH, CVSProviderPlugin.DEFAULT_CVS_RSH); - store.setDefault(ICVSUIConstants.PREF_CVS_RSH_PARAMETERS, CVSProviderPlugin.DEFAULT_CVS_RSH_PARAMETERS); - store.setDefault(ICVSUIConstants.PREF_CVS_SERVER, CVSProviderPlugin.DEFAULT_CVS_SERVER); - store.setDefault(ICVSUIConstants.PREF_PROMPT_ON_CHANGE_GRANULARITY, true); - store.setDefault(ICVSUIConstants.PREF_DETERMINE_SERVER_VERSION, true); - store.setDefault(ICVSUIConstants.PREF_CONFIRM_MOVE_TAG, CVSProviderPlugin.DEFAULT_CONFIRM_MOVE_TAG); - - PreferenceConverter.setDefault(store, ICVSUIConstants.PREF_CONSOLE_COMMAND_COLOR, new RGB(0, 0, 0)); - PreferenceConverter.setDefault(store, ICVSUIConstants.PREF_CONSOLE_MESSAGE_COLOR, new RGB(0, 0, 255)); - PreferenceConverter.setDefault(store, ICVSUIConstants.PREF_CONSOLE_ERROR_COLOR, new RGB(255, 0, 0)); - - store.setDefault(ICVSUIConstants.PREF_FILETEXT_DECORATION, CVSDecoratorConfiguration.DEFAULT_FILETEXTFORMAT); - store.setDefault(ICVSUIConstants.PREF_FOLDERTEXT_DECORATION, CVSDecoratorConfiguration.DEFAULT_FOLDERTEXTFORMAT); - store.setDefault(ICVSUIConstants.PREF_PROJECTTEXT_DECORATION, CVSDecoratorConfiguration.DEFAULT_PROJECTTEXTFORMAT); - - store.setDefault(ICVSUIConstants.PREF_ADDED_FLAG, CVSDecoratorConfiguration.DEFAULT_ADDED_FLAG); - store.setDefault(ICVSUIConstants.PREF_DIRTY_FLAG, CVSDecoratorConfiguration.DEFAULT_DIRTY_FLAG); - store.setDefault(ICVSUIConstants.PREF_SHOW_ADDED_DECORATION, true); - store.setDefault(ICVSUIConstants.PREF_SHOW_HASREMOTE_DECORATION, true); - store.setDefault(ICVSUIConstants.PREF_SHOW_DIRTY_DECORATION, false); - store.setDefault(ICVSUIConstants.PREF_SHOW_NEWRESOURCE_DECORATION, true); - store.setDefault(ICVSUIConstants.PREF_CALCULATE_DIRTY, true); - store.setDefault(ICVSUIConstants.PREF_SHOW_SYNCINFO_AS_TEXT, false); - store.setDefault(ICVSUIConstants.PREF_PROMPT_ON_MIXED_TAGS, true); - store.setDefault(ICVSUIConstants.PREF_PROMPT_ON_SAVING_IN_SYNC, true); - store.setDefault(ICVSUIConstants.PREF_SAVE_DIRTY_EDITORS, ICVSUIConstants.OPTION_PROMPT); - - // Set the watch/edit preferences defaults and values - store.setDefault(ICVSUIConstants.PREF_CHECKOUT_READ_ONLY, corePrefs.getDefaultBoolean(CVSProviderPlugin.READ_ONLY)); - store.setDefault(ICVSUIConstants.PREF_EDIT_ACTION, EDIT); - // Ensure that the preference values in UI match Core - store.setValue(ICVSUIConstants.PREF_CHECKOUT_READ_ONLY, corePrefs.getBoolean(CVSProviderPlugin.READ_ONLY)); - - // Forward the values to the CVS plugin - CVSProviderPlugin.getPlugin().setPruneEmptyDirectories(store.getBoolean(ICVSUIConstants.PREF_PRUNE_EMPTY_DIRECTORIES)); - CVSProviderPlugin.getPlugin().setTimeout(store.getInt(ICVSUIConstants.PREF_TIMEOUT)); - CVSProviderPlugin.getPlugin().setCvsRshCommand(store.getString(ICVSUIConstants.PREF_CVS_RSH)); - CVSProviderPlugin.getPlugin().setCvsRshParameters(store.getString(ICVSUIConstants.PREF_CVS_RSH_PARAMETERS)); - CVSProviderPlugin.getPlugin().setCvsServer(store.getString(ICVSUIConstants.PREF_CVS_SERVER)); - CVSProviderPlugin.getPlugin().setQuietness(CVSPreferencesPage.getQuietnessOptionFor(store.getInt(ICVSUIConstants.PREF_QUIETNESS))); - CVSProviderPlugin.getPlugin().setCompressionLevel(store.getInt(ICVSUIConstants.PREF_COMPRESSION_LEVEL)); - CVSProviderPlugin.getPlugin().setReplaceUnmanaged(store.getBoolean(ICVSUIConstants.PREF_REPLACE_UNMANAGED)); - CVSProviderPlugin.getPlugin().setDefaultTextKSubstOption(KSubstOption.fromMode(store.getString(ICVSUIConstants.PREF_TEXT_KSUBST))); - CVSProviderPlugin.getPlugin().setRepositoriesAreBinary(store.getBoolean(ICVSUIConstants.PREF_REPOSITORIES_ARE_BINARY)); - CVSProviderPlugin.getPlugin().setDetermineVersionEnabled(store.getBoolean(ICVSUIConstants.PREF_DETERMINE_SERVER_VERSION)); - CVSProviderPlugin.getPlugin().setConfirmMoveTagEnabled(store.getBoolean(ICVSUIConstants.PREF_CONFIRM_MOVE_TAG)); - } - - /** - * @see Plugin#startup() - */ - public void startup() throws CoreException { - super.startup(); - Policy.localize("org.eclipse.team.internal.ccvs.ui.messages"); //$NON-NLS-1$ - - CVSAdapterFactory factory = new CVSAdapterFactory(); - Platform.getAdapterManager().registerAdapters(factory, ICVSRemoteFile.class); - Platform.getAdapterManager().registerAdapters(factory, ICVSRemoteFolder.class); - Platform.getAdapterManager().registerAdapters(factory, ICVSRepositoryLocation.class); - Platform.getAdapterManager().registerAdapters(factory, RepositoryRoot.class); - - initializeImages(); - initializePreferences(); - - // if the global ignores list is changed then update decorators. - TeamUI.addPropertyChangeListener(listener); - - Console.startup(); - } - - /** - * @see Plugin#shutdown() - */ - public void shutdown() throws CoreException { - super.shutdown(); - TeamUI.removePropertyChangeListener(listener); - try { - if (repositoryManager != null) - repositoryManager.shutdown(); - } catch (TeamException e) { - throw new CoreException(e.getStatus()); - } - - Console.shutdown(); - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommitCommentArea.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommitCommentArea.java deleted file mode 100644 index 4b52fca16..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommitCommentArea.java +++ /dev/null @@ -1,267 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import org.eclipse.core.resources.IProject; -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.dialogs.IDialogSettings; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.TraverseEvent; -import org.eclipse.swt.events.TraverseListener; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Combo; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Text; -import org.eclipse.team.core.RepositoryProvider; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; -import org.eclipse.team.internal.ccvs.core.CVSTeamProvider; -import org.eclipse.team.internal.ui.dialogs.DialogArea; - -/** - * This area provides the widgets for providing the CVS commit comment - */ -public class CommitCommentArea extends DialogArea { - - private static final int WIDTH_HINT = 350; - private static final int HEIGHT_HINT = 150; - - private Text text; - private Combo previousCommentsCombo; - private IProject mainProject; - private String[] comments = new String[0]; - private String comment = ""; //$NON-NLS-1$ - - public static final String OK_REQUESTED = "OkRequested";//$NON-NLS-1$ - - /** - * Constructor for CommitCommentArea. - * @param parentDialog - * @param settings - */ - public CommitCommentArea(Dialog parentDialog, IDialogSettings settings) { - super(parentDialog, settings); - comments = CVSUIPlugin.getPlugin().getRepositoryManager().getPreviousComments(); - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.DialogArea#createArea(org.eclipse.swt.widgets.Composite) - */ - public Control createArea(Composite parent) { - Composite composite = createGrabbingComposite(parent, 1); - initializeDialogUnits(composite); - - Label label = new Label(composite, SWT.NULL); - label.setLayoutData(new GridData()); - label.setText(Policy.bind("ReleaseCommentDialog.enterComment")); //$NON-NLS-1$ - - text = new Text(composite, SWT.BORDER | SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL); - GridData data = new GridData(GridData.FILL_BOTH); - data.widthHint = WIDTH_HINT; - data.heightHint = HEIGHT_HINT; - - text.setLayoutData(data); - text.selectAll(); - text.addTraverseListener(new TraverseListener() { - public void keyTraversed(TraverseEvent e) { - if (e.detail == SWT.TRAVERSE_RETURN && (e.stateMask & SWT.CTRL) != 0) { - e.doit = false; - CommitCommentArea.this.signalCtrlEnter(); - } - } - }); - text.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - comment = text.getText(); - } - }); - - - label = new Label(composite, SWT.NULL); - label.setLayoutData(new GridData()); - label.setText(Policy.bind("ReleaseCommentDialog.choosePrevious")); //$NON-NLS-1$ - - previousCommentsCombo = new Combo(composite, SWT.READ_ONLY); - data = new GridData(GridData.FILL_HORIZONTAL); - data.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH; - previousCommentsCombo.setLayoutData(data); - - // Initialize the values before we register any listeners so - // we don't get any platform specific selection behavior - // (see bug 32078: http://bugs.eclipse.org/bugs/show_bug.cgi?id=32078) - initializeValues(); - - previousCommentsCombo.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - int index = previousCommentsCombo.getSelectionIndex(); - if (index != -1) - text.setText(comments[index]); - } - }); - - return composite; - } - - /** - * Method initializeValues. - */ - private void initializeValues() { - - // populate the previous comment list - for (int i = 0; i < comments.length; i++) { - previousCommentsCombo.add(flattenText(comments[i])); - } - - // We don't want to have an initial selection - // (see bug 32078: http://bugs.eclipse.org/bugs/show_bug.cgi?id=32078) - previousCommentsCombo.setText(""); //$NON-NLS-1$ - - // determine the initial comment text - String initialComment; - try { - initialComment = getCommitTemplate(); - } catch (CVSException e) { - CVSUIPlugin.log(e); - initialComment = null; - } - if (initialComment != null && initialComment.length() != 0) { - text.setText(initialComment); - } - } - - /* - * Flatten the text in the multiline comment - * @param string - * @return String - */ - private String flattenText(String string) { - StringBuffer buffer = new StringBuffer(string.length() + 20); - boolean skipAdjacentLineSeparator = true; - for (int i = 0; i < string.length(); i++) { - char c = string.charAt(i); - if (c == '\r' || c == '\n') { - if (!skipAdjacentLineSeparator) - buffer.append(Policy.bind("separator")); //$NON-NLS-1$ - skipAdjacentLineSeparator = true; - } else { - buffer.append(c); - skipAdjacentLineSeparator = false; - } - } - return buffer.toString(); - } - - /** - * Method signalCtrlEnter. - */ - private void signalCtrlEnter() { - firePropertyChangeChange(OK_REQUESTED, null, null); - } - - /** - * Method clearCommitText. - */ - private void clearCommitText() { - try { - text.setText(getCommitTemplate()); - previousCommentsCombo.deselectAll(); - } catch (CVSException e) { - CVSUIPlugin.openError(getShell(), null, null, e, CVSUIPlugin.PERFORM_SYNC_EXEC); - } - } - - private String getCommitTemplate() throws CVSException { - CVSTeamProvider provider = getProvider(); - if (provider == null) return ""; //$NON-NLS-1$ - String template = provider.getCommitTemplate(); - if (template == null) template = ""; //$NON-NLS-1$ - return template; - } - - /** - * Method getProvider. - */ - private CVSTeamProvider getProvider() throws CVSException { - if (mainProject == null) return null; - return (CVSTeamProvider) RepositoryProvider.getProvider(mainProject, CVSProviderPlugin.getTypeId()); - } - - /** - * Method getSelectedComment. - * @return String - */ - private String getSelectedComment() { - if (comments.length == 0) { - // There are no previous comments so use the template - try { - return getCommitTemplate(); - } catch (CVSException e) { - // log the exception for now. - // The user can surface the problem by trying to reset the comment - CVSUIPlugin.log(e); - } - } else { - int index = previousCommentsCombo.getSelectionIndex(); - if (index != -1) - return comments[index]; - } - return ""; //$NON-NLS-1$ - } - - /** - * Return the entered comment - * - * @return the comment - */ - public String[] getComments() { - return comments; - } - - /** - * Returns the comment. - * @return String - */ - public String getComment() { - if (comment != null && comment.length() > 0) finished(); - return comment; - } - - /** - * Method setProject. - * @param iProject - */ - public void setProject(IProject iProject) { - this.mainProject = iProject; - } - - private void finished() { - // if the comment is the same as the template, ignore it - try { - if (comment.equals(getCommitTemplate())) { - comment = ""; //$NON-NLS-1$ - } - } catch (CVSException e) { - // we couldn't get the commit template. Log the error and continue - CVSUIPlugin.log(e); - } - // if there is still a comment, remember it - if (comment.length() > 0) { - CVSUIPlugin.getPlugin().getRepositoryManager().addComment(comment); - } - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/Console.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/Console.java deleted file mode 100644 index 2a56be838..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/Console.java +++ /dev/null @@ -1,514 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Vector; - -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.jface.action.Action; -import org.eclipse.jface.action.IMenuListener; -import org.eclipse.jface.action.IMenuManager; -import org.eclipse.jface.action.IToolBarManager; -import org.eclipse.jface.action.MenuManager; -import org.eclipse.jface.action.Separator; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.preference.PreferenceConverter; -import org.eclipse.jface.resource.JFaceResources; -import org.eclipse.jface.text.DocumentEvent; -import org.eclipse.jface.text.IDocumentListener; -import org.eclipse.jface.text.ITextOperationTarget; -import org.eclipse.jface.text.TextViewer; -import org.eclipse.jface.util.IPropertyChangeListener; -import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.swt.SWT; -import org.eclipse.swt.custom.LineStyleEvent; -import org.eclipse.swt.custom.LineStyleListener; -import org.eclipse.swt.custom.StyleRange; -import org.eclipse.swt.custom.StyledText; -import org.eclipse.swt.graphics.Color; -import org.eclipse.swt.graphics.RGB; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Menu; -import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; -import org.eclipse.team.internal.ccvs.core.CVSStatus; -import org.eclipse.team.internal.ccvs.core.client.listeners.IConsoleListener; -import org.eclipse.ui.IActionBars; -import org.eclipse.ui.IViewPart; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.IWorkbenchPart; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.help.WorkbenchHelp; -import org.eclipse.ui.part.ViewPart; -import org.eclipse.ui.texteditor.ITextEditorActionConstants; - -/** - * Console is a view that displays the communication with the CVS server - */ -public class Console extends ViewPart { - public static final String CONSOLE_ID = "org.eclipse.team.ccvs.ui.console"; //$NON-NLS-1$ - private static final DateFormat TIME_FORMAT = new SimpleDateFormat(Policy.bind("Console.resultTimeFormat")); //$NON-NLS-1$ - private static ConsoleDocument document; - private static List /* of Console */ instances; - - private TextViewer viewer; - private Color commandColor; - private Color messageColor; - private Color errorColor; - - private IDocumentListener documentListener; - private IPropertyChangeListener propertyChangeListener; - private TextViewerAction copyAction; - private TextViewerAction selectAllAction; - private Action clearOutputAction; - - //For buffering console content prior to flushing to view - private static class PendingConsoleLine { - public int type; - public String line; - public PendingConsoleLine(int type, String line) { - this.type = type; - this.line = line; - } - } - - private static final int MAX_BUFFER_SIZE = 200; //maximum size of buffer if console not open - private static Vector pendingConsoleData = new Vector(200 * 2); //allows room for adding to end/removing from front - private static Runnable aSyncRunnable; - - /* - * Called on UI plugin startup. - */ - public static void startup() { - instances = new ArrayList(); - CVSProviderPlugin.getPlugin().setConsoleListener(new ConsoleListener()); - } - - /* - * Called on UI plugin shutdown. - */ - public static void shutdown() { - document = null; - instances = null; - CVSProviderPlugin.getPlugin().setConsoleListener(null); - } - - public Console() { - } - - /* - * @see WorkbenchPart#dispose - */ - public void dispose() { - // remove listeners - if (documentListener != null) { - document.removeDocumentListener(documentListener); - documentListener = null; - } - if (propertyChangeListener != null) { - getPreferenceStore().removePropertyChangeListener(propertyChangeListener); - propertyChangeListener = null; - } - instances.remove(this); - //if (instances.isEmpty()) document.clear(); - - // dispose of allocated colors and fonts - super.dispose(); - if (commandColor != null) { - commandColor.dispose(); - commandColor = null; - } - if (messageColor != null) { - messageColor.dispose(); - messageColor = null; - } - if (errorColor != null) { - errorColor.dispose(); - errorColor = null; - } - } - - /* - * @see WorkbenchPart#setFocus() - */ - public void setFocus() { - viewer.getTextWidget().setFocus(); - } - - /* - * @see WorkbenchPart#createPartControl(Composite) - */ - public void createPartControl(Composite parent) { - if(document == null) { - document = new ConsoleDocument(); - } - - Composite composite = new Composite(parent, SWT.NULL); - GridLayout layout = new GridLayout(); - layout.marginHeight = 0; - layout.marginWidth = 0; - composite.setLayout(layout); - composite.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL)); - - updatePreferences(null); - - // F1 Help - WorkbenchHelp.setHelp(composite, IHelpContextIds.CONSOLE_VIEW); - - // create the viewer - viewer = new TextViewer(composite, SWT.V_SCROLL | SWT.H_SCROLL); - GridData data = new GridData(GridData.FILL_BOTH); - viewer.getControl().setLayoutData(data); - viewer.setEditable(false); - viewer.setDocument(document); - viewer.getTextWidget().setFont(JFaceResources.getFont(ICVSUIConstants.PREF_CONSOLE_FONT)); - - // add a selection listener to control enablement of the copy action - viewer.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - copyAction.update(); - } - }); - - // add a line styler for colouring lines according to their type - viewer.getTextWidget().addLineStyleListener(new LineStyleListener() { - public void lineGetStyle(LineStyleEvent event) { - StyleRange style = new StyleRange(event.lineOffset, event.lineText.length(), - getConsoleLineColor(event.lineOffset), null); - event.styles = new StyleRange[] { style }; - } - }); - - // create the viewer actions - createActions(); - - // add a property change listener to update when preferences change - propertyChangeListener = new IPropertyChangeListener() { - public void propertyChange(PropertyChangeEvent event) { - updatePreferences(event.getProperty()); - } - }; - getPreferenceStore().addPropertyChangeListener(propertyChangeListener); - JFaceResources.getFontRegistry().addListener(propertyChangeListener); - - // add a document listener for auto-scrolling - documentListener = new IDocumentListener() { - public void documentAboutToBeChanged(DocumentEvent event) { - } - public void documentChanged(DocumentEvent event) { - if (viewer == null) return; - // always focus on the last line without changing the horizontal scrolling index - // we can get away with doing it this way because the viewer is read only - StyledText styledText = viewer.getTextWidget(); - if (styledText.isDisposed()) return; - styledText.setTopIndex(styledText.getLineCount()); - } - }; - document.addDocumentListener(documentListener); - - // we're open -- remember us - instances.add(this); - flushConsoleBuffer(); //in case there's anything in the buffer - } - - /** - * Create contributed actions - */ - private void createActions() { - CVSUIPlugin plugin = CVSUIPlugin.getPlugin(); - clearOutputAction = new Action(Policy.bind("Console.clearOutput"), plugin.getImageDescriptor(ICVSUIConstants.IMG_CLEAR_ENABLED)) { //$NON-NLS-1$ - public void run() { - document.clear(); - } - }; - clearOutputAction.setToolTipText(Policy.bind("Console.clearOutput")); //$NON-NLS-1$ - clearOutputAction.setDisabledImageDescriptor(plugin.getImageDescriptor(ICVSUIConstants.IMG_CLEAR_DISABLED)); - clearOutputAction.setHoverImageDescriptor(plugin.getImageDescriptor(ICVSUIConstants.IMG_CLEAR)); - - MenuManager mgr = new MenuManager(); - mgr.setRemoveAllWhenShown(true); - mgr.addMenuListener(new IMenuListener() { - public void menuAboutToShow(IMenuManager mgr) { - fillContextMenu(mgr); - } - }); - Menu menu = mgr.createContextMenu(viewer.getControl()); - viewer.getControl().setMenu(menu); - - // Create the local tool bar - IToolBarManager tbm = getViewSite().getActionBars().getToolBarManager(); - tbm.add(clearOutputAction); - tbm.update(false); - - - // Create actions for the text editor - IActionBars actionBars = getViewSite().getActionBars(); - - copyAction = new TextViewerAction(viewer, ITextOperationTarget.COPY); - copyAction.setText(Policy.bind("Console.copy")); //$NON-NLS-1$ - actionBars.setGlobalActionHandler(ITextEditorActionConstants.COPY, copyAction); - - selectAllAction = new TextViewerAction(viewer, ITextOperationTarget.SELECT_ALL); - selectAllAction.setText(Policy.bind("Console.selectAll")); //$NON-NLS-1$ - actionBars.setGlobalActionHandler(ITextEditorActionConstants.SELECT_ALL, selectAllAction); - - actionBars.updateActionBars(); - } - - /** - * Add the actions to the context menu - * - * @param manager the manager of the context menu - */ - private void fillContextMenu(IMenuManager manager) { - manager.add(copyAction); - manager.add(selectAllAction); - manager.add(new Separator()); - manager.add(clearOutputAction); - } - - /** - * Returns the color for the line containing the specified offset. - */ - private Color getConsoleLineColor(int offset) { - switch (document.getLineType(offset)) { - case ConsoleDocument.COMMAND: - case ConsoleDocument.STATUS: - case ConsoleDocument.DELIMITER: - return commandColor; - case ConsoleDocument.MESSAGE: - return messageColor; - case ConsoleDocument.ERROR: - return errorColor; - default: - throw new IllegalStateException(); - } - } - - /** - * Updates the console's font and colors. - */ - private void updatePreferences(String property) { - Display display = getViewSite().getShell().getDisplay(); - // update the console colors - if (property == null || - property.equals(ICVSUIConstants.PREF_CONSOLE_COMMAND_COLOR) || - property.equals(ICVSUIConstants.PREF_CONSOLE_MESSAGE_COLOR) || - property.equals(ICVSUIConstants.PREF_CONSOLE_ERROR_COLOR)) { - Color oldCommandColor = commandColor; - Color oldMessageColor = messageColor; - Color oldErrorColor = errorColor; - commandColor = createColor(display, ICVSUIConstants.PREF_CONSOLE_COMMAND_COLOR); - messageColor = createColor(display, ICVSUIConstants.PREF_CONSOLE_MESSAGE_COLOR); - errorColor = createColor(display, ICVSUIConstants.PREF_CONSOLE_ERROR_COLOR); - if (oldCommandColor != null) { - if (viewer != null && ! viewer.getControl().isDisposed()) { - viewer.refresh(); - } - oldCommandColor.dispose(); - oldMessageColor.dispose(); - oldErrorColor.dispose(); - } - } - // update the console font - if (property == null || - property.equals(ICVSUIConstants.PREF_CONSOLE_FONT)) { - if (viewer != null && ! viewer.getControl().isDisposed()) { - viewer.getTextWidget().setFont(JFaceResources.getFont(ICVSUIConstants.PREF_CONSOLE_FONT)); - } - } - } - - /** - * Returns a color instance based on data from a preference field. - */ - private Color createColor(Display display, String preference) { - RGB rgb = PreferenceConverter.getColor(getPreferenceStore(), preference); - return new Color(display, rgb); - } - - /** - * Appends a line to the console if any views are open. - */ - private static void appendConsoleLine(final int type, final String line) { - if (Policy.DEBUG_CONSOLE_BUFFERING) { - System.out.println("<<Console buffering [" + String.valueOf(type) + "] :" + line); //$NON-NLS-1$ //$NON-NLS-2$ - } - - //add to end of buffer - pendingConsoleData.add( - new PendingConsoleLine(type, line)); - - //If no document, ensure buffer size doesn't grow too long, don't flush - if (document == null) { - if(pendingConsoleData.size() > MAX_BUFFER_SIZE) { - //remove extra from front of buffer - pendingConsoleData.remove(0); - } - return; - } - - //Do nothing if there is already an aSyncRunnable emptying the buffer - if(aSyncRunnable != null) return; - - flushConsoleBuffer(); - } - - /* - * Flush the buffered console data to the console. - * Safe to call even if console isn't open (does nothing). - */ - private static void flushConsoleBuffer() { - if(document == null) return; - - Display display = Display.getCurrent(); - if (display == null) { - display = Display.getDefault(); - } - - if (Policy.DEBUG_CONSOLE_BUFFERING) { - System.out.println("++Console creating runnable"); //$NON-NLS-1$ - } - - display.asyncExec(aSyncRunnable = new Runnable() { - public void run() { - if (Policy.DEBUG_CONSOLE_BUFFERING) { - System.out.println("==Console running runnable"); //$NON-NLS-1$ - } - //flush all buffered console data to the console - while (! pendingConsoleData.isEmpty()) { - PendingConsoleLine consoleLine = (PendingConsoleLine) pendingConsoleData.remove(0); - if (Policy.DEBUG_CONSOLE_BUFFERING) { - System.out.println(">>Console flushing [" + String.valueOf(consoleLine.type) + "] :" + consoleLine.line); //$NON-NLS-1$ //$NON-NLS-2$ - } - document.appendConsoleLine(consoleLine.type, consoleLine.line); - } - if (Policy.DEBUG_CONSOLE_BUFFERING) { - System.out.println("--Console discarding runnable"); //$NON-NLS-1$ - } - aSyncRunnable = null; //flush the instance so that a new one will be created when required - } - }); - } - - /** - * Makes the CVS Console view visible in the active perspective. If there - * isn't a CVS Console view registered <code>null</code> is returned. - * Otherwise the opened view part is returned. - * - * Must be called from the UI thread. - */ - private static Console findInActivePerspective() { - try { - IWorkbenchPage page = CVSUIPlugin.getActivePage(); - IViewPart consolePart = page.findView(CONSOLE_ID); - if (consolePart == null) { - IWorkbenchPart activePart = page.getActivePart(); - consolePart = page.showView(CONSOLE_ID); - //restore focus stolen by the creation of the console - if (activePart != null) page.activate(activePart); - } else { - page.bringToTop(consolePart); - } - return (Console) consolePart; - } catch (PartInitException pe) { - return null; - } - } - - /** - * Returns the console preference store. - */ - private static IPreferenceStore getPreferenceStore() { - return CVSUIPlugin.getPlugin().getPreferenceStore(); - } - - private static class ConsoleListener implements IConsoleListener { - private long commandStarted = 0; - - public void commandInvoked(String line) { - commandStarted = System.currentTimeMillis(); - appendConsoleLine(ConsoleDocument.DELIMITER, Policy.bind("Console.preExecutionDelimiter")); //$NON-NLS-1$ - appendConsoleLine(ConsoleDocument.COMMAND, line); - } - public void messageLineReceived(String line) { - appendConsoleLine(ConsoleDocument.MESSAGE, " " + line); //$NON-NLS-1$ - } - public void errorLineReceived(String line) { - appendConsoleLine(ConsoleDocument.ERROR, " " + line); //$NON-NLS-1$ - } - public void commandCompleted(IStatus status, Exception exception) { - long commandRuntime = System.currentTimeMillis() - commandStarted; - String time; - try { - time = TIME_FORMAT.format(new Date(commandRuntime)); - } catch (RuntimeException e) { - CVSUIPlugin.log(IStatus.ERROR, Policy.bind("Console.couldNotFormatTime"), e); //$NON-NLS-1$ - time = ""; //$NON-NLS-1$ - } - String statusText; - if (status != null) { - if (status.getCode() == CVSStatus.SERVER_ERROR) { - statusText = Policy.bind("Console.resultServerError", status.getMessage(), time); //$NON-NLS-1$ - } else { - statusText = Policy.bind("Console.resultOk", time); //$NON-NLS-1$ - } - appendConsoleLine(ConsoleDocument.STATUS, statusText); - IStatus[] children = status.getChildren(); - if (children.length == 0) { - if (!status.isOK()) - appendConsoleLine(ConsoleDocument.STATUS, messageLineForStatus(status)); - } else { - for (int i = 0; i < children.length; i++) { - if (!children[i].isOK()) - appendConsoleLine(ConsoleDocument.STATUS, messageLineForStatus(children[i])); - } - } - } else if (exception != null) { - if (exception instanceof OperationCanceledException) { - statusText = Policy.bind("Console.resultAborted", time); //$NON-NLS-1$ - } else { - statusText = Policy.bind("Console.resultException", time); //$NON-NLS-1$ - } - appendConsoleLine(ConsoleDocument.STATUS, statusText); - } else { - statusText = Policy.bind("Console.resultOk", time); //$NON-NLS-1$ - } - appendConsoleLine(ConsoleDocument.DELIMITER, Policy.bind("Console.postExecutionDelimiter")); //$NON-NLS-1$ - appendConsoleLine(ConsoleDocument.DELIMITER, ""); //$NON-NLS-1$ - flushConsoleBuffer(); - } - /** - * Method messageLineForStatus. - * @param status - */ - private String messageLineForStatus(IStatus status) { - if (status.getSeverity() == IStatus.ERROR) { - return Policy.bind("Console.error", status.getMessage()); //$NON-NLS-1$ - } else if (status.getSeverity() == IStatus.WARNING) { - return Policy.bind("Console.warning", status.getMessage()); //$NON-NLS-1$ - } else if (status.getSeverity() == IStatus.INFO) { - return Policy.bind("Console.info", status.getMessage()); //$NON-NLS-1$ - } - return status.getMessage(); - } - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ConsoleDocument.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ConsoleDocument.java deleted file mode 100644 index 79891dfe4..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ConsoleDocument.java +++ /dev/null @@ -1,101 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import org.eclipse.jface.text.AbstractDocument; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.DefaultLineTracker; -import org.eclipse.jface.text.GapTextStore; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; - -public class ConsoleDocument extends AbstractDocument { - public static final int COMMAND = 0; // command text - public static final int MESSAGE = 1; // message received - public static final int ERROR = 2; // error received - public static final int STATUS = 3; // status text - public static final int DELIMITER = 4; // delimiter text between runs - - private int[] lineTypes = null; - private int currentLine = 0; - - /** - * Creates an empty console document. - */ - public ConsoleDocument() { - setTextStore(new GapTextStore(512, 1024)); - setLineTracker(new DefaultLineTracker()); - completeInitialization(); - } - - /** - * Clears the console document. - */ - public void clear() { - lineTypes = null; - currentLine = 0; - set(""); //$NON-NLS-1$ - } - - /** - * Gets the line type for the line containing the specified offset. - */ - public int getLineType(int offset) { - try { - int line = getLineOfOffset(offset); - if (line < currentLine) return lineTypes[line]; - } catch (BadLocationException e) { - CVSProviderPlugin.log(CVSException.wrapException(e)); - } - return 0; - } - - /** - * Appends a line of the specified type to the end of the console. - */ - public void appendConsoleLine(int type, String line) { - if (lineTypes == null) { - lineTypes = new int[16]; - } else if (currentLine >= lineTypes.length) { - int[] oldLineTypes = lineTypes; - lineTypes = new int[oldLineTypes.length * 2]; - System.arraycopy(oldLineTypes, 0, lineTypes, 0, oldLineTypes.length); - } - lineTypes[currentLine++] = type; - try { - replace(getLength(), 0, line + "\n"); //$NON-NLS-1$ - } catch (BadLocationException e) { - CVSProviderPlugin.log(CVSException.wrapException(e)); - } - } - - /** - * Return the indicies of the lines that contain command strings - */ - private int[] getCommandLines() { - List commandLineList = new ArrayList(); - for (int i = 0; i < currentLine; i++) { - if (lineTypes[i] == COMMAND) { - commandLineList.add(new Integer(i)); - } - } - int[] commandLines = new int[commandLineList.size()]; - int i = 0; - for (Iterator iter = commandLineList.iterator(); iter.hasNext(); ) { - commandLines[i++] = ((Integer) iter.next()).intValue(); - } - return commandLines; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ConsolePreferencesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ConsolePreferencesPage.java deleted file mode 100644 index 87ffcbe9f..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ConsolePreferencesPage.java +++ /dev/null @@ -1,156 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.preference.ColorFieldEditor; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.preference.PreferencePage; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Label; -import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.IWorkbenchPreferencePage; -import org.eclipse.ui.help.WorkbenchHelp; - -public class ConsolePreferencesPage extends PreferencePage implements IWorkbenchPreferencePage { - - private ColorFieldEditor commandColorEditor; - private ColorFieldEditor messageColorEditor; - private ColorFieldEditor errorColorEditor; - - /** - * Creates composite control and sets the default layout data. - * - * @param parent the parent of the new composite - * @param numColumns the number of columns for the new composite - * @return the newly-created coposite - */ - private Composite createComposite(Composite parent, int numColumns) { - Composite composite = new Composite(parent, SWT.NULL); - - //GridLayout - GridLayout layout = new GridLayout(); - layout.marginHeight = 0; - layout.marginWidth = 0; - layout.numColumns = numColumns; - composite.setLayout(layout); - - //GridData - GridData data = new GridData(); - data.verticalAlignment = GridData.FILL; - data.horizontalAlignment = GridData.FILL; - composite.setLayoutData(data); - return composite; - } - - /** - * @see PreferencePage#createContents(Composite) - */ - protected Control createContents(Composite parent) { - Composite composite = createComposite(parent, 2); - createLabel(composite, Policy.bind("ConsolePreferencePage.consoleColorSettings")); //$NON-NLS-1$ - - commandColorEditor = createColorFieldEditor(ICVSUIConstants.PREF_CONSOLE_COMMAND_COLOR, - Policy.bind("ConsolePreferencePage.commandColor"), composite); //$NON-NLS-1$ - messageColorEditor = createColorFieldEditor(ICVSUIConstants.PREF_CONSOLE_MESSAGE_COLOR, - Policy.bind("ConsolePreferencePage.messageColor"), composite); //$NON-NLS-1$ - errorColorEditor = createColorFieldEditor(ICVSUIConstants.PREF_CONSOLE_ERROR_COLOR, - Policy.bind("ConsolePreferencePage.errorColor"), composite); //$NON-NLS-1$ - - initializeValues(); - WorkbenchHelp.setHelp(composite, IHelpContextIds.CONSOLE_PREFERENCE_PAGE); - Dialog.applyDialogFont(parent); - return composite; - } - - /** - * Utility method that creates a label instance - * and sets the default layout data. - * - * @param parent the parent for the new label - * @param text the text for the new label - * @return the new label - */ - private Label createLabel(Composite parent, String text) { - Label label = new Label(parent, SWT.LEFT); - label.setText(text); - GridData data = new GridData(); - data.horizontalSpan = 2; - data.horizontalAlignment = GridData.FILL; - label.setLayoutData(data); - return label; - } - /** - * Creates a new color field editor. - */ - private ColorFieldEditor createColorFieldEditor(String preferenceName, String label, Composite parent) { - ColorFieldEditor editor = new ColorFieldEditor(preferenceName, label, parent); - editor.setPreferencePage(this); - editor.setPreferenceStore(getPreferenceStore()); - return editor; - } - - /** - * Initializes states of the controls from the preference store. - */ - private void initializeValues() { - IPreferenceStore store = getPreferenceStore(); - commandColorEditor.load(); - messageColorEditor.load(); - errorColorEditor.load(); - } - - /** - * @see IWorkbenchPreferencePage#init(IWorkbench) - */ - public void init(IWorkbench workbench) { - } - - /** - * OK was clicked. Store the CVS preferences. - * - * @return whether it is okay to close the preference page - */ - public boolean performOk() { - IPreferenceStore store = getPreferenceStore(); - commandColorEditor.store(); - messageColorEditor.store(); - errorColorEditor.store(); - return true; - } - - /** - * Defaults was clicked. Restore the CVS preferences to - * their default values - */ - protected void performDefaults() { - super.performDefaults(); - IPreferenceStore store = getPreferenceStore(); - commandColorEditor.loadDefault(); - messageColorEditor.loadDefault(); - errorColorEditor.loadDefault(); - } - - /** - * Returns preference store that belongs to the our plugin. - * This is important because we want to store - * our preferences separately from the desktop. - * - * @return the preference store for this plugin - */ - protected IPreferenceStore doGetPreferenceStore() { - return CVSUIPlugin.getPlugin().getPreferenceStore(); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/EditorsDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/EditorsDialog.java deleted file mode 100644 index 25636bd57..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/EditorsDialog.java +++ /dev/null @@ -1,75 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2003 CSC SoftwareConsult GmbH & Co. OHG, Germany and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * CSC - Intial implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Layout; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.internal.ccvs.core.EditorsInfo; -import org.eclipse.ui.help.WorkbenchHelp; - - - -/** - * - * A dialog for showing the result of a cvs editors command. - * Currently not in use, but can be used before executing the edit command - * - * @author <a href="mailto:gregor.kohlwes@csc.com,kohlwes@gmx.net">Gregor Kohlwes</a> - */ -public class EditorsDialog extends Dialog { - /** - * Constructor EditorsDialog. - * @param shell - * @param iEditorsInfos - */ - - EditorsView editorsView; - EditorsInfo[] editorsInfo; - - public EditorsDialog(Shell shell, EditorsInfo[] infos) { - super(shell); - editorsInfo = infos; - - } - - protected Control createDialogArea(Composite container) { - - Composite parent = (Composite) super.createDialogArea(container); - Layout layout = parent.getLayout(); - - getShell().setText(Policy.bind("EditorsDialog.title")); //$NON-NLS-1$ - createMessageArea(parent); - editorsView = new EditorsView(); - editorsView.createPartControl(container); - editorsView.setInput(editorsInfo); - - // set F1 help - WorkbenchHelp.setHelp(parent, IHelpContextIds.EDITORS_DIALOG); - - return parent; - } - /** - * Method createMessageArea. - * @param parent - */ - private void createMessageArea(Composite parent) { - Label label = new Label(parent, SWT.NONE); - label.setText(Policy.bind("EditorsDialog.question")); //$NON-NLS-1$ - label.setFont(parent.getFont()); - - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/EditorsView.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/EditorsView.java deleted file mode 100644 index fece678db..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/EditorsView.java +++ /dev/null @@ -1,207 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2003 CSC SoftwareConsult GmbH & Co. OHG, Germany and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * CSC - Intial implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import org.eclipse.jface.viewers.ColumnWeightData; -import org.eclipse.jface.viewers.ILabelProviderListener; -import org.eclipse.jface.viewers.IStructuredContentProvider; -import org.eclipse.jface.viewers.ITableLabelProvider; -import org.eclipse.jface.viewers.TableLayout; -import org.eclipse.jface.viewers.TableViewer; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Table; -import org.eclipse.swt.widgets.TableColumn; -import org.eclipse.team.internal.ccvs.core.EditorsInfo; -import org.eclipse.ui.help.WorkbenchHelp; -import org.eclipse.ui.part.ViewPart; - -/** - * - * The <code>EditorsView</code> shows the result of cvs editors command - * - * @author <a href="mailto:gregor.kohlwes@csc.com,kohlwes@gmx.net">Gregor Kohlwes</a> - * @see org.eclipse.team.internal.ccvs.ui.actions.ShowEditorsAction - */ -public class EditorsView extends ViewPart { - public static final String VIEW_ID = "org.eclipse.team.ccvs.ui.EditorsView"; //$NON-NLS-1$ - - private Table table; - private TableViewer tableViewer; - - class EditorsContentProvider implements IStructuredContentProvider { - - /** - * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) - */ - public Object[] getElements(Object inputElement) { - return (EditorsInfo[]) inputElement; - } - - /** - * @see org.eclipse.jface.viewers.IContentProvider#dispose() - */ - public void dispose() { - } - - /** - * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) - */ - public void inputChanged( - Viewer viewer, - Object oldInput, - Object newInput) { - } - - } - - class EditorsLabelProvider implements ITableLabelProvider { - /** - * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int) - */ - public Image getColumnImage(Object element, int columnIndex) { - return null; - } - - /** - * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int) - */ - public String getColumnText(Object element, int columnIndex) { - if (element == null) - return ""; //$NON-NLS-1$ - EditorsInfo info = (EditorsInfo) element; - - String result = null; - switch (columnIndex) { - case 0 : - result = info.getFileName(); - break; - case 1 : - result = info.getUserName(); - break; - case 2 : - result = info.getDateString(); - break; - case 3 : - result = info.getComputerName(); - break; - } - // This method must not return null - if (result == null) result = ""; //$NON-NLS-1$ - return result; - - } - - /** - * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener) - */ - public void addListener(ILabelProviderListener listener) { - } - - /** - * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose() - */ - public void dispose() { - } - - /** - * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String) - */ - public boolean isLabelProperty(Object element, String property) { - return false; - } - - /** - * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener) - */ - public void removeListener(ILabelProviderListener listener) { - } - - } - - /** - * @see org.eclipse.ui.IWorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite) - */ - public void createPartControl(Composite parent) { - table = new Table(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION); - table.setHeaderVisible(true); - table.setLinesVisible(true); - - GridData gridData = new GridData(GridData.FILL_BOTH); - gridData.widthHint=500; - gridData.heightHint=100; - table.setLayoutData(gridData); - - TableLayout layout = new TableLayout(); - table.setLayout(layout); - - tableViewer = new TableViewer(table); - createColumns(table, layout); - - tableViewer.setContentProvider(new EditorsContentProvider()); - tableViewer.setLabelProvider(new EditorsLabelProvider()); - // set F1 help - WorkbenchHelp.setHelp(tableViewer.getControl(), IHelpContextIds.CVS_EDITORS_VIEW); - } - public void setInput(EditorsInfo[] infos) { - tableViewer.setInput(infos); - } - /** - * Method createColumns. - * @param table - * @param layout - * @param viewer - */ - private void createColumns(Table table, TableLayout layout) { - - TableColumn col; - // file name - col = new TableColumn(table, SWT.NONE); - col.setResizable(true); - col.setText(Policy.bind("EditorsView.file")); //$NON-NLS-1$ - layout.addColumnData(new ColumnWeightData(30, true)); - - // user name - col = new TableColumn(table, SWT.NONE); - col.setResizable(true); - col.setText(Policy.bind("EditorsView.user")); //$NON-NLS-1$ - layout.addColumnData(new ColumnWeightData(20, true)); - - // creation date - col = new TableColumn(table, SWT.NONE); - col.setResizable(true); - col.setText(Policy.bind("EditorsView.date")); //$NON-NLS-1$ - layout.addColumnData(new ColumnWeightData(30, true)); - - // computer name - col = new TableColumn(table, SWT.NONE); - col.setResizable(true); - col.setText(Policy.bind("EditorsView.computer")); //$NON-NLS-1$ - layout.addColumnData(new ColumnWeightData(20, true)); - - } - - /** - * @see org.eclipse.ui.IWorkbenchPart#setFocus() - */ - public void setFocus() { - } - /** - * Method getTable. - */ - public Table getTable() { - return table; - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ExtMethodPreferencePage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ExtMethodPreferencePage.java deleted file mode 100644 index 6aa2ab602..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ExtMethodPreferencePage.java +++ /dev/null @@ -1,146 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - - -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.preference.PreferencePage; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.FileDialog; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Text; -import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; -import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.IWorkbenchPreferencePage; -import org.eclipse.ui.help.WorkbenchHelp; - -public class ExtMethodPreferencePage extends PreferencePage implements IWorkbenchPreferencePage { - - Text cvsRsh; - Text cvsServer; - Text cvsRshParameters; - - /* - * @see PreferencePage#createContents(Composite) - */ - protected Control createContents(Composite parent) { - Composite composite = new Composite(parent, SWT.NULL); - GridLayout layout = new GridLayout(); - layout.marginWidth = 0; - layout.marginHeight = 0; - layout.numColumns = 3; - composite.setLayout(layout); - composite.setLayoutData(new GridData()); - - Label intro = new Label(composite, SWT.LEFT | SWT.WRAP); - intro.setText(Policy.bind("ExtMethodPreferencePage_message")); //$NON-NLS-1$ - GridData data = new GridData(); - data.horizontalSpan = 3; - data.horizontalAlignment = GridData.FILL; - data.widthHint = 300; - intro.setLayoutData(data); - - new Label(composite, SWT.LEFT).setText(Policy.bind("ExtMethodPreferencePage_CVS_RSH")); //$NON-NLS-1$ - cvsRsh = new Text(composite, SWT.BORDER); - cvsRsh.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - - final Button b = new Button(composite, SWT.NONE); - b.setText(Policy.bind("ExtMethodPreferencePage_Browse")); //$NON-NLS-1$ - data = new GridData(); - data.horizontalAlignment = GridData.FILL; - data.heightHint = convertVerticalDLUsToPixels(IDialogConstants.BUTTON_HEIGHT); - int widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH); - data.widthHint = Math.max(widthHint, b.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x); - b.setLayoutData(data); - b.addListener(SWT.MouseDown, new Listener() { - public void handleEvent (Event event) { - FileDialog d = new FileDialog(getShell()); - d.setText(Policy.bind("ExtMethodPreferencePage_Details")); //$NON-NLS-1$ - String file = d.open(); - if(file!=null) { - setCvsRshText(file); - } - } - }); - - new Label(composite, SWT.LEFT).setText(Policy.bind("ExtMethodPreferencePage_CVS_RSH_Parameters")); //$NON-NLS-1$ - cvsRshParameters = new Text(composite, SWT.BORDER); - data = new GridData(); - data.horizontalSpan = 2; - data.horizontalAlignment = GridData.FILL; - cvsRshParameters.setLayoutData(data); - - new Label(composite, SWT.LEFT).setText(Policy.bind("ExtMethodPreferencePage_CVS_SERVER__7")); //$NON-NLS-1$ - cvsServer = new Text(composite, SWT.BORDER); - data = new GridData(); - data.horizontalSpan = 2; - data.horizontalAlignment = GridData.FILL; - cvsServer.setLayoutData(data); - - initializeDefaults(); - WorkbenchHelp.setHelp(composite, IHelpContextIds.EXT_PREFERENCE_PAGE); - WorkbenchHelp.setHelp(cvsRsh, IHelpContextIds.EXT_PREFERENCE_RSH); - WorkbenchHelp.setHelp(cvsRshParameters, IHelpContextIds.EXT_PREFERENCE_PARAM); - WorkbenchHelp.setHelp(cvsServer, IHelpContextIds.EXT_PREFERENCE_SERVER); - Dialog.applyDialogFont(parent); - return composite; - } - - protected void initializeDefaults() { - IPreferenceStore store = getPreferenceStore(); - cvsRsh.setText(store.getString(ICVSUIConstants.PREF_CVS_RSH)); - cvsRshParameters.setText(store.getString(ICVSUIConstants.PREF_CVS_RSH_PARAMETERS)); - cvsServer.setText(store.getString(ICVSUIConstants.PREF_CVS_SERVER)); - } - - /* - * Set CVS_RSH program - */ - protected void setCvsRshText(String s) { - cvsRsh.setText(s); - } - - /* - * @see IWorkbenchPreferencePage#init(IWorkbench) - */ - public void init(IWorkbench workbench) { - } - - /* - * @see IPreferencePage#performOk() - */ - public boolean performOk() { - IPreferenceStore store = getPreferenceStore(); - store.setValue(ICVSUIConstants.PREF_CVS_RSH, cvsRsh.getText()); - store.setValue(ICVSUIConstants.PREF_CVS_RSH_PARAMETERS, cvsRshParameters.getText()); - store.setValue(ICVSUIConstants.PREF_CVS_SERVER, cvsServer.getText()); - CVSProviderPlugin.getPlugin().setCvsRshCommand(cvsRsh.getText()); - CVSProviderPlugin.getPlugin().setCvsRshParameters(cvsRshParameters.getText()); - CVSProviderPlugin.getPlugin().setCvsServer(cvsServer.getText()); - CVSUIPlugin.getPlugin().savePluginPreferences(); - return super.performOk(); - } - /* - * @see PreferencePage#doGetPreferenceStore() - */ - protected IPreferenceStore doGetPreferenceStore() { - return CVSUIPlugin.getPlugin().getPreferenceStore(); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/FileModificationValidator.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/FileModificationValidator.java deleted file mode 100644 index c9c53ec2d..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/FileModificationValidator.java +++ /dev/null @@ -1,182 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.core.RepositoryProvider; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; -import org.eclipse.team.internal.ccvs.core.CVSTeamProvider; -import org.eclipse.team.internal.ccvs.core.ICVSFile; -import org.eclipse.team.internal.ccvs.core.ICVSFileModificationValidator; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.ui.actions.EditorsAction; - -/** - * IFileModificationValidator that is pluged into the CVS Repository Provider - */ -public class FileModificationValidator implements ICVSFileModificationValidator { - - public static final IStatus OK = new Status(IStatus.OK, CVSUIPlugin.ID, 0, Policy.bind("ok"), null); //$NON-NLS-1$ - private static final int HIGHJACK = 1; - - public FileModificationValidator() { - } - - /** - * @see org.eclipse.core.resources.IFileModificationValidator#validateEdit(org.eclipse.core.resources.IFile, java.lang.Object) - */ - public IStatus validateEdit(IFile[] files, Object context) { - IFile[] readOnlyFiles = getManagedReadOnlyFiles(files); - if (readOnlyFiles.length == 0) return OK; - return edit(readOnlyFiles, getShell(context)); - } - - /** - * @see org.eclipse.core.resources.IFileModificationValidator#validateSave(org.eclipse.core.resources.IFile) - */ - public IStatus validateSave(IFile file) { - if (!needsCheckout(file)) return OK; - return edit(new IFile[] {file}, (Shell)null); - } - - /** - * @see org.eclipse.team.internal.ccvs.core.ICVSFileModificationValidator#validateMoveDelete(org.eclipse.core.resources.IFile[], org.eclipse.core.runtime.IProgressMonitor) - */ - public IStatus validateMoveDelete(IFile[] files, IProgressMonitor monitor) { - IFile[] readOnlyFiles = getManagedReadOnlyFiles(files); - if (readOnlyFiles.length == 0) return OK; - - try { - edit(readOnlyFiles, monitor); - return OK; - } catch (CVSException e) { - return e.getStatus(); - } - } - - private IFile[] getManagedReadOnlyFiles(IFile[] files) { - List readOnlys = new ArrayList(); - for (int i = 0; i < files.length; i++) { - IFile iFile = files[i]; - if (needsCheckout(iFile)) { - readOnlys.add(iFile); - } - } - return (IFile[]) readOnlys.toArray(new IFile[readOnlys.size()]); - } - - private boolean needsCheckout(IFile file) { - try { - if (file.isReadOnly()) { - ICVSFile cvsFile = CVSWorkspaceRoot.getCVSFileFor(file); - return cvsFile.isManaged(); - } - } catch (CVSException e) { - // Log the exception and assume we don't need a checkout - CVSUIPlugin.log(e); - } - return false; - } - - private CVSTeamProvider getProvider(IFile[] files) { - CVSTeamProvider provider = (CVSTeamProvider)RepositoryProvider.getProvider(files[0].getProject(), CVSProviderPlugin.getTypeId()); - return provider; - } - - private Shell getShell(Object context) { - if (context instanceof Shell) - return (Shell)context; - return null; - } - - private IStatus getStatus(InvocationTargetException e) { - Throwable target = e.getTargetException(); - if (target instanceof TeamException) { - return ((TeamException) target).getStatus(); - } else if (target instanceof CoreException) { - return ((CoreException) target).getStatus(); - } - return new Status(IStatus.ERROR, CVSUIPlugin.ID, 0, Policy.bind("internal"), target); //$NON-NLS-1$ - } - - private IStatus edit(final IFile[] files, Shell shell) { - try { - if (!promptToEditFiles(files, shell)) { - return OK; - } - } catch (InvocationTargetException e) { - return getStatus(e); - } catch (InterruptedException e) { - // Is it correct to answer OK????? - return OK; - } - - // Create a runnable to edit the file - try { - run(shell, new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - try { - edit(files, monitor); - } catch (CVSException e) { - new InvocationTargetException(e); - } - } - }); - return OK; - } catch (InvocationTargetException e) { - return getStatus(e); - } catch (InterruptedException e) { - return new Status(IStatus.ERROR, CVSUIPlugin.ID, 0, Policy.bind("FileModificationValidator.vetoMessage"), null); //$NON-NLS-1$; - } - } - - private boolean promptToEditFiles(IFile[] files, Shell shell) throws InvocationTargetException, InterruptedException { - if (files.length == 0) - return true; - - EditorsAction editors = new EditorsAction(getProvider(files),files); - if (editors.isPerformEdit()) { - // determine if there are any editors of the file registered on the server - run(shell, editors); - // prompt if there are - return editors.promptToEdit(shell); - } else { - // Allow the files to be edited without notifying the server - for (int i = 0; i < files.length; i++) { - IFile file = files[i]; - file.setReadOnly(false); - } - return false; - } - - } - - private void run(Shell shell, final IRunnableWithProgress runnable) throws InvocationTargetException, InterruptedException { - final InvocationTargetException[] exception = new InvocationTargetException[] { null }; - CVSUIPlugin.runWithProgress(shell, false, runnable, CVSUIPlugin.PERFORM_SYNC_EXEC); - } - - private void edit(IFile[] files, IProgressMonitor monitor) throws CVSException { - getProvider(files).edit(files, false /* recurse */, true /* notify server */, ICVSFile.NO_NOTIFICATION, monitor); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryDropAdapter.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryDropAdapter.java deleted file mode 100644 index 3a053193d..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryDropAdapter.java +++ /dev/null @@ -1,66 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IResource; -import org.eclipse.jface.viewers.StructuredViewer; -import org.eclipse.jface.viewers.ViewerDropAdapter; -import org.eclipse.swt.dnd.DND; -import org.eclipse.swt.dnd.DropTargetEvent; -import org.eclipse.swt.dnd.TransferData; -import org.eclipse.ui.part.ResourceTransfer; - -public class HistoryDropAdapter extends ViewerDropAdapter { - HistoryView view; - - public HistoryDropAdapter(StructuredViewer viewer, HistoryView view) { - super(viewer); - this.view = view; - } - /* - * Override dragOver to slam the detail to DROP_LINK, as we do not - * want to really execute a DROP_MOVE, although we want to respond - * to it. - */ - public void dragOver(DropTargetEvent event) { - if ((event.operations & DND.DROP_LINK) == DND.DROP_LINK) { - event.detail = DND.DROP_LINK; - } - super.dragOver(event); - } - /* - * Override drop to slam the detail to DROP_LINK, as we do not - * want to really execute a DROP_MOVE, although we want to respond - * to it. - */ - public void drop(DropTargetEvent event) { - super.drop(event); - event.detail = DND.DROP_LINK; - } - public boolean performDrop(Object data) { - if (data == null) return false; - IResource[] sources = (IResource[])data; - if (sources.length == 0) return false; - IResource resource = sources[0]; - if (!(resource instanceof IFile)) return false; - view.showHistory(resource); - return true; - } - public boolean validateDrop(Object target, int operation, TransferData transferType) { - if (transferType != null && ResourceTransfer.getInstance().isSupportedType(transferType)) { - return true; - } - return false; - } -} - diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryFilter.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryFilter.java deleted file mode 100644 index 2be43c760..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryFilter.java +++ /dev/null @@ -1,74 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import java.util.Date; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jface.viewers.ViewerFilter; -import org.eclipse.team.internal.ccvs.core.ILogEntry; - -public class HistoryFilter extends ViewerFilter { - private HistoryView view; - public String author; - public Date fromDate; - public Date toDate; - public String comment; - public boolean isOr; - - public HistoryFilter(HistoryView hView, String author, String comment, Date fromDate, Date toDate, boolean isOr) { - this.view = hView; - this.author = author; - this.comment = comment; - this.fromDate = fromDate; - this.toDate = toDate; - this.isOr = isOr; - } - /** - * @see ViewerFilter#select(Viewer, Object, Object) - */ - public boolean select(Viewer aviewer, Object parentElement, Object element) { - if (element instanceof ILogEntry) { - ILogEntry entry = (ILogEntry)element; - if (isOr) { - //empty fields should be considered a non-match - return (hasAuthor() && authorMatch(entry) ) - || (hasDate() && dateMatch(entry)) - || (hasComment() && commentMatch(entry)); - } else { - //"and" search - //empty fields should be considered a match - return (!hasAuthor() || authorMatch(entry)) - && (!hasDate() || dateMatch(entry)) - && (!hasComment() || commentMatch(entry)); - } - } - return false; - } - protected boolean authorMatch(ILogEntry entry) { - return entry.getAuthor().equals(author); - } - protected boolean commentMatch(ILogEntry entry) { - return !(entry.getComment().toLowerCase().indexOf(comment.toLowerCase()) == -1); - } - protected boolean dateMatch(ILogEntry entry) { - return (fromDate.before(entry.getDate())) - && (toDate.after(entry.getDate())); - } - protected boolean hasAuthor() { - return !author.equals(""); //$NON-NLS-1$ - } - protected boolean hasComment() { - return !comment.equals(""); //$NON-NLS-1$ - } - protected boolean hasDate() { - return fromDate != null && toDate != null; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryFilterAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryFilterAction.java deleted file mode 100644 index 3dda72428..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryFilterAction.java +++ /dev/null @@ -1,55 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.window.Window; -import org.eclipse.ui.IViewActionDelegate; -import org.eclipse.ui.IViewPart; - -public class HistoryFilterAction implements IViewActionDelegate { - private HistoryView view; - private HistoryFilter filter; - - /** - * @see IViewActionDelegate#init(IViewPart) - */ - public void init(IViewPart view) { - this.view = (HistoryView)view; - } - /** - * @see IActionDelegate#run(IAction) - */ - public void run(IAction action) { - HistoryFilterDialog historyDialog = new HistoryFilterDialog(view); - if (filter != null) { - historyDialog.setFilter(filter); - } - if (historyDialog.open() == Window.CANCEL) { - return; - } - if (filter != null) { - view.getViewer().removeFilter(filter); - } - filter = historyDialog.getFilter(); - //don't add the filter if it is blank - if (!(filter.hasAuthor() || filter.hasDate() || filter.hasComment())) { - return; - } - view.getViewer().addFilter(filter); - } - /** - * @see IActionDelegate#selectionChanged(IAction, ISelection) - */ - public void selectionChanged(IAction action, ISelection selection) { - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryFilterDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryFilterDialog.java deleted file mode 100644 index 089eeb543..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryFilterDialog.java +++ /dev/null @@ -1,264 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; - -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Combo; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.Text; -import org.eclipse.ui.help.WorkbenchHelp; - -public class HistoryFilterDialog extends Dialog { - - private boolean dateEntered; - private HistoryView historyView; - private HistoryFilter historyFilter; - - //widgets - private Button orRadio; - private Button andRadio; - private Combo fromDayCombo; - private Combo toDayCombo; - private Combo fromMonthCombo; - private Combo toMonthCombo; - private Combo fromYearCombo; - private Combo toYearCombo; - private Text author; - private Text comment; - - public HistoryFilterDialog(HistoryView view) { - super(view.getViewSite().getShell()); - this.historyView = view; - } - - protected void configureShell(Shell newShell) { - super.configureShell(newShell); - newShell.setText(Policy.bind("HistoryFilterDialog.title")); //$NON-NLS-1$ - } - - protected Control createDialogArea(Composite parent) { - Composite topLevel = new Composite(parent, SWT.NONE); - GridLayout layout = new GridLayout(); - layout.numColumns = 2; - topLevel.setLayout(layout); - - //"and" and "or" search radio buttons - Label label = new Label(topLevel, SWT.NONE); - GridData data = new GridData(GridData.FILL_HORIZONTAL); - data.horizontalSpan = 2; - label.setLayoutData(data); - label.setText(Policy.bind("HistoryFilterDialog.showMatching")); //$NON-NLS-1$ - - andRadio = new Button(topLevel, SWT.RADIO); - andRadio.setText(Policy.bind("HistoryFilterDialog.matchingAll")); //$NON-NLS-1$ - data = new GridData(GridData.FILL_HORIZONTAL); - data.horizontalSpan = 2; - andRadio.setLayoutData(data); - andRadio.setSelection(true); - - orRadio = new Button(topLevel, SWT.RADIO); - orRadio.setText(Policy.bind("HistoryFilterDialog.matchingAny")); //$NON-NLS-1$ - data = new GridData(GridData.FILL_HORIZONTAL); - data.horizontalSpan = 2; - orRadio.setLayoutData(data); - - //author - label = new Label(topLevel, SWT.NONE); - label.setText(Policy.bind("HistoryFilterDialog.author")); //$NON-NLS-1$ - author = new Text(topLevel, SWT.BORDER); - author.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - - //comment - label = new Label(topLevel, SWT.NONE); - label.setText(Policy.bind("HistoryFilterDialog.comment")); //$NON-NLS-1$ - comment = new Text(topLevel, SWT.BORDER); - comment.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - - //"from" date - label = new Label(topLevel, SWT.NONE); - label.setText(Policy.bind("HistoryFilterDialog.fromDate")); //$NON-NLS-1$ - Composite fdComposite = new Composite(topLevel, SWT.NONE); - GridLayout fdLayout = new GridLayout(); - fdLayout.numColumns = 3; - fdComposite.setLayout(fdLayout); - fromMonthCombo = new Combo(fdComposite, SWT.READ_ONLY); - fromDayCombo = new Combo(fdComposite, SWT.READ_ONLY); - fromYearCombo = new Combo(fdComposite, SWT.NONE); - fromYearCombo.setTextLimit(4); - - //"to" date - label = new Label(topLevel, SWT.NONE); - label.setText(Policy.bind("HistoryFilterDialog.toDate")); //$NON-NLS-1$ - Composite tdComposite = new Composite(topLevel, SWT.NONE); - GridLayout tdLayout = new GridLayout(); - tdLayout.numColumns = 3; - tdComposite.setLayout(tdLayout); - toMonthCombo = new Combo(tdComposite, SWT.READ_ONLY); - toDayCombo = new Combo(tdComposite, SWT.READ_ONLY); - toYearCombo = new Combo(tdComposite, SWT.NONE); - toYearCombo.setTextLimit(4); - - //set day, month and year combos with numbers - //years allows a selection from the past 5 years - //or any year written in - String days[] = new String[32]; - days[0] = "---"; //$NON-NLS-1$ - for (int i = 1; i < 32; i++) { - days[i] = String.valueOf(i); - } - - String months[] = new String[13]; - months[0] = "---"; //$NON-NLS-1$ - SimpleDateFormat format = new SimpleDateFormat("MMMM"); //$NON-NLS-1$ - Calendar calendar = Calendar.getInstance(); - for (int i = 1; i < 13; i++) { - calendar.set(Calendar.MONTH, i - 1); - months[i] = format.format(calendar.getTime()); - } - - String years[] = new String[5]; - Calendar calender = Calendar.getInstance(); - for (int i = 0; i < 5; i++) { - years[i] = String.valueOf(calender.get(1) - i); - } - fromDayCombo.setItems(days); - fromDayCombo.select(0); - toDayCombo.setItems(days); - toDayCombo.select(0); - fromMonthCombo.setItems(months); - fromMonthCombo.select(0); - toMonthCombo.setItems(months); - toMonthCombo.select(0); - fromYearCombo.setItems(years); - toYearCombo.setItems(years); - fromYearCombo.select(0); - toYearCombo.select(0); - - initializeValues(); - - // set F1 help - WorkbenchHelp.setHelp(topLevel, IHelpContextIds.HISTORY_FILTER_DIALOG); - - return topLevel; - } - void initializeValues() { - if (historyFilter == null) return; - if (historyFilter.author != null) { - author.setText(historyFilter.author); - } - if (historyFilter.comment != null) { - comment.setText(historyFilter.comment); - } - orRadio.setSelection(historyFilter.isOr); - andRadio.setSelection(!historyFilter.isOr); - Calendar calendar = Calendar.getInstance(); - if (historyFilter.fromDate != null) { - calendar.setTime(historyFilter.fromDate); - fromDayCombo.select(calendar.get(Calendar.DATE)); - fromMonthCombo.select(calendar.get(Calendar.MONTH) + 1); - String yearValue = String.valueOf(calendar.get(Calendar.YEAR)); - int index = fromYearCombo.indexOf(yearValue); - if (index == -1) { - fromYearCombo.add(yearValue); - index = fromYearCombo.indexOf(yearValue); - } - fromYearCombo.select(index); - } - if (historyFilter.toDate != null) { - calendar.setTime(historyFilter.toDate); - toDayCombo.select(calendar.get(Calendar.DATE)); - toMonthCombo.select(calendar.get(Calendar.MONTH) + 1); - String yearValue = String.valueOf(calendar.get(Calendar.YEAR)); - int index = toYearCombo.indexOf(yearValue); - if (index == -1) { - toYearCombo.add(yearValue); - index = toYearCombo.indexOf(yearValue); - } - toYearCombo.select(index); - } - } - /** - * A button has been pressed. Process the dialog contents. - */ - protected void buttonPressed(int buttonId) { - if (IDialogConstants.CANCEL_ID == buttonId) { - super.buttonPressed(buttonId); - return; - } - Date fromDate = null, toDate = null; - - if ((fromMonthCombo.getSelectionIndex() > 0) - && (toMonthCombo.getSelectionIndex() > 0) - && (fromDayCombo.getSelectionIndex() > 0) - && (toDayCombo.getSelectionIndex() > 0) - && (fromYearCombo.getText().length() > 0) - && (toYearCombo.getText().length() > 0)) { - - //set the calendar with the user input - //set the hours, minutes and seconds to 00 - //so as to cover the whole day - Calendar calendar = Calendar.getInstance(); - calendar.set( - Integer.parseInt(String.valueOf(fromYearCombo.getText())), - fromMonthCombo.getSelectionIndex() - 1, - Integer.parseInt(String.valueOf(fromDayCombo.getText())), - 00, 00, 00); - fromDate = calendar.getTime(); - - //set the calendar with the user input - //set the hours, minutes and seconds to 23, 59, 59 - //so as to cover the whole day - calendar.set( - Integer.parseInt(String.valueOf(toYearCombo.getText())), - toMonthCombo.getSelectionIndex() - 1, - Integer.parseInt(String.valueOf(toDayCombo.getText())), - 23, 59, 59); - toDate = calendar.getTime(); - } - - //create the filter - historyFilter = new HistoryFilter( - historyView, - author.getText(), - comment.getText(), - fromDate, - toDate, - orRadio.getSelection()); - - super.buttonPressed(buttonId); - } - - /** - * Returns the filter that was created from the provided - * user input. - */ - public HistoryFilter getFilter() { - return historyFilter; - } - /** - * Set the intial value of the dialog to the given filter. - */ - public void setFilter(HistoryFilter filter) { - this.historyFilter = filter; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryTableProvider.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryTableProvider.java deleted file mode 100644 index efacce39f..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryTableProvider.java +++ /dev/null @@ -1,397 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import java.text.DateFormat; -import java.util.Date; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.jface.viewers.CheckboxTableViewer; -import org.eclipse.jface.viewers.ColumnWeightData; -import org.eclipse.jface.viewers.IColorProvider; -import org.eclipse.jface.viewers.ITableLabelProvider; -import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jface.viewers.TableLayout; -import org.eclipse.jface.viewers.TableViewer; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jface.viewers.ViewerSorter; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.graphics.Color; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Table; -import org.eclipse.swt.widgets.TableColumn; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSFile; -import org.eclipse.team.internal.ccvs.core.ILogEntry; -import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo; -import org.eclipse.ui.internal.WorkbenchColors; - -/** - * This class provides the table and it's required components for a file's revision - * history - */ -public class HistoryTableProvider { - - private ICVSFile currentFile; - private String currentRevision; - - /** - * Constructor for HistoryTableProvider. - */ - public HistoryTableProvider() { - super(); - } - - //column constants - private static final int COL_REVISION = 0; - private static final int COL_TAGS = 1; - private static final int COL_DATE = 2; - private static final int COL_AUTHOR = 3; - private static final int COL_COMMENT = 4; - - /** - * The history label provider. - */ - class HistoryLabelProvider extends LabelProvider implements ITableLabelProvider, IColorProvider { - public Image getColumnImage(Object element, int columnIndex) { - return null; - } - public String getColumnText(Object element, int columnIndex) { - ILogEntry entry = adaptToLogEntry(element); - if (entry == null) return ""; //$NON-NLS-1$ - switch (columnIndex) { - case COL_REVISION: - String revision = entry.getRevision(); - String currentRevision = getCurrentRevision(); - if (currentRevision != null && currentRevision.equals(revision)) { - revision = Policy.bind("currentRevision", revision); //$NON-NLS-1$ - } - return revision; - case COL_TAGS: - CVSTag[] tags = entry.getTags(); - StringBuffer result = new StringBuffer(); - for (int i = 0; i < tags.length; i++) { - result.append(tags[i].getName()); - if (i < tags.length - 1) { - result.append(", "); //$NON-NLS-1$ - } - } - return result.toString(); - case COL_DATE: - Date date = entry.getDate(); - if (date == null) return Policy.bind("notAvailable"); //$NON-NLS-1$ - return DateFormat.getInstance().format(date); - case COL_AUTHOR: - return entry.getAuthor(); - case COL_COMMENT: - String comment = entry.getComment(); - int index = comment.indexOf("\n"); //$NON-NLS-1$ - switch (index) { - case -1: - return comment; - case 0: - return Policy.bind("HistoryView.[...]_4"); //$NON-NLS-1$ - default: - return Policy.bind("CVSCompareRevisionsInput.truncate", comment.substring(0, index)); //$NON-NLS-1$ - } - } - return ""; //$NON-NLS-1$ - } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object) - */ - public Color getForeground(Object element) { - ILogEntry entry = adaptToLogEntry(element); - if (entry.isDeletion()) { - return WorkbenchColors.getSystemColor(SWT.COLOR_WIDGET_NORMAL_SHADOW); - } else { - return null; - } - } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object) - */ - public Color getBackground(Object element) { - return null; - } - } - - /** - * The history sorter - */ - class HistorySorter extends ViewerSorter { - private boolean reversed = false; - private int columnNumber; - - private VersionCollator versionCollator = new VersionCollator(); - - // column headings: "Revision" "Tags" "Date" "Author" "Comment" - private int[][] SORT_ORDERS_BY_COLUMN = { - {COL_REVISION, COL_DATE, COL_AUTHOR, COL_COMMENT, COL_TAGS}, /* revision */ - {COL_TAGS, COL_REVISION, COL_DATE, COL_AUTHOR, COL_COMMENT}, /* tags */ - {COL_DATE, COL_REVISION, COL_AUTHOR, COL_COMMENT, COL_TAGS}, /* date */ - {COL_AUTHOR, COL_REVISION, COL_DATE, COL_COMMENT, COL_TAGS}, /* author */ - {COL_COMMENT, COL_REVISION, COL_DATE, COL_AUTHOR, COL_TAGS} /* comment */ - }; - - /** - * The constructor. - */ - public HistorySorter(int columnNumber) { - this.columnNumber = columnNumber; - } - /** - * Compares two log entries, sorting first by the main column of this sorter, - * then by subsequent columns, depending on the column sort order. - */ - public int compare(Viewer viewer, Object o1, Object o2) { - ILogEntry e1 = adaptToLogEntry(o1); - ILogEntry e2 = adaptToLogEntry(o2); - int result = 0; - if (e1 == null || e2 == null) { - result = super.compare(viewer, o1, o2); - } else { - int[] columnSortOrder = SORT_ORDERS_BY_COLUMN[columnNumber]; - for (int i = 0; i < columnSortOrder.length; ++i) { - result = compareColumnValue(columnSortOrder[i], e1, e2); - if (result != 0) - break; - } - } - if (reversed) - result = -result; - return result; - } - /** - * Compares two markers, based only on the value of the specified column. - */ - int compareColumnValue(int columnNumber, ILogEntry e1, ILogEntry e2) { - switch (columnNumber) { - case 0: /* revision */ - return versionCollator.compare(e1.getRevision(), e2.getRevision()); - case 1: /* tags */ - CVSTag[] tags1 = e1.getTags(); - CVSTag[] tags2 = e2.getTags(); - if (tags2.length == 0) { - return -1; - } - if (tags1.length == 0) { - return 1; - } - return getCollator().compare(tags1[0].getName(), tags2[0].getName()); - case 2: /* date */ - Date date1 = e1.getDate(); - Date date2 = e2.getDate(); - return date1.compareTo(date2); - case 3: /* author */ - return getCollator().compare(e1.getAuthor(), e2.getAuthor()); - case 4: /* comment */ - return getCollator().compare(e1.getComment(), e2.getComment()); - default: - return 0; - } - } - /** - * Returns the number of the column by which this is sorting. - */ - public int getColumnNumber() { - return columnNumber; - } - /** - * Returns true for descending, or false - * for ascending sorting order. - */ - public boolean isReversed() { - return reversed; - } - /** - * Sets the sorting order. - */ - public void setReversed(boolean newReversed) { - reversed = newReversed; - } - } - - protected ILogEntry adaptToLogEntry(Object element) { - // Get the log entry for the provided object - ILogEntry entry = null; - if (element instanceof ILogEntry) { - entry = (ILogEntry) element; - } else if (element instanceof IAdaptable) { - entry = (ILogEntry)((IAdaptable)element).getAdapter(ILogEntry.class); - } - return entry; - } - - /** - * Create a TableViewer that can be used to display a list of ILogEntry instances. - * Ths method provides the labels and sorter but does not provide a content provider - * - * @param parent - * @return TableViewer - */ - public TableViewer createTable(Composite parent) { - Table table = new Table(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI | SWT.FULL_SELECTION); - table.setHeaderVisible(true); - table.setLinesVisible(true); - GridData data = new GridData(GridData.FILL_BOTH); - table.setLayoutData(data); - - TableLayout layout = new TableLayout(); - table.setLayout(layout); - - TableViewer viewer = new TableViewer(table); - - createColumns(table, layout, viewer); - - viewer.setLabelProvider(new HistoryLabelProvider()); - - // By default, reverse sort by revision. - HistorySorter sorter = new HistorySorter(COL_REVISION); - sorter.setReversed(true); - viewer.setSorter(sorter); - - return viewer; - } - - /** - * Create a CheckBoxTableViewer that can be used to display a list of ILogEntry instances. - * Ths method provides the labels and sorter but does not provide a content provider - * - * @param parent - * @return TableViewer - */ - public CheckboxTableViewer createCheckBoxTable(Composite parent) { - Table table = new Table(parent, SWT.CHECK | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION); - table.setHeaderVisible(true); - table.setLinesVisible(true); - GridData data = new GridData(GridData.FILL_BOTH); - table.setLayoutData(data); - - TableLayout layout = new TableLayout(); - table.setLayout(layout); - - CheckboxTableViewer viewer = new CheckboxTableViewer(table); - - createColumns(table, layout, viewer); - - viewer.setLabelProvider(new HistoryLabelProvider()); - - // By default, reverse sort by revision. - HistorySorter sorter = new HistorySorter(COL_REVISION); - sorter.setReversed(true); - viewer.setSorter(sorter); - - return viewer; - } - - /** - * Creates the columns for the history table. - */ - private void createColumns(Table table, TableLayout layout, TableViewer viewer) { - SelectionListener headerListener = getColumnListener(viewer); - // revision - TableColumn col = new TableColumn(table, SWT.NONE); - col.setResizable(true); - col.setText(Policy.bind("HistoryView.revision")); //$NON-NLS-1$ - col.addSelectionListener(headerListener); - layout.addColumnData(new ColumnWeightData(20, true)); - - // tags - col = new TableColumn(table, SWT.NONE); - col.setResizable(true); - col.setText(Policy.bind("HistoryView.tags")); //$NON-NLS-1$ - col.addSelectionListener(headerListener); - layout.addColumnData(new ColumnWeightData(20, true)); - - // creation date - col = new TableColumn(table, SWT.NONE); - col.setResizable(true); - col.setText(Policy.bind("HistoryView.date")); //$NON-NLS-1$ - col.addSelectionListener(headerListener); - layout.addColumnData(new ColumnWeightData(20, true)); - - // author - col = new TableColumn(table, SWT.NONE); - col.setResizable(true); - col.setText(Policy.bind("HistoryView.author")); //$NON-NLS-1$ - col.addSelectionListener(headerListener); - layout.addColumnData(new ColumnWeightData(20, true)); - - //comment - col = new TableColumn(table, SWT.NONE); - col.setResizable(true); - col.setText(Policy.bind("HistoryView.comment")); //$NON-NLS-1$ - col.addSelectionListener(headerListener); - layout.addColumnData(new ColumnWeightData(50, true)); - } - - /** - * Adds the listener that sets the sorter. - */ - private SelectionListener getColumnListener(final TableViewer tableViewer) { - /** - * This class handles selections of the column headers. - * Selection of the column header will cause resorting - * of the shown tasks using that column's sorter. - * Repeated selection of the header will toggle - * sorting order (ascending versus descending). - */ - return new SelectionAdapter() { - /** - * Handles the case of user selecting the - * header area. - * <p>If the column has not been selected previously, - * it will set the sorter of that column to be - * the current tasklist sorter. Repeated - * presses on the same column header will - * toggle sorting order (ascending/descending). - */ - public void widgetSelected(SelectionEvent e) { - // column selected - need to sort - int column = tableViewer.getTable().indexOf((TableColumn) e.widget); - HistorySorter oldSorter = (HistorySorter)tableViewer.getSorter(); - if (oldSorter != null && column == oldSorter.getColumnNumber()) { - oldSorter.setReversed(!oldSorter.isReversed()); - tableViewer.refresh(); - } else { - tableViewer.setSorter(new HistorySorter(column)); - } - } - }; - } - - public String getCurrentRevision() { - return currentRevision; - } - - /** - * Method getRevision. - * @param currentEdition - */ - private String getRevision(ICVSFile currentEdition) throws CVSException { - if (currentEdition == null) return ""; //$NON-NLS-1$ - ResourceSyncInfo info = currentEdition.getSyncInfo(); - if (info == null) return ""; //$NON-NLS-1$ - return info.getRevision(); - } - - public void setFile(ICVSFile file) throws CVSException { - this.currentFile = file; - this.currentRevision = getRevision(this.currentFile); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryView.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryView.java deleted file mode 100644 index 2bbb38c2b..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryView.java +++ /dev/null @@ -1,699 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - - -import java.io.InputStream; -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.Iterator; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IWorkspaceRunnable; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.SubProgressMonitor; -import org.eclipse.jface.action.Action; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.action.IMenuListener; -import org.eclipse.jface.action.IMenuManager; -import org.eclipse.jface.action.IToolBarManager; -import org.eclipse.jface.action.MenuManager; -import org.eclipse.jface.action.Separator; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.dialogs.ProgressMonitorDialog; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.text.Document; -import org.eclipse.jface.text.ITextOperationTarget; -import org.eclipse.jface.text.TextViewer; -import org.eclipse.jface.viewers.ColumnWeightData; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredContentProvider; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jface.viewers.TableLayout; -import org.eclipse.jface.viewers.TableViewer; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jface.viewers.ViewerSorter; -import org.eclipse.swt.SWT; -import org.eclipse.swt.custom.BusyIndicator; -import org.eclipse.swt.custom.SashForm; -import org.eclipse.swt.custom.StyledText; -import org.eclipse.swt.dnd.DND; -import org.eclipse.swt.dnd.Transfer; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Menu; -import org.eclipse.swt.widgets.Table; -import org.eclipse.team.core.RepositoryProvider; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.CVSTeamProvider; -import org.eclipse.team.internal.ccvs.core.ICVSFile; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFile; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.internal.ccvs.core.ILogEntry; -import org.eclipse.team.internal.ccvs.core.client.Command; -import org.eclipse.team.internal.ccvs.core.client.Update; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.ui.actions.CVSAction; -import org.eclipse.team.internal.ccvs.ui.actions.MoveRemoteTagAction; -import org.eclipse.team.internal.ccvs.ui.actions.OpenLogEntryAction; -import org.eclipse.ui.IActionBars; -import org.eclipse.ui.IActionDelegate; -import org.eclipse.ui.IWorkbenchActionConstants; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.actions.WorkspaceModifyOperation; -import org.eclipse.ui.help.WorkbenchHelp; -import org.eclipse.ui.part.ResourceTransfer; -import org.eclipse.ui.part.ViewPart; -import org.eclipse.ui.texteditor.ITextEditorActionConstants; - -/** - * The history view allows browsing of an array of resource revisions - */ -public class HistoryView extends ViewPart { - private IFile file; - // cached for efficiency - private ILogEntry[] entries; - private CVSTeamProvider provider; - - private HistoryTableProvider historyTableProvider; - - private TableViewer tableViewer; - private TextViewer textViewer; - private TableViewer tagViewer; - - private OpenLogEntryAction openAction; - private IAction toggleTextAction; - private IAction toggleListAction; - private TextViewerAction copyAction; - private TextViewerAction selectAllAction; - private Action getContentsAction; - private Action getRevisionAction; - private Action refreshAction; - private Action tagWithExistingAction; - - private SashForm sashForm; - private SashForm innerSashForm; - - private Image branchImage; - private Image versionImage; - - private ILogEntry currentSelection; - - public static final String VIEW_ID = "org.eclipse.team.ccvs.ui.HistoryView"; //$NON-NLS-1$ - - /** - * Adds the action contributions for this view. - */ - protected void contributeActions() { - // Refresh (toolbar) - CVSUIPlugin plugin = CVSUIPlugin.getPlugin(); - refreshAction = new Action(Policy.bind("HistoryView.refreshLabel"), plugin.getImageDescriptor(ICVSUIConstants.IMG_REFRESH_ENABLED)) { //$NON-NLS-1$ - public void run() { - refresh(); - } - }; - refreshAction.setToolTipText(Policy.bind("HistoryView.refresh")); //$NON-NLS-1$ - refreshAction.setDisabledImageDescriptor(plugin.getImageDescriptor(ICVSUIConstants.IMG_REFRESH_DISABLED)); - refreshAction.setHoverImageDescriptor(plugin.getImageDescriptor(ICVSUIConstants.IMG_REFRESH)); - - // Double click open action - openAction = new OpenLogEntryAction(); - tableViewer.getTable().addListener(SWT.DefaultSelection, new Listener() { - public void handleEvent(Event e) { - openAction.selectionChanged(null, tableViewer.getSelection()); - openAction.run(null); - } - }); - - getContentsAction = getContextMenuAction(Policy.bind("HistoryView.getContentsAction"), true /* needs progress */, new IWorkspaceRunnable() { //$NON-NLS-1$ - public void run(IProgressMonitor monitor) throws CoreException { - ICVSRemoteFile remoteFile = currentSelection.getRemoteFile(); - monitor.beginTask(null, 100); - try { - if(confirmOverwrite()) { - InputStream in = remoteFile.getContents(new SubProgressMonitor(monitor, 50)); - file.setContents(in, false, true, new SubProgressMonitor(monitor, 50)); - } - } catch (TeamException e) { - throw new CoreException(e.getStatus()); - } finally { - monitor.done(); - } - } - }); - WorkbenchHelp.setHelp(getContentsAction, IHelpContextIds.GET_FILE_CONTENTS_ACTION); - - getRevisionAction = getContextMenuAction(Policy.bind("HistoryView.getRevisionAction"), true /* needs progress */, new IWorkspaceRunnable() { //$NON-NLS-1$ - public void run(IProgressMonitor monitor) throws CoreException { - ICVSRemoteFile remoteFile = currentSelection.getRemoteFile(); - try { - if(confirmOverwrite()) { - CVSTeamProvider provider = (CVSTeamProvider)RepositoryProvider.getProvider(file.getProject()); - CVSTag revisionTag = new CVSTag(remoteFile.getRevision(), CVSTag.VERSION); - - if(CVSAction.checkForMixingTags(getSite().getShell(), new IResource[] {file}, revisionTag)) { - provider.update(new IResource[] {file}, new Command.LocalOption[] {Update.IGNORE_LOCAL_CHANGES}, - revisionTag, true /*create backups*/, monitor); - historyTableProvider.setFile(remoteFile); - tableViewer.refresh(); - } - } - } catch (TeamException e) { - throw new CoreException(e.getStatus()); - } - } - }); - WorkbenchHelp.setHelp(getRevisionAction, IHelpContextIds.GET_FILE_REVISION_ACTION); - - // Override MoveRemoteTagAction to work for log entries - final IActionDelegate tagActionDelegate = new MoveRemoteTagAction() { - protected ICVSResource[] getSelectedCVSResources() { - ICVSResource[] resources = super.getSelectedCVSResources(); - if (resources == null || resources.length == 0) { - ArrayList logEntrieFiles = null; - if (!selection.isEmpty()) { - logEntrieFiles = new ArrayList(); - Iterator elements = ((IStructuredSelection) selection).iterator(); - while (elements.hasNext()) { - Object next = elements.next(); - if (next instanceof ILogEntry) { - logEntrieFiles.add(((ILogEntry)next).getRemoteFile()); - continue; - } - if (next instanceof IAdaptable) { - IAdaptable a = (IAdaptable) next; - Object adapter = a.getAdapter(ICVSResource.class); - if (adapter instanceof ICVSResource) { - logEntrieFiles.add(((ILogEntry)adapter).getRemoteFile()); - continue; - } - } - } - } - if (logEntrieFiles != null && !logEntrieFiles.isEmpty()) { - return (ICVSResource[])logEntrieFiles.toArray(new ICVSResource[logEntrieFiles.size()]); - } - } - return resources; - } - }; - tagWithExistingAction = getContextMenuAction(Policy.bind("HistoryView.tagWithExistingAction"), false /* no progress */, new IWorkspaceRunnable() { //$NON-NLS-1$ - public void run(IProgressMonitor monitor) throws CoreException { - tagActionDelegate.selectionChanged(tagWithExistingAction, tableViewer.getSelection()); - tagActionDelegate.run(tagWithExistingAction); - if( ! ((MoveRemoteTagAction)tagActionDelegate).wasCancelled()) { - refresh(); - } - } - }); - WorkbenchHelp.setHelp(getRevisionAction, IHelpContextIds.TAG_WITH_EXISTING_ACTION); - - // Toggle text visible action - final IPreferenceStore store = CVSUIPlugin.getPlugin().getPreferenceStore(); - toggleTextAction = new Action(Policy.bind("HistoryView.showComment")) { //$NON-NLS-1$ - public void run() { - setViewerVisibility(); - store.setValue(ICVSUIConstants.PREF_SHOW_COMMENTS, toggleTextAction.isChecked()); - } - }; - toggleTextAction.setChecked(store.getBoolean(ICVSUIConstants.PREF_SHOW_COMMENTS)); - WorkbenchHelp.setHelp(toggleTextAction, IHelpContextIds.SHOW_COMMENT_IN_HISTORY_ACTION); - // Toggle list visible action - toggleListAction = new Action(Policy.bind("HistoryView.showTags")) { //$NON-NLS-1$ - public void run() { - setViewerVisibility(); - store.setValue(ICVSUIConstants.PREF_SHOW_TAGS, toggleListAction.isChecked()); - } - }; - toggleListAction.setChecked(store.getBoolean(ICVSUIConstants.PREF_SHOW_TAGS)); - WorkbenchHelp.setHelp(toggleListAction, IHelpContextIds.SHOW_TAGS_IN_HISTORY_ACTION); - - // Contribute actions to popup menu - MenuManager menuMgr = new MenuManager(); - Menu menu = menuMgr.createContextMenu(tableViewer.getTable()); - menuMgr.addMenuListener(new IMenuListener() { - public void menuAboutToShow(IMenuManager menuMgr) { - fillTableMenu(menuMgr); - } - }); - menuMgr.setRemoveAllWhenShown(true); - tableViewer.getTable().setMenu(menu); - getSite().registerContextMenu(menuMgr, tableViewer); - - // Contribute toggle text visible to the toolbar drop-down - IActionBars actionBars = getViewSite().getActionBars(); - IMenuManager actionBarsMenu = actionBars.getMenuManager(); - actionBarsMenu.add(toggleTextAction); - actionBarsMenu.add(toggleListAction); - - // Create the local tool bar - IToolBarManager tbm = getViewSite().getActionBars().getToolBarManager(); - tbm.add(refreshAction); - tbm.update(false); - - // Create actions for the text editor - copyAction = new TextViewerAction(textViewer, ITextOperationTarget.COPY); - copyAction.setText(Policy.bind("HistoryView.copy")); //$NON-NLS-1$ - actionBars.setGlobalActionHandler(ITextEditorActionConstants.COPY, copyAction); - - selectAllAction = new TextViewerAction(textViewer, ITextOperationTarget.SELECT_ALL); - selectAllAction.setText(Policy.bind("HistoryView.selectAll")); //$NON-NLS-1$ - actionBars.setGlobalActionHandler(ITextEditorActionConstants.SELECT_ALL, selectAllAction); - - actionBars.updateActionBars(); - - menuMgr = new MenuManager(); - menuMgr.setRemoveAllWhenShown(true); - menuMgr.addMenuListener(new IMenuListener() { - public void menuAboutToShow(IMenuManager menuMgr) { - fillTextMenu(menuMgr); - } - }); - StyledText text = textViewer.getTextWidget(); - menu = menuMgr.createContextMenu(text); - text.setMenu(menu); - } - private void setViewerVisibility() { - boolean showText = toggleTextAction.isChecked(); - boolean showList = toggleListAction.isChecked(); - if (showText && showList) { - sashForm.setMaximizedControl(null); - innerSashForm.setMaximizedControl(null); - } else if (showText) { - sashForm.setMaximizedControl(null); - innerSashForm.setMaximizedControl(textViewer.getTextWidget()); - } else if (showList) { - sashForm.setMaximizedControl(null); - innerSashForm.setMaximizedControl(tagViewer.getTable()); - } else { - sashForm.setMaximizedControl(tableViewer.getControl()); - } - } - /* - * Method declared on IWorkbenchPart - */ - public void createPartControl(Composite parent) { - initializeImages(); - sashForm = new SashForm(parent, SWT.VERTICAL); - sashForm.setLayoutData(new GridData(GridData.FILL_BOTH)); - tableViewer = createTable(sashForm); - innerSashForm = new SashForm(sashForm, SWT.HORIZONTAL); - tagViewer = createTagTable(innerSashForm); - textViewer = createText(innerSashForm); - sashForm.setWeights(new int[] { 70, 30 }); - innerSashForm.setWeights(new int[] { 50, 50 }); - contributeActions(); - setViewerVisibility(); - // set F1 help - WorkbenchHelp.setHelp(sashForm, IHelpContextIds.RESOURCE_HISTORY_VIEW); - initDragAndDrop(); - } - private void initializeImages() { - CVSUIPlugin plugin = CVSUIPlugin.getPlugin(); - versionImage = plugin.getImageDescriptor(ICVSUIConstants.IMG_PROJECT_VERSION).createImage(); - branchImage = plugin.getImageDescriptor(ICVSUIConstants.IMG_TAG).createImage(); - } - /** - * Creates the group that displays lists of the available repositories - * and team streams. - * - * @param the parent composite to contain the group - * @return the group control - */ - protected TableViewer createTable(Composite parent) { - - historyTableProvider = new HistoryTableProvider(); - TableViewer viewer = historyTableProvider.createTable(parent); - - viewer.setContentProvider(new IStructuredContentProvider() { - public Object[] getElements(Object inputElement) { - // Short-circuit to optimize - if (entries != null) return entries; - - if (!(inputElement instanceof ICVSRemoteFile)) return null; - final ICVSRemoteFile remoteFile = (ICVSRemoteFile)inputElement; - final Object[][] result = new Object[1][]; - try { - new ProgressMonitorDialog(getViewer().getTable().getShell()).run(true, true, new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - try { - entries = remoteFile.getLogEntries(monitor); - result[0] = entries; - } catch (TeamException e) { - throw new InvocationTargetException(e); - } - } - }); - } catch (InterruptedException e) { // ignore cancellation - result[0] = new Object[0]; - } catch (InvocationTargetException e) { - CVSUIPlugin.openError(getViewSite().getShell(), null, null, e); - result[0] = new Object[0]; - } - return result[0]; - } - public void dispose() { - } - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - entries = null; - } - }); - - viewer.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - ISelection selection = event.getSelection(); - if (selection == null || !(selection instanceof IStructuredSelection)) { - textViewer.setDocument(new Document("")); //$NON-NLS-1$ - tagViewer.setInput(null); - return; - } - IStructuredSelection ss = (IStructuredSelection)selection; - if (ss.size() != 1) { - textViewer.setDocument(new Document("")); //$NON-NLS-1$ - tagViewer.setInput(null); - return; - } - ILogEntry entry = (ILogEntry)ss.getFirstElement(); - textViewer.setDocument(new Document(entry.getComment())); - tagViewer.setInput(entry.getTags()); - } - }); - - return viewer; - } - - private TableViewer createTagTable(Composite parent) { - Table table = new Table(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION | SWT.BORDER); - TableViewer result = new TableViewer(table); - TableLayout layout = new TableLayout(); - layout.addColumnData(new ColumnWeightData(100)); - table.setLayout(layout); - result.setContentProvider(new SimpleContentProvider() { - public Object[] getElements(Object inputElement) { - if (inputElement == null) return new Object[0]; - CVSTag[] tags = (CVSTag[])inputElement; - return tags; - } - }); - result.setLabelProvider(new LabelProvider() { - public Image getImage(Object element) { - if (element == null) return null; - CVSTag tag = (CVSTag)element; - switch (tag.getType()) { - case CVSTag.BRANCH: - case CVSTag.HEAD: - return branchImage; - case CVSTag.VERSION: - return versionImage; - } - return null; - } - public String getText(Object element) { - return ((CVSTag)element).getName(); - } - }); - result.setSorter(new ViewerSorter() { - public int compare(Viewer viewer, Object e1, Object e2) { - if (!(e1 instanceof CVSTag) || !(e2 instanceof CVSTag)) return super.compare(viewer, e1, e2); - CVSTag tag1 = (CVSTag)e1; - CVSTag tag2 = (CVSTag)e2; - int type1 = tag1.getType(); - int type2 = tag2.getType(); - if (type1 != type2) { - return type2 - type1; - } - return super.compare(viewer, tag1, tag2); - } - }); - return result; - } - protected TextViewer createText(Composite parent) { - TextViewer result = new TextViewer(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI | SWT.BORDER | SWT.READ_ONLY); - result.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - copyAction.update(); - } - }); - return result; - } - public void dispose() { - if (branchImage != null) { - branchImage.dispose(); - branchImage = null; - } - if (versionImage != null) { - versionImage.dispose(); - versionImage = null; - } - } - /** - * Returns the table viewer contained in this view. - */ - protected TableViewer getViewer() { - return tableViewer; - } - /** - * Adds drag and drop support to the history view. - */ - void initDragAndDrop() { - int ops = DND.DROP_MOVE | DND.DROP_COPY | DND.DROP_LINK; - Transfer[] transfers = new Transfer[] {ResourceTransfer.getInstance()}; - tableViewer.addDropSupport(ops, transfers, new HistoryDropAdapter(tableViewer, this)); - } - private void fillTableMenu(IMenuManager manager) { - // file actions go first (view file) - manager.add(new Separator(IWorkbenchActionConstants.GROUP_FILE)); - if (file != null) { - // Add the "Add to Workspace" action if 1 revision is selected. - ISelection sel = tableViewer.getSelection(); - if (!sel.isEmpty()) { - if (sel instanceof IStructuredSelection) { - if (((IStructuredSelection)sel).size() == 1) { - manager.add(getContentsAction); - manager.add(getRevisionAction); - manager.add(new Separator()); - manager.add(tagWithExistingAction); - } - } - } - } - manager.add(new Separator("additions")); //$NON-NLS-1$ - manager.add(refreshAction); - manager.add(new Separator("additions-end")); //$NON-NLS-1$ - } - private void fillTextMenu(IMenuManager manager) { - manager.add(copyAction); - manager.add(selectAllAction); - } - /** - * Makes the history view visible in the active perspective. If there - * isn't a history view registered <code>null</code> is returned. - * Otherwise the opened view part is returned. - */ - public static HistoryView openInActivePerspective() { - try { - return (HistoryView)CVSUIPlugin.getActivePage().showView(VIEW_ID); - } catch (PartInitException pe) { - return null; - } - } - /** (Non-javadoc) - * Method declared on IWorkbenchPart - */ - public void setFocus() { - if (tableViewer != null) { - Table control = tableViewer.getTable(); - if (control != null && !control.isDisposed()) { - control.setFocus(); - } - } - } - - /** - * Shows the history for the given IResource in the view. - * - * Only files are supported for now. - */ - public void showHistory(IResource resource) { - if (resource instanceof IFile) { - IFile file = (IFile)resource; - this.file = file; - RepositoryProvider teamProvider = RepositoryProvider.getProvider(file.getProject(), CVSProviderPlugin.getTypeId()); - if (teamProvider != null) { - this.provider = (CVSTeamProvider)teamProvider; - try { - // for a file this will return the base - ICVSRemoteFile remoteFile = (ICVSRemoteFile)CVSWorkspaceRoot.getRemoteResourceFor(file); - historyTableProvider.setFile(remoteFile); - tableViewer.setInput(remoteFile); - setTitle(Policy.bind("HistoryView.titleWithArgument", remoteFile.getName())); //$NON-NLS-1$ - selectRevision(remoteFile.getRevision()); - } catch (TeamException e) { - CVSUIPlugin.openError(getViewSite().getShell(), null, null, e); - } - } - return; - } - this.file = null; - tableViewer.setInput(null); - setTitle(Policy.bind("HistoryView.title")); //$NON-NLS-1$ - } - - /** - * Shows the history for the given ICVSRemoteFile in the view. - */ - public void showHistory(ICVSRemoteFile remoteFile) { - try { - if (remoteFile == null) { - tableViewer.setInput(null); - setTitle(Policy.bind("HistoryView.title")); //$NON-NLS-1$ - return; - } - this.file = null; - historyTableProvider.setFile(remoteFile); - tableViewer.setInput(remoteFile); - setTitle(Policy.bind("HistoryView.titleWithArgument", remoteFile.getName())); //$NON-NLS-1$ - selectRevision(remoteFile.getRevision()); - } catch (TeamException e) { - CVSUIPlugin.openError(getViewSite().getShell(), null, null, e); - } - } - - private Action getContextMenuAction(String title, final boolean needsProgressDialog, final IWorkspaceRunnable action) { - return new Action(title) { - public void run() { - try { - if (file == null) return; - ISelection selection = tableViewer.getSelection(); - if (!(selection instanceof IStructuredSelection)) return; - IStructuredSelection ss = (IStructuredSelection)selection; - Object o = ss.getFirstElement(); - currentSelection = (ILogEntry)o; - if(needsProgressDialog) { - new ProgressMonitorDialog(getViewSite().getShell()).run(false, true, new WorkspaceModifyOperation() { - protected void execute(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - try { - action.run(monitor); - } catch (CoreException e) { - throw new InvocationTargetException(e); - } - } - }); - } else { - try { - action.run(null); - } catch (CoreException e) { - throw new InvocationTargetException(e); - } - } - } catch (InvocationTargetException e) { - CVSUIPlugin.openError(getViewSite().getShell(), null, null, e, CVSUIPlugin.LOG_NONTEAM_EXCEPTIONS); - } catch (InterruptedException e) { - // Do nothing - } - } - - public boolean isEnabled() { - ISelection selection = tableViewer.getSelection(); - if (!(selection instanceof IStructuredSelection)) return false; - IStructuredSelection ss = (IStructuredSelection)selection; - if(ss.size() != 1) return false; - return true; - } - }; - } - - private boolean confirmOverwrite() { - if (file!=null && file.exists()) { - ICVSFile cvsFile = CVSWorkspaceRoot.getCVSFileFor(file); - try { - if(cvsFile.isModified(null)) { - String title = Policy.bind("HistoryView.overwriteTitle"); //$NON-NLS-1$ - String msg = Policy.bind("HistoryView.overwriteMsg"); //$NON-NLS-1$ - final MessageDialog dialog = new MessageDialog(getViewSite().getShell(), title, null, msg, MessageDialog.QUESTION, new String[] { IDialogConstants.YES_LABEL, IDialogConstants.CANCEL_LABEL }, 0); - final int[] result = new int[1]; - getViewSite().getShell().getDisplay().syncExec(new Runnable() { - public void run() { - result[0] = dialog.open(); - }}); - if (result[0] != 0) { - // cancel - return false; - } - } - } catch(CVSException e) { - CVSUIPlugin.log(e); - } - } - return true; - } - - /* - * Refresh the view by refetching the log entries for the remote file - */ - private void refresh() { - entries = null; - BusyIndicator.showWhile(tableViewer.getTable().getDisplay(), new Runnable() { - public void run() { - // if a local file was fed to the history view then we will have to refetch the handle - // to properly display the current revision marker. - if(file != null) { - ICVSRemoteFile remoteFile; - try { - remoteFile = (ICVSRemoteFile) CVSWorkspaceRoot.getRemoteResourceFor(file); - historyTableProvider.setFile(remoteFile); - } catch (CVSException e) { - // use previously fetched remote file, but log error - CVSUIPlugin.log(e); - } - } - tableViewer.refresh(); - } - }); - } - - /** - * Select the revision in the receiver. - */ - public void selectRevision(String revision) { - if (entries == null) { - return; - } - - ILogEntry entry = null; - for (int i = 0; i < entries.length; i++) { - if (entries[i].getRevision().equals(revision)) { - entry = entries[i]; - break; - } - } - - if (entry != null) { - IStructuredSelection selection = new StructuredSelection(entry); - tableViewer.setSelection(selection, true); - } - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java deleted file mode 100644 index 601b615dc..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java +++ /dev/null @@ -1,140 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.team.internal.ccvs.ui; - -public interface ICVSUIConstants { - public static final String PREFIX = CVSUIPlugin.ID + "."; //$NON-NLS-1$ - - // image path - public final String ICON_PATH = "icons/full/"; //$NON-NLS-1$ - - // images - - // overlays - public final String IMG_MERGEABLE_CONFLICT = "ovr16/confauto_ov.gif"; //$NON-NLS-1$ - public final String IMG_QUESTIONABLE = "ovr16/question_ov.gif"; //$NON-NLS-1$ - public final String IMG_MERGED = "ovr16/merged_ov.gif"; //$NON-NLS-1$ - public final String IMG_EDITED = "ovr16/edited_ov.gif"; //$NON-NLS-1$ - public final String IMG_NO_REMOTEDIR = "ovr16/no_remotedir_ov.gif"; //$NON-NLS-1$ - - // objects - public final String IMG_REPOSITORY = "obj16/repository_rep.gif"; //$NON-NLS-1$ - public final String IMG_TAG = "obj16/tag.gif"; //$NON-NLS-1$ - public final String IMG_BRANCHES_CATEGORY = "obj16/branches_rep.gif"; //$NON-NLS-1$ - public final String IMG_VERSIONS_CATEGORY = "obj16/versions_rep.gif"; //$NON-NLS-1$ - public final String IMG_MODULE = "obj16/module_rep.gif"; //$NON-NLS-1$ - public final String IMG_PROJECT_VERSION = "obj16/prjversions_rep.gif"; //$NON-NLS-1$ - - // toolbar - public final String IMG_REFRESH = "clcl16/refresh.gif"; //$NON-NLS-1$ - public final String IMG_CLEAR = "clcl16/clear_co.gif"; //$NON-NLS-1$ - public final String IMG_COLLAPSE_ALL = "clcl16/collapseall.gif"; //$NON-NLS-1$ - - // toolbar (disabled) - public final String IMG_REFRESH_DISABLED = "dlcl16/refresh.gif"; //$NON-NLS-1$ - public final String IMG_CLEAR_DISABLED = "dlcl16/clear_co.gif"; //$NON-NLS-1$ - - // toolbar (enabled) - public final String IMG_REFRESH_ENABLED = "elcl16/refresh.gif"; //$NON-NLS-1$ - public final String IMG_CLEAR_ENABLED = "elcl16/clear_co.gif"; //$NON-NLS-1$ - public final String IMG_COLLAPSE_ALL_ENABLED = "elcl16/collapseall.gif"; //$NON-NLS-1$ - - // wizards - public final String IMG_NEWLOCATION = "wizards/newlocation_wiz.gif"; //$NON-NLS-1$ - - // preferences - public final String PREF_SHOW_COMMENTS = "pref_show_comments"; //$NON-NLS-1$ - public final String PREF_SHOW_TAGS = "pref_show_tags"; //$NON-NLS-1$ - public final String PREF_PRUNE_EMPTY_DIRECTORIES = "pref_prune_empty_directories"; //$NON-NLS-1$ - public final String PREF_TIMEOUT = "pref_timeout"; //$NON-NLS-1$ - public final String PREF_QUIETNESS = "pref_quietness"; //$NON-NLS-1$ - public final String PREF_CVS_RSH = "pref_cvs_rsh"; //$NON-NLS-1$ - public final String PREF_CVS_RSH_PARAMETERS = "pref_cvs_rsh_parameters"; //$NON-NLS-1$ - public final String PREF_CVS_SERVER = "pref_cvs_server"; //$NON-NLS-1$ - public final String PREF_CONSIDER_CONTENTS = "pref_consider_contents"; //$NON-NLS-1$ - public final String PREF_REPLACE_UNMANAGED = "pref_replace_unmanaged"; //$NON-NLS-1$ - public final String PREF_COMPRESSION_LEVEL = "pref_compression_level"; //$NON-NLS-1$ - public final String PREF_TEXT_KSUBST = "pref_text_ksubst"; //$NON-NLS-1$ - public final String PREF_PROMPT_ON_MIXED_TAGS = "pref_prompt_on_mixed_tags"; //$NON-NLS-1$ - public final String PREF_PROMPT_ON_SAVING_IN_SYNC = "pref_prompt_on_saving_in_sync"; //$NON-NLS-1$ - public final String PREF_SAVE_DIRTY_EDITORS = "pref_save_dirty_editors"; //$NON-NLS-1$ - public final String PREF_PROMPT_ON_CHANGE_GRANULARITY = "pref_prompt_on_change_granularity"; //$NON-NLS-1$ - public final String PREF_REPOSITORIES_ARE_BINARY = "pref_repositories_are_binary"; //$NON-NLS-1$ - public final String PREF_DETERMINE_SERVER_VERSION = "pref_determine_server_version"; //$NON-NLS-1$ - public final String PREF_CONFIRM_MOVE_TAG = "pref_confirm_move_tag"; //$NON-NLS-1$ - - // console preferences - public final String PREF_CONSOLE_COMMAND_COLOR = "pref_console_command_color"; //$NON-NLS-1$ - public final String PREF_CONSOLE_MESSAGE_COLOR = "pref_console_message_color"; //$NON-NLS-1$ - public final String PREF_CONSOLE_ERROR_COLOR = "pref_console_error_color"; //$NON-NLS-1$ - public final String PREF_CONSOLE_FONT = "pref_console_font"; //$NON-NLS-1$ - - // decorator preferences - public final String PREF_FILETEXT_DECORATION = "pref_filetext_decoration"; //$NON-NLS-1$ - public final String PREF_FOLDERTEXT_DECORATION = "pref_foldertext_decoration"; //$NON-NLS-1$ - public final String PREF_PROJECTTEXT_DECORATION = "pref_projecttext_decoration"; //$NON-NLS-1$ - - public final String PREF_SHOW_DIRTY_DECORATION = "pref_show_overlaydirty"; //$NON-NLS-1$ - public final String PREF_SHOW_ADDED_DECORATION = "pref_show_added"; //$NON-NLS-1$ - public final String PREF_SHOW_HASREMOTE_DECORATION = "pref_show_hasremote"; //$NON-NLS-1$ - public final String PREF_SHOW_NEWRESOURCE_DECORATION = "pref_show_newresource"; //$NON-NLS-1$ - - public final String PREF_DIRTY_FLAG = "pref_dirty_flag"; //$NON-NLS-1$ - public final String PREF_ADDED_FLAG = "pref_added_flag"; //$NON-NLS-1$ - - public final String PREF_CALCULATE_DIRTY = "pref_calculate_dirty"; //$NON-NLS-1$ - - public final String PREF_SHOW_SYNCINFO_AS_TEXT = "pref_show_syncinfo_as_text"; //$NON-NLS-1$ - - // watch/edit preferences - public final String PREF_CHECKOUT_READ_ONLY = "pref_checkout_read_only"; //$NON-NLS-1$ - public final String PREF_EDIT_ACTION = "pref_edit_action"; //$NON-NLS-1$ - - // Repositories view preferences - public final String PREF_GROUP_VERSIONS_BY_PROJECT = "pref_group_versions_by_project"; //$NON-NLS-1$ - - // Wizard banners - public final String IMG_WIZBAN_SHARE = "wizban/newconnect_wizban.gif"; //$NON-NLS-1$ - public final String IMG_WIZBAN_MERGE = "wizban/mergestream_wizban.gif"; //$NON-NLS-1$ - public final String IMG_WIZBAN_DIFF = "wizban/createpatch_wizban.gif"; //$NON-NLS-1$ - public final String IMG_WIZBAN_KEYWORD = "wizban/keywordsub_wizban.gif"; //$NON-NLS-1$ - public final String IMG_WIZBAN_NEW_LOCATION = "wizban/newlocation_wizban.gif"; //$NON-NLS-1$ - // XXX checkout is same as ne connect. If it changes, it must be initialized - public final String IMG_WIZBAN_CHECKOUT = "wizban/newconnect_wizban.gif"; //$NON-NLS-1$ - - // Properties - public final String PROP_NAME = "cvs.name"; //$NON-NLS-1$ - public final String PROP_REVISION = "cvs.revision"; //$NON-NLS-1$ - public final String PROP_AUTHOR = "cvs.author"; //$NON-NLS-1$ - public final String PROP_COMMENT = "cvs.comment"; //$NON-NLS-1$ - public final String PROP_DATE = "cvs.date"; //$NON-NLS-1$ - public final String PROP_DIRTY = "cvs.dirty"; //$NON-NLS-1$ - public final String PROP_MODIFIED = "cvs.modified"; //$NON-NLS-1$ - public final String PROP_KEYWORD = "cvs.date"; //$NON-NLS-1$ - public final String PROP_TAG = "cvs.tag"; //$NON-NLS-1$ - public final String PROP_PERMISSIONS = "cvs.permissions"; //$NON-NLS-1$ - public final String PROP_HOST = "cvs.host"; //$NON-NLS-1$ - public final String PROP_USER = "cvs.user"; //$NON-NLS-1$ - public final String PROP_METHOD = "cvs.method"; //$NON-NLS-1$ - public final String PROP_PORT = "cvs.port"; //$NON-NLS-1$ - public final String PROP_ROOT = "cvs.root"; //$NON-NLS-1$ - - // preference options - public final int OPTION_NEVER = 1; //$NON-NLS-1$ - public final int OPTION_PROMPT = 2; //$NON-NLS-1$ - public final int OPTION_AUTOMATIC = 3; - - // work in progress preferences - public final String BACKGROUND_REPOVIEW = PREFIX + "background_repoview"; - public final String BACKGROUND_OPERATIONS = PREFIX + "background_operations"; -} - diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IHelpContextIds.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IHelpContextIds.java deleted file mode 100644 index 6fbaab5b0..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IHelpContextIds.java +++ /dev/null @@ -1,132 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -/** - * Here's how to reference the help context in code: - * - * WorkbenchHelp.setHelp(actionOrControl, IHelpContextIds.NAME_DEFIED_BELOW); - */ -public interface IHelpContextIds { - - public static final String PREFIX = CVSUIPlugin.ID + "."; //$NON-NLS-1$ - - // Dialogs - public static final String TAG_CONFIGURATION_OVERVIEW = PREFIX + "tag_configuration_overview"; //$NON-NLS-1$ - public static final String TAG_CONFIGURATION_REFRESHLIST = PREFIX + "tag_configuration_refreshlist"; //$NON-NLS-1$ - public static final String TAG_CONFIGURATION_REFRESHACTION = PREFIX + "tag_configuration_refreshaction"; //$NON-NLS-1$ - public static final String USER_VALIDATION_DIALOG = PREFIX + "user_validation_dialog_context"; //$NON-NLS-1$ - public static final String RELEASE_COMMENT_DIALOG = PREFIX + "release_comment_dialog_context"; //$NON-NLS-1$ - public static final String BRANCH_DIALOG = PREFIX + "branch_dialog_context"; //$NON-NLS-1$ - public static final String ADD_TO_VERSION_CONTROL_DIALOG = PREFIX + "add_to_version_control_dialog_context"; //$NON-NLS-1$ - public static final String SYNCHRONIZE_PROJECTS_DIALOG = PREFIX + "sychronize_projects_dialog_context"; //$NON-NLS-1$ - public static final String EDITORS_DIALOG = PREFIX + "editors_dialog_context"; //$NON-NLS-1$ - public static final String HISTORY_FILTER_DIALOG = PREFIX + "history_filter_dialog_context"; //$NON-NLS-1$ - - // Different uses of the TagSelectionDialog - public static final String REPLACE_TAG_SELECTION_DIALOG = PREFIX + "replace_tag_selection_dialog_context"; //$NON-NLS-1$ - public static final String COMPARE_TAG_SELECTION_DIALOG = PREFIX + "compare_tag_selection_dialog_context"; //$NON-NLS-1$ - public static final String TAG_REMOTE_WITH_EXISTING_DIALOG = PREFIX + "tag_remote_with_existing_dialog_context"; //$NON-NLS-1$ - public static final String SHARE_WITH_EXISTING_TAG_SELETION_DIALOG = PREFIX + "share_with_existing_tag_selection_dialog_context"; //$NON-NLS-1$ - - // Different uses of the TagAsVersionDialog - public static final String TAG_AS_VERSION_DIALOG = PREFIX + "tag_as_version_dialog_context"; //$NON-NLS-1$ - - // Wizard Pages - public static final String SHARING_AUTOCONNECT_PAGE = PREFIX + "sharing_autoconnect_page_context"; //$NON-NLS-1$ - public static final String SHARING_SELECT_REPOSITORY_PAGE = PREFIX + "sharing_select_repository_page_context"; //$NON-NLS-1$ - public static final String SHARING_NEW_REPOSITORY_PAGE = PREFIX + "sharing_new_repository_page_context"; //$NON-NLS-1$ - public static final String SHARING_MODULE_PAGE = PREFIX + "sharing_module_page_context"; //$NON-NLS-1$ - public static final String SHARING_FINISH_PAGE = PREFIX + "sharing_finish_page_context"; //$NON-NLS-1$ - public static final String PATCH_SELECTION_PAGE = PREFIX + "patch_selection_page_context"; //$NON-NLS-1$ - public static final String PATCH_OPTIONS_PAGE = PREFIX + "patch_options_page_context"; //$NON-NLS-1$ - public static final String KEYWORD_SUBSTITUTION_SELECTION_PAGE = PREFIX + "keyword_substituton_selection_page_context"; //$NON-NLS-1$ - public static final String KEYWORD_SUBSTITUTION_SUMMARY_PAGE = PREFIX + "keyword_substituton_summary_page_context"; //$NON-NLS-1$ - public static final String KEYWORD_SUBSTITUTION_SHARED_PAGE = PREFIX + "keyword_substituton_shared_page_context"; //$NON-NLS-1$ - public static final String KEYWORD_SUBSTITUTION_CHANGED_PAGE = PREFIX + "keyword_substituton_changed_page_context"; //$NON-NLS-1$ - public static final String KEYWORD_SUBSTITUTION_COMMIT_COMMENT_PAGE = PREFIX + "keyword_substituton_commit_comment_page_context"; //$NON-NLS-1$ - public static final String MERGE_START_PAGE = PREFIX + "merge_start_page_context"; //$NON-NLS-1$ - public static final String MERGE_END_PAGE = PREFIX + "merge_end_page_context"; //$NON-NLS-1$ - public static final String CHECKOUT_INTO_RESOURCE_SELECTION_PAGE = PREFIX + "checkout_into_resource_selection_page_context"; //$NON-NLS-1$ - public static final String RESTORE_FROM_REPOSITORY_FILE_SELECTION_PAGE = PREFIX + "restore_from_repository_file_selection_page_context"; //$NON-NLS-1$ - public static final String WORKING_SET_FOLDER_SELECTION_PAGE = PREFIX + "working_set_folder_selection_page_context"; //$NON-NLS-1$ - public static final String REFRESH_REMOTE_PROJECT_SELECTION_PAGE = PREFIX + "refresh_remote_project_selection_page_context"; //$NON-NLS-1$ - - // Preference Pages - public static final String PREF_PRUNE = PREFIX + "prune_empty_directories_pref"; //$NON-NLS-1$ - public static final String PREF_QUIET = PREFIX + "quietness_level_pref"; //$NON-NLS-1$ - public static final String PREF_COMPRESSION = PREFIX + "compression_level_pref"; //$NON-NLS-1$ - public static final String PREF_KEYWORDMODE = PREFIX + "default_keywordmode_pref"; //$NON-NLS-1$ - public static final String PREF_COMMS_TIMEOUT = PREFIX + "comms_timeout_pref"; //$NON-NLS-1$ - public static final String PREF_CONSIDER_CONTENT = PREFIX + "consider_content_pref"; //$NON-NLS-1$ - public static final String PREF_REPLACE_DELETE_UNMANAGED = PREFIX + "replace_deletion_of_unmanaged_pref"; //$NON-NLS-1$ - public static final String PREF_SAVE_DIRTY_EDITORS = PREFIX + "save_dirty_editors_pref"; //$NON-NLS-1$ - public static final String PREF_TREAT_NEW_FILE_AS_BINARY = PREFIX + "treat_new_files_as_binary_pref"; //$NON-NLS-1$ - public static final String PREF_DETERMINE_SERVER_VERSION = PREFIX + "determine_server_version"; //$NON-NLS-1$ - public static final String PREF_CONFIRM_MOVE_TAG = PREFIX + "confirm_move_tag"; //$NON-NLS-1$ - - public static final String CONSOLE_PREFERENCE_PAGE = PREFIX + "console_preference_page_context"; //$NON-NLS-1$ - public static final String EXT_PREFERENCE_PAGE = PREFIX + "ext_preference_page_context"; //$NON-NLS-1$ - public static final String EXT_PREFERENCE_RSH = PREFIX + "ext_preference_rsh_context"; //$NON-NLS-1$ - public static final String EXT_PREFERENCE_PARAM = PREFIX + "ext_preference_param_context"; //$NON-NLS-1$ - public static final String EXT_PREFERENCE_SERVER = PREFIX + "ext_preference_server_context"; //$NON-NLS-1$ - public static final String DECORATORS_PREFERENCE_PAGE = PREFIX + "decorators_preference_page_context"; //$NON-NLS-1$ - public static final String WATCH_EDIT_PREFERENCE_PAGE = PREFIX + "watch_edit_preference_page_context"; //$NON-NLS-1$ - - // Views - public static final String CONSOLE_VIEW = PREFIX + "console_view_context"; //$NON-NLS-1$ - public static final String REPOSITORIES_VIEW = PREFIX + "repositories_view_context"; //$NON-NLS-1$ - public static final String RESOURCE_HISTORY_VIEW = PREFIX + "resource_history_view_context"; //$NON-NLS-1$ - public static final String COMPARE_REVISIONS_VIEW = PREFIX + "compare_revision_view_context"; //$NON-NLS-1$ - public static final String CVS_EDITORS_VIEW = PREFIX + "cvs_editors_view_context"; //$NON-NLS-1$ - public static final String ANNOTATE_VIEW = PREFIX + "annotate_view_context"; //$NON-NLS-1$ - - // Viewers - public static final String CATCHUP_RELEASE_VIEWER = PREFIX + "catchup_release_viewer_context"; //$NON-NLS-1$ - - // Add to .cvsignore dialog - public static final String ADD_TO_CVSIGNORE = PREFIX + "add_to_cvsignore_context"; //$NON-NLS-1$ - - // Actions - public static final String GET_ANNOTATE_ACTION = PREFIX + "get_annotate_action_context"; //$NON-NLS-1$ - public static final String GET_FILE_REVISION_ACTION = PREFIX + "get_file_revision_action_context"; //$NON-NLS-1$ - public static final String GET_FILE_CONTENTS_ACTION = PREFIX + "get_file_contents_action_context"; //$NON-NLS-1$ - public static final String TAG_WITH_EXISTING_ACTION = PREFIX + "tag_with_existing_action_context"; //$NON-NLS-1$ - public static final String NEW_REPOSITORY_LOCATION_ACTION = PREFIX + "new_repository_location_action_context"; //$NON-NLS-1$ - public static final String NEW_DEV_ECLIPSE_REPOSITORY_LOCATION_ACTION = PREFIX + "new_dev_eclipse repository_location_action_context"; //$NON-NLS-1$ - public static final String SHOW_COMMENT_IN_HISTORY_ACTION = PREFIX + "show_comment_in_history_action_context"; //$NON-NLS-1$ - public static final String SHOW_TAGS_IN_HISTORY_ACTION = PREFIX + "show_tag_in_history_action_context"; //$NON-NLS-1$ - public static final String SELECT_WORKING_SET_ACTION = PREFIX + "select_working_set_action_context"; //$NON-NLS-1$ - public static final String DESELECT_WORKING_SET_ACTION = PREFIX + "deselect_working_set_action_context"; //$NON-NLS-1$ - public static final String EDIT_WORKING_SET_ACTION = PREFIX + "edit_working_set_action_context"; //$NON-NLS-1$ - public static final String REMOVE_REPOSITORY_LOCATION_ACTION = PREFIX + "remove_root_action_context"; //$NON-NLS-1$ - public static final String SHOW_IN_RESOURCE_HISTORY = PREFIX + "show_in_history_action_context"; //$NON-NLS-1$ - public static final String SELECT_NEW_RESOURCES_ACTION = PREFIX + "select_new_action_context"; //$NON-NLS-1$ - public static final String CONFIRM_MERGE_ACTION = PREFIX + "confirm_merge_action_context"; //$NON-NLS-1$; - public static final String DISCONNECT_ACTION = PREFIX + "disconnect_action_context"; //$NON-NLS-1$; - - // Sync view menu actions - public static final String SYNC_COMMIT_ACTION = PREFIX + "sync_commit_action_context"; //$NON-NLS-1$ - public static final String SYNC_FORCED_COMMIT_ACTION = PREFIX + "sync_forced_commit_action_context"; //$NON-NLS-1$ - public static final String SYNC_UPDATE_ACTION = PREFIX + "sync_update_action_context"; //$NON-NLS-1$ - public static final String SYNC_FORCED_UPDATE_ACTION = PREFIX + "sync_forced_update_action_context"; //$NON-NLS-1$ - public static final String SYNC_ADD_ACTION = PREFIX + "sync_add_action_context"; //$NON-NLS-1$ - public static final String SYNC_IGNORE_ACTION = PREFIX + "sync_ignore_action_context"; //$NON-NLS-1$ - public static final String MERGE_UPDATE_ACTION = PREFIX + "merge_update_action_context"; //$NON-NLS-1$ - public static final String MERGE_FORCED_UPDATE_ACTION = PREFIX + "merge_forced_update_action_context"; //$NON-NLS-1$ - public static final String MERGE_UPDATE_WITH_JOIN_ACTION = PREFIX + "merge_update_with_joinaction_context"; //$NON-NLS-1$ - - // properties pages - public static final String REPOSITORY_LOCATION_PROPERTY_PAGE = PREFIX + "repository_location_property_page_context"; //$NON-NLS-1$ - public static final String PROJECT_PROPERTY_PAGE = PREFIX + "project_property_page_context"; //$NON-NLS-1$ - public static final String FOLDER_PROPERTY_PAGE = PREFIX + "folder_property_page_context"; //$NON-NLS-1$ - public static final String FILE_PROPERTY_PAGE = PREFIX + "file_property_page_context"; //$NON-NLS-1$ -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IRepositoryListener.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IRepositoryListener.java deleted file mode 100644 index e488cdf7f..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IRepositoryListener.java +++ /dev/null @@ -1,20 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; - -public interface IRepositoryListener { - public void repositoryAdded(ICVSRepositoryLocation root); - public void repositoryRemoved(ICVSRepositoryLocation root); - public void repositoriesChanged(ICVSRepositoryLocation[] roots); -} - diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IgnoreResourcesDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IgnoreResourcesDialog.java deleted file mode 100644 index caccc1fe5..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IgnoreResourcesDialog.java +++ /dev/null @@ -1,258 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import org.eclipse.core.resources.IResource; -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.dialogs.IDialogSettings; -import org.eclipse.jface.resource.JFaceColors; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.Text; -import org.eclipse.team.internal.ccvs.core.util.FileNameMatcher; -import org.eclipse.ui.help.WorkbenchHelp; - -public class IgnoreResourcesDialog extends Dialog { - // resources that should be ignored - private IResource[] resources; - - // preference keys - private final String ACTION_KEY = "Action"; //$NON-NLS-1$ - private static final int ADD_NAME_ENTRY = 0; - private static final int ADD_EXTENSION_ENTRY = 1; - private static final int ADD_CUSTOM_ENTRY = 2; - - // dialogs settings that are persistent between workbench sessions - private IDialogSettings settings; - - // buttons - private Button addNameEntryButton; - private Button addExtensionEntryButton; - private Button addCustomEntryButton; - private Text customEntryText; - private Label statusMessageLabel; - - private int selectedAction; - private String customPattern; - - // layout controls - private static final int LABEL_WIDTH_HINT = 400; - private static final int LABEL_INDENT_WIDTH = 32; - - /** - * Creates a new dialog for ignoring resources. - * @param shell the parent shell - * @param resources the array of resources to be ignored - */ - public IgnoreResourcesDialog(Shell shell, IResource[] resources) { - super(shell); - this.resources = resources; - - IDialogSettings workbenchSettings = CVSUIPlugin.getPlugin().getDialogSettings(); - this.settings = workbenchSettings.getSection("IgnoreResourcesDialog");//$NON-NLS-1$ - if (settings == null) { - this.settings = workbenchSettings.addNewSection("IgnoreResourcesDialog");//$NON-NLS-1$ - } - - try { - selectedAction = settings.getInt(ACTION_KEY); - } catch (NumberFormatException e) { - selectedAction = ADD_NAME_ENTRY; - } - } - - /** - * Determines the ignore pattern to use for a resource given the selected action. - * - * @param resource the resource - * @return the ignore pattern for the specified resource - */ - public String getIgnorePatternFor(IResource resource) { - switch (selectedAction) { - case ADD_NAME_ENTRY: - return resource.getName(); - case ADD_EXTENSION_ENTRY: { - String extension = resource.getFileExtension(); - return (extension == null) ? resource.getName() : "*." + extension; //$NON-NLS-1$ - } - case ADD_CUSTOM_ENTRY: - return customPattern; - } - throw new IllegalStateException(); - } - - /* (non-Javadoc) - * Method declared on Dialog. - */ - protected void createButtonsForButtonBar(Composite parent) { - createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true); - createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false); - } - - /* (non-Javadoc) - * Method declared on Dialog. - */ - protected void configureShell(Shell newShell) { - super.configureShell(newShell); - if (resources.length == 1) { - newShell.setText(Policy.bind("IgnoreResourcesDialog.titleSingle", resources[0].getName())); //$NON-NLS-1$ - } else { - newShell.setText(Policy.bind("IgnoreResourcesDialog.titleMany", Integer.toString(resources.length))); //$NON-NLS-1$ - } - } - - /* (non-Javadoc) - * Method declared on Dialog. - */ - protected Control createContents(Composite parent) { - Control control = super.createContents(parent); - updateEnablements(); - return control; - } - - /* (non-Javadoc) - * Method declared on Dialog. - */ - protected Control createDialogArea(Composite parent) { - Composite top = new Composite(parent, SWT.NONE); - top.setLayout(new GridLayout()); - - WorkbenchHelp.setHelp(top, IHelpContextIds.ADD_TO_CVSIGNORE); - - createIndentedLabel(top, Policy.bind("IgnoreResourcesDialog.prompt"), 0); //$NON-NLS-1$ - - Listener selectionListener = new Listener() { - public void handleEvent(Event event) { - updateEnablements(); - } - }; - Listener modifyListener = new Listener() { - public void handleEvent(Event event) { - validate(); - } - }; - - addNameEntryButton = createRadioButton(top, Policy.bind("IgnoreResourcesDialog.addNameEntryButton")); //$NON-NLS-1$ - addNameEntryButton.addListener(SWT.Selection, selectionListener); - addNameEntryButton.setSelection(selectedAction == ADD_NAME_ENTRY); - createIndentedLabel(top, Policy.bind("IgnoreResourcesDialog.addNameEntryExample"), LABEL_INDENT_WIDTH); //$NON-NLS-1$ - - addExtensionEntryButton = createRadioButton(top, Policy.bind("IgnoreResourcesDialog.addExtensionEntryButton")); //$NON-NLS-1$ - addExtensionEntryButton.addListener(SWT.Selection, selectionListener); - addExtensionEntryButton.setSelection(selectedAction == ADD_EXTENSION_ENTRY); - createIndentedLabel(top, Policy.bind("IgnoreResourcesDialog.addExtensionEntryExample"), LABEL_INDENT_WIDTH); //$NON-NLS-1$ - - addCustomEntryButton = createRadioButton(top, Policy.bind("IgnoreResourcesDialog.addCustomEntryButton")); //$NON-NLS-1$ - addCustomEntryButton.addListener(SWT.Selection, selectionListener); - addCustomEntryButton.setSelection(selectedAction == ADD_CUSTOM_ENTRY); - createIndentedLabel(top, Policy.bind("IgnoreResourcesDialog.addCustomEntryExample"), LABEL_INDENT_WIDTH); //$NON-NLS-1$ - - customEntryText = createIndentedText(top, resources[0].getName(), LABEL_INDENT_WIDTH); - customEntryText.addListener(SWT.Modify, modifyListener); - - statusMessageLabel = createIndentedLabel(top, "", 0); //$NON-NLS-1$ - statusMessageLabel.setFont(parent.getFont()); - return top; - } - - /* (non-Javadoc) - * Method declared on Dialog. - */ - protected void okPressed() { - settings.put(ACTION_KEY, selectedAction); - super.okPressed(); - } - - private Label createIndentedLabel(Composite parent, String text, int indent) { - Label label = new Label(parent, SWT.LEFT); - label.setText(text); - GridData data = new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.FILL_HORIZONTAL); - data.horizontalIndent = indent; - label.setLayoutData(data); - return label; - } - - private Text createIndentedText(Composite parent, String text, int indent) { - Text textbox = new Text(parent, SWT.BORDER); - textbox.setText(text); - GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL); - data.horizontalIndent = indent; - textbox.setLayoutData(data); - return textbox; - } - - private Label createWrappingLabel(Composite parent, String text) { - Label label = new Label(parent, SWT.WRAP); - label.setText(text); - GridData data = new GridData(GridData.FILL_BOTH); - data.widthHint = LABEL_WIDTH_HINT; - label.setLayoutData(data); - return label; - } - - private Button createRadioButton(Composite parent, String text) { - Button button = new Button(parent, SWT.RADIO); - button.setText(text); - button.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.FILL_HORIZONTAL)); - return button; - } - - private void updateEnablements() { - if (addNameEntryButton.getSelection()) { - selectedAction = ADD_NAME_ENTRY; - } else if (addExtensionEntryButton.getSelection()) { - selectedAction = ADD_EXTENSION_ENTRY; - } else if (addCustomEntryButton.getSelection()) { - selectedAction = ADD_CUSTOM_ENTRY; - } - customEntryText.setEnabled(selectedAction == ADD_CUSTOM_ENTRY); - validate(); - } - - private void validate() { - if (selectedAction == ADD_CUSTOM_ENTRY) { - customPattern = customEntryText.getText(); - if (customPattern.length() == 0) { - setError(Policy.bind("IgnoreResourcesDialog.patternMustNotBeEmpty")); //$NON-NLS-1$ - return; - } - FileNameMatcher matcher = new FileNameMatcher(new String[] { customPattern }); - for (int i = 0; i < resources.length; i++) { - String name = resources[i].getName(); - if (! matcher.match(name)) { - setError(Policy.bind("IgnoreResourcesDialog.patternDoesNotMatchFile", name)); //$NON-NLS-1$ - return; - } - } - } - setError(null); - } - - private void setError(String text) { - if (text == null) { - statusMessageLabel.setText(""); //$NON-NLS-1$ - getButton(IDialogConstants.OK_ID).setEnabled(true); - } else { - statusMessageLabel.setText(text); - statusMessageLabel.setForeground(JFaceColors.getErrorText(getShell().getDisplay())); - getButton(IDialogConstants.OK_ID).setEnabled(false); - } - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ListSelectionArea.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ListSelectionArea.java deleted file mode 100644 index bab62a4dc..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ListSelectionArea.java +++ /dev/null @@ -1,202 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.viewers.CheckStateChangedEvent; -import org.eclipse.jface.viewers.CheckboxTableViewer; -import org.eclipse.jface.viewers.ICheckStateListener; -import org.eclipse.jface.viewers.ILabelProvider; -import org.eclipse.jface.viewers.IStructuredContentProvider; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.team.internal.ui.dialogs.DialogArea; - -/** - * Reusable area that provides a list to select from and a select all and - * deselect all button. - */ -public class ListSelectionArea extends DialogArea { - private Object inputElement; - private IStructuredContentProvider contentProvider; - private ILabelProvider labelProvider; - private String message; - private List initialSelections; - - // the visual selection widget group - private CheckboxTableViewer listViewer; - - private Object[] previousCheckedElements; - - // sizing constants - private final static int SIZING_SELECTION_WIDGET_HEIGHT = 250; - private final static int SIZING_SELECTION_WIDGET_WIDTH = 300; - - public static final String LIST_SELECTION = "ListSelection"; //$NON-NLS-1$ - - /** - * Constructor for ListSelectionArea. - * @param parentDialog - * @param settings - */ - public ListSelectionArea( - Dialog parentDialog, - Object input, - IStructuredContentProvider contentProvider, - ILabelProvider labelProvider, - String message) { - super(parentDialog, null); - this.inputElement = input; - this.contentProvider = contentProvider; - this.labelProvider = labelProvider; - this.message = message; - this.initialSelections = new ArrayList(); - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.DialogArea#createArea(org.eclipse.swt.widgets.Composite) - */ - public Control createArea(Composite parent) { - Composite composite = createComposite(parent, 1); - initializeDialogUnits(composite); - - if (message != null) - createWrappingLabel(composite, message, 1); - - listViewer = CheckboxTableViewer.newCheckList(composite, SWT.BORDER); - GridData data = new GridData(GridData.FILL_BOTH); - data.heightHint = SIZING_SELECTION_WIDGET_HEIGHT; - data.widthHint = SIZING_SELECTION_WIDGET_WIDTH; - listViewer.getTable().setLayoutData(data); - - listViewer.setLabelProvider(labelProvider); - listViewer.setContentProvider(contentProvider); - listViewer.getControl().setFont(composite.getFont()); - - listViewer.addCheckStateListener(new ICheckStateListener() { - public void checkStateChanged(CheckStateChangedEvent event) { - Object[] checkedElements = getViewer().getCheckedElements(); - firePropertyChangeChange(LIST_SELECTION, previousCheckedElements, checkedElements); - previousCheckedElements = checkedElements; - } - }); - - addSelectionButtons(composite); - - initializeViewer(); - - // initialize page - if (!getInitialElementSelections().isEmpty()) - checkInitialSelections(); - - return composite; - } - - /** - * Initializes this dialog's viewer after it has been laid out. - */ - private void initializeViewer() { - listViewer.setInput(inputElement); - } - - /** - * Visually checks the previously-specified elements in this dialog's list - * viewer. - */ - private void checkInitialSelections() { - Iterator itemsToCheck = getInitialElementSelections().iterator(); - - while (itemsToCheck.hasNext()) - listViewer.setChecked(itemsToCheck.next(),true); - } - - /** - * Add the selection and deselection buttons to the dialog. - * @param composite org.eclipse.swt.widgets.Composite - */ - private void addSelectionButtons(Composite composite) { - Composite buttonComposite = new Composite(composite, SWT.RIGHT); - buttonComposite.setFont(composite.getFont()); - GridLayout layout = new GridLayout(); - layout.numColumns = 2; - buttonComposite.setLayout(layout); - GridData data = new GridData(GridData.HORIZONTAL_ALIGN_END | GridData.GRAB_HORIZONTAL); - data.grabExcessHorizontalSpace = true; - composite.setData(data); - - Button selectButton = createButton(buttonComposite, Policy.bind("ListSelectionArea.selectAll"), GridData.HORIZONTAL_ALIGN_FILL); //$NON-NLS-1$ - - SelectionListener listener = new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - listViewer.setAllChecked(true); - } - }; - selectButton.addSelectionListener(listener); - - - Button deselectButton = createButton(buttonComposite, Policy.bind("ListSelectionArea.deselectAll"), GridData.HORIZONTAL_ALIGN_FILL); //$NON-NLS-1$ - - listener = new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - listViewer.setAllChecked(false); - - } - }; - deselectButton.addSelectionListener(listener); - } - - /** - * Returns the list of initial element selections. - * @return List - */ - protected List getInitialElementSelections(){ - return initialSelections; - } - - /** - * Sets the initial selection in this selection dialog to the given elements. - * - * @param selectedElements the array of elements to select - */ - public void setInitialSelections(Object[] selectedElements) { - initialSelections = new ArrayList(selectedElements.length); - for (int i = 0; i < selectedElements.length; i++) - initialSelections.add(selectedElements[i]); - } - - /** - * Sets the initial selection in this selection dialog to the given elements. - * - * @param selectedElements the List of elements to select - */ - public void setInitialElementSelections(List selectedElements) { - initialSelections = selectedElements; - } - /** - * Returns the listViewer. - * @return CheckboxTableViewer - */ - public CheckboxTableViewer getViewer() { - return listViewer; - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/MessageDialogWithToggle.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/MessageDialogWithToggle.java deleted file mode 100644 index 0867c280b..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/MessageDialogWithToggle.java +++ /dev/null @@ -1,256 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.team.internal.ccvs.ui; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Shell; - -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.preference.IPreferenceStore; - -import org.eclipse.ui.internal.WorkbenchMessages; - -/** - * A message dialog which also allows the user to adjust a toggle setting. - * - * This is typically used to allow the user to indicate whether the dialog - * should be shown in the future. - */ -public class MessageDialogWithToggle extends MessageDialog { - - /** - * The message displayed to the user, with the toggle button - */ - private String toggleMessage = null; - private boolean toggleState = false; - private Button toggleButton = null; - - /** - * The preference store which will be affected by the toggle button - */ - IPreferenceStore fStore = null; - - /** - * Creates a message dialog with a toggle. - * See the superclass constructor for info on the other parameters. - * - * @param toggleMessage the message for the toggle control, or <code>null</code> - * for the default message ("Do not show this message again"). - * @param toggleState the initial state for the toggle - * - */ - public MessageDialogWithToggle(Shell parentShell, String dialogTitle, Image image, String message, int dialogImageType, String[] dialogButtonLabels, int defaultIndex, String toggleMessage, boolean toggleState) { - super(parentShell, dialogTitle, image, message, dialogImageType, dialogButtonLabels, defaultIndex); - this.toggleMessage = toggleMessage; - this.toggleState = toggleState; - } - - /** - * Returns the toggle state. This can be called even after the dialog - * is closed. - * - * @return <code>true</code> if the toggle button is checked, - * <code>false</code> if not - */ - public boolean getToggleState() { - return toggleState; - } - - /* (non-Javadoc) - * Method declared in Dialog. - */ - protected Control createDialogArea(Composite parent) { - Composite dialogArea = (Composite) super.createDialogArea(parent); - toggleButton = createToggleButton(dialogArea); - return dialogArea; - } - - /** - * Creates a toggle button with the toggle message and state. - */ - protected Button createToggleButton(Composite parent) { - final Button button= new Button(parent, SWT.CHECK | SWT.LEFT); - String text = toggleMessage; - if (text == null) { - text = WorkbenchMessages.getString("MessageDialogWithToggle.defaultToggleMessage"); //$NON-NLS-1$ - } - button.setText(text); - button.setSelection(toggleState); - - GridData data = new GridData(SWT.NONE); - data.horizontalSpan= 2; - data.horizontalAlignment= GridData.CENTER; - button.setLayoutData(data); - button.setFont(parent.getFont()); - - button.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - toggleState = button.getSelection(); - } - - }); - return button; - } - - /** - * Returns the toggle button. - * - * @return the toggle button - */ - protected Button getToggleButton() { - return toggleButton; - } - - /** - * Convenience method to open a simple confirm (OK/Cancel) dialog. - * - * @param parent the parent shell of the dialog, or <code>null</code> if none - * @param title the dialog's title, or <code>null</code> if none - * @param message the message - * @param toggleMessage the message for the toggle control, or <code>null</code> - * for the default message ("Don't show me this message again"). - * @param toggleState the initial state for the toggle - * @return the dialog, after being closed by the user, which the client can - * only call <code>getReturnCode()</code> or <code>getToggleState()</code> - */ - public static MessageDialogWithToggle openConfirm(Shell parent, String title, String message, String toggleMessage, boolean toggleState) { - MessageDialogWithToggle dialog = new MessageDialogWithToggle( - parent, - title, - null, // accept the default window icon - message, - QUESTION, - new String[] {IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL}, - 0, // OK is the default - toggleMessage, - toggleState); - dialog.open(); - return dialog; - } - - /** - * Convenience method to open a standard error dialog. - * - * @param parent the parent shell of the dialog, or <code>null</code> if none - * @param title the dialog's title, or <code>null</code> if none - * @param message the message - * @param toggleMessage the message for the toggle control, or <code>null</code> - * for the default message ("Don't show me this message again"). - * @param toggleState the initial state for the toggle - * @return the dialog, after being closed by the user, which the client can - * only call <code>getReturnCode()</code> or <code>getToggleState()</code> - */ - public static MessageDialogWithToggle openError(Shell parent, String title, String message, String toggleMessage, boolean toggleState) { - MessageDialogWithToggle dialog = new MessageDialogWithToggle( - parent, - title, - null, // accept the default window icon - message, - ERROR, - new String[] {IDialogConstants.OK_LABEL}, - 0, // ok is the default - toggleMessage, - toggleState); - dialog.open(); - return dialog; - } - - /** - * Convenience method to open a standard information dialog. - * - * @param parent the parent shell of the dialog, or <code>null</code> if none - * @param title the dialog's title, or <code>null</code> if none - * @param message the message - * @param toggleMessage the message for the toggle control, or <code>null</code> - * for the default message ("Don't show me this message again"). - * @param toggleState the initial state for the toggle - * @return the dialog, after being closed by the user, which the client can - * only call <code>getReturnCode()</code> or <code>getToggleState()</code> - */ - public static MessageDialogWithToggle openInformation(Shell parent, String title, String message, String toggleMessage, boolean toggleState) { - MessageDialogWithToggle dialog = new MessageDialogWithToggle( - parent, - title, - null, // accept the default window icon - message, - INFORMATION, - new String[] { IDialogConstants.OK_LABEL }, - 0, // ok is the default - toggleMessage, - toggleState); - dialog.open(); - return dialog; - } - - /** - * Convenience method to open a simple Yes/No question dialog. - * - * @param parent the parent shell of the dialog, or <code>null</code> if none - * @param title the dialog's title, or <code>null</code> if none - * @param message the message - * @param toggleMessage the message for the toggle control, or <code>null</code> - * for the default message ("Don't show me this message again"). - * @param toggleState the initial state for the toggle - * @return the dialog, after being closed by the user, which the client can - * only call <code>getReturnCode()</code> or <code>getToggleState()</code> - */ - public static MessageDialogWithToggle openQuestion(Shell parent, String title, String message, String toggleMessage, boolean toggleState) { - MessageDialogWithToggle dialog = new MessageDialogWithToggle( - parent, - title, - null, // accept the default window icon - message, - QUESTION, - new String[] {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL}, - 1, // no is the default - toggleMessage, - toggleState); - dialog.open(); - return dialog; - } - - /** - * Convenience method to open a standard warning dialog. - * - * @param parent the parent shell of the dialog, or <code>null</code> if none - * @param title the dialog's title, or <code>null</code> if none - * @param message the message - * @param toggleMessage the message for the toggle control, or <code>null</code> - * for the default message ("Don't show me this message again"). - * @param toggleState the initial state for the toggle - * @return the dialog, after being closed by the user, which the client can - * only call <code>getReturnCode()</code> or <code>getToggleState()</code> - */ - public static MessageDialogWithToggle openWarning(Shell parent, String title, String message, String toggleMessage, boolean toggleState) { - MessageDialogWithToggle dialog = new MessageDialogWithToggle( - parent, - title, - null, // accept the default window icon - message, - WARNING, - new String[] {IDialogConstants.OK_LABEL}, - 0, // ok is the default - toggleMessage, - toggleState); - dialog.open(); - return dialog; - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/OverlayIcon.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/OverlayIcon.java deleted file mode 100644 index a7e0c4051..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/OverlayIcon.java +++ /dev/null @@ -1,80 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import java.util.Arrays; - -import org.eclipse.jface.resource.CompositeImageDescriptor; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.graphics.Point; - -/** - * An OverlayIcon consists of a main icon and several adornments. - */ -public abstract class OverlayIcon extends CompositeImageDescriptor { - // the base image - private Image base; - // the overlay images - private ImageDescriptor[] overlays; - // the size - private Point size; - // the locations - private int[] locations; - - public static final int TOP_LEFT = 0; - public static final int TOP_RIGHT = 1; - public static final int BOTTOM_LEFT = 2; - public static final int BOTTOM_RIGHT = 3; - - /** - * OverlayIcon constructor. - * - * @param base the base image - * @param overlays the overlay images - * @param locations the location of each image - * @param size the size - */ - public OverlayIcon(Image base, ImageDescriptor[] overlays, int[] locations, Point size) { - this.base = base; - this.overlays = overlays; - this.locations = locations; - this.size = size; - } - /** - * Superclasses override to draw the overlays. - */ - protected abstract void drawOverlays(ImageDescriptor[] overlays, int[] locations); - - public boolean equals(Object o) { - if (! (o instanceof OverlayIcon)) return false; - OverlayIcon other = (OverlayIcon) o; - return base.equals(other.base) && Arrays.equals(overlays, other.overlays); - } - - public int hashCode() { - int code = base.hashCode(); - for (int i = 0; i < overlays.length; i++) { - code ^= overlays[i].hashCode(); - } - return code; - } - - - protected void drawCompositeImage(int width, int height) { - drawImage(base.getImageData(), 0, 0); - drawOverlays(overlays, locations); - } - - protected Point getSize() { - return size; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/OverlayIconCache.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/OverlayIconCache.java deleted file mode 100644 index fc7baf14f..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/OverlayIconCache.java +++ /dev/null @@ -1,49 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - -import org.eclipse.swt.graphics.Image; - -/** - * Maintains a cache of OverlayIcons. - */ -public class OverlayIconCache { - private Map /*from OverlayIcon to Image*/ cache = new HashMap(); - - /** - * Returns and caches an image corresponding to the specified icon. - * @param icon the icon - * @return the image - */ - public Image getImageFor(OverlayIcon icon) { - Image image = (Image) cache.get(icon); - if (image == null) { - image = icon.createImage(); - cache.put(icon, image); - } - return image; - } - - /** - * Disposes of all images in the cache. - */ - public void disposeAll() { - for (Iterator it = cache.values().iterator(); it.hasNext();) { - Image image = (Image) it.next(); - image.dispose(); - } - cache.clear(); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/Policy.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/Policy.java deleted file mode 100644 index 711f518ae..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/Policy.java +++ /dev/null @@ -1,125 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - - -import java.text.MessageFormat; -import java.util.MissingResourceException; -import java.util.ResourceBundle; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.SubProgressMonitor; -import org.eclipse.team.internal.core.InfiniteSubProgressMonitor; - -public class Policy { - public static boolean DEBUG_CONSOLE_BUFFERING = false; - - static { - //init debug options - if (CVSUIPlugin.getPlugin().isDebugging()) { - DEBUG_CONSOLE_BUFFERING = "true".equalsIgnoreCase(Platform.getDebugOption(CVSUIPlugin.ID + "/consolebuffering")); //$NON-NLS-1$ //$NON-NLS-2$ - } - } - - protected static ResourceBundle bundle = null; - - /** - * Creates a NLS catalog for the given locale. - */ - public static void localize(String bundleName) { - bundle = ResourceBundle.getBundle(bundleName); - } - - /** - * Lookup the message with the given ID in this catalog and bind its - * substitution locations with the given string. - */ - public static String bind(String id, String binding) { - return bind(id, new String[] { binding }); - } - - /** - * Lookup the message with the given ID in this catalog and bind its - * substitution locations with the given strings. - */ - public static String bind(String id, String binding1, String binding2) { - return bind(id, new String[] { binding1, binding2 }); - } - - /** - * Gets a string from the resource bundle. We don't want to crash because of a missing String. - * Returns the key if not found. - */ - public static String bind(String key) { - try { - return bundle.getString(key); - } catch (MissingResourceException e) { - return key; - } catch (NullPointerException e) { - return "!" + key + "!"; //$NON-NLS-1$ //$NON-NLS-2$ - } - } - - /** - * Gets a string from the resource bundle and binds it with the given arguments. If the key is - * not found, return the key. - */ - public static String bind(String key, Object[] args) { - try { - return MessageFormat.format(bind(key), args); - } catch (MissingResourceException e) { - return key; - } catch (NullPointerException e) { - return "!" + key + "!"; //$NON-NLS-1$ //$NON-NLS-2$ - } - } - - /** - * Progress monitor helpers - */ - public static void checkCanceled(IProgressMonitor monitor) { - if (monitor.isCanceled()) - cancelOperation(); - } - public static void cancelOperation() { - throw new OperationCanceledException(); - } - public static IProgressMonitor monitorFor(IProgressMonitor monitor) { - if (monitor == null) - return new NullProgressMonitor(); - return monitor; - } - public static IProgressMonitor subMonitorFor(IProgressMonitor monitor, int ticks) { - if (monitor == null) - return new NullProgressMonitor(); - if (monitor instanceof NullProgressMonitor) - return monitor; - return new SubProgressMonitor(monitor, ticks); - } - public static IProgressMonitor subMonitorFor(IProgressMonitor monitor, int ticks, int style) { - if (monitor == null) - return new NullProgressMonitor(); - if (monitor instanceof NullProgressMonitor) - return monitor; - return new SubProgressMonitor(monitor, ticks, style); - } - - public static IProgressMonitor infiniteSubMonitorFor(IProgressMonitor monitor, int ticks) { - if (monitor == null) - return new NullProgressMonitor(); - if (monitor instanceof NullProgressMonitor) - return monitor; - return new InfiniteSubProgressMonitor(monitor, ticks); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ReleaseCommentDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ReleaseCommentDialog.java deleted file mode 100644 index d7b8c40ac..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ReleaseCommentDialog.java +++ /dev/null @@ -1,78 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import org.eclipse.core.resources.IResource; -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.util.IPropertyChangeListener; -import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.help.WorkbenchHelp; - -/** - * Prompts the user for a multi-line comment for releasing to CVS. - */ -public class ReleaseCommentDialog extends Dialog { - - CommitCommentArea commitCommentArea; - - /** - * ReleaseCommentDialog constructor. - * - * @param parentShell the parent of this dialog - */ - public ReleaseCommentDialog(Shell parentShell, IResource[] resourcesToCommit) { - super(parentShell); - int shellStyle = getShellStyle(); - setShellStyle(shellStyle | SWT.RESIZE); - commitCommentArea = new CommitCommentArea(this, null); - // Get a project from which the commit template can be obtained - if (resourcesToCommit.length > 0) - commitCommentArea.setProject(resourcesToCommit[0].getProject()); - } - - /* - * @see Dialog#createDialogArea(Composite) - */ - protected Control createDialogArea(Composite parent) { - getShell().setText(Policy.bind("ReleaseCommentDialog.title")); //$NON-NLS-1$ - Composite composite = new Composite(parent, SWT.NULL); - composite.setLayout(new GridLayout()); - composite.setLayoutData(new GridData(GridData.FILL_BOTH)); - - commitCommentArea.createArea(composite); - commitCommentArea.addPropertyChangeListener(new IPropertyChangeListener() { - public void propertyChange(PropertyChangeEvent event) { - if (event.getProperty() == CommitCommentArea.OK_REQUESTED) - okPressed(); - } - }); - - // set F1 help - WorkbenchHelp.setHelp(composite, IHelpContextIds.RELEASE_COMMENT_DIALOG); - - return composite; - } - - /** - * Returns the comment. - * @return String - */ - public String getComment() { - return commitCommentArea.getComment(); - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteAnnotationEditorInput.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteAnnotationEditorInput.java deleted file mode 100644 index 7cac5cff7..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteAnnotationEditorInput.java +++ /dev/null @@ -1,48 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import java.io.InputStream; - -import org.eclipse.core.resources.IStorage; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFile; -import org.eclipse.ui.IStorageEditorInput; -import org.eclipse.ui.model.IWorkbenchAdapter; - -/** - * An editor input for a cvs annotation response - */ -public class RemoteAnnotationEditorInput extends RemoteFileEditorInput implements IWorkbenchAdapter, IStorageEditorInput { - - InputStream contents; - - /** - * @param contents - */ - public RemoteAnnotationEditorInput(ICVSRemoteFile file, InputStream contents) { - super(file); - this.contents = contents; - } - - /** - * Returns the underlying IStorage object. - * - * @return an IStorage object. - * @exception CoreException if this method fails - */ - public IStorage getStorage() throws CoreException { - if (storage == null) { - storage = new RemoteAnnotationStorage(file, contents); - } - return storage; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteAnnotationStorage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteAnnotationStorage.java deleted file mode 100644 index 93240eec2..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteAnnotationStorage.java +++ /dev/null @@ -1,35 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import java.io.InputStream; - -import org.eclipse.core.resources.IStorage; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFile; - -public class RemoteAnnotationStorage extends RemoteFileStorage implements IStorage { - - InputStream contents; - - /** - * @param file - */ - public RemoteAnnotationStorage(ICVSRemoteFile file, InputStream contents) { - super(file); - this.contents = contents; - } - - public InputStream getContents() throws CoreException { - return contents; - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteFileEditorInput.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteFileEditorInput.java deleted file mode 100644 index 99b915571..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteFileEditorInput.java +++ /dev/null @@ -1,195 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - - -import org.eclipse.core.resources.IStorage; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.Path; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFile; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.ui.IPersistableElement; -import org.eclipse.ui.IStorageEditorInput; -import org.eclipse.ui.model.IWorkbenchAdapter; - -/** - * An editor input for a file in a repository. - */ -public class RemoteFileEditorInput implements IWorkbenchAdapter, IStorageEditorInput { - ICVSRemoteFile file; - IStorage storage; - - /** - * Creates FileEditionEditorInput on the given file. - */ - public RemoteFileEditorInput(ICVSRemoteFile file) { - this.file = file; - } - /** - * Returns whether the editor input exists. - * <p> - * This method is primarily used to determine if an editor input should - * appear in the "File Most Recently Used" menu. An editor input will appear - * in the list until the return value of <code>exists</code> becomes - * <code>false</code> or it drops off the bottom of the list. - * - * @return <code>true</code> if the editor input exists; <code>false</code> - * otherwise - */ - public boolean exists() { - return true; - } - public boolean equals(Object o) { - if (!(o instanceof RemoteFileEditorInput)) return false; - RemoteFileEditorInput input = (RemoteFileEditorInput)o; - return file.equals(input.file); - } - /** - * Returns an object which is an instance of the given class - * associated with this object. Returns <code>null</code> if - * no such object can be found. - * - * @param adapter the adapter class to look up - * @return a object castable to the given class, - * or <code>null</code> if this object does not - * have an adapter for the given class - */ - public Object getAdapter(Class adapter) { - if (adapter == IWorkbenchAdapter.class) { - return this; - } - return null; - } - /** - * Returns the children of this object. When this object - * is displayed in a tree, the returned objects will be this - * element's children. Returns an empty array if this - * object has no children. - * - * @param object The object to get the children for. - */ - public Object[] getChildren(Object o) { - return new Object[0]; - } - /** - * Returns the content type of the input. For instance, if the input - * wraps an <code>IFile</code> the content type would be derived from - * the extension or mime type. If the input wraps another object it - * may just be the object type. The content type is used for - * editor mapping. - */ - public String getContentType() { - String name = file.getName(); - return name.substring(name.lastIndexOf('.')+1); - } - /** - * Returns the fully qualified path name of the input. - */ - public String getFullPath() { - //use path to make sure slashes are correct - ICVSRepositoryLocation location = file.getRepository(); - IPath path = new Path(location.getRootDirectory()); - path = path.setDevice(location.getHost() + Path.DEVICE_SEPARATOR); - path = path.append(file.getRepositoryRelativePath()); - String fullPath; - try { - String revision = file.getRevision(); - fullPath = Policy.bind("RemoteFileEditorInput.fullPathAndRevision", path.toString(), revision); //$NON-NLS-1$ - } catch (TeamException e) { - CVSUIPlugin.log(e); - fullPath = path.toString(); - } - return fullPath; - } - /** - * Returns the image descriptor for this input. - * - * @return the image descriptor for this input - */ - public ImageDescriptor getImageDescriptor() { - IWorkbenchAdapter fileAdapter = (IWorkbenchAdapter)file.getAdapter(IWorkbenchAdapter.class); - return fileAdapter == null ? null : fileAdapter.getImageDescriptor(file); - } - /** - * @see IWorkbenchAdapter#getImageDescriptor - */ - public ImageDescriptor getImageDescriptor(Object object) { - IWorkbenchAdapter fileAdapter = (IWorkbenchAdapter)file.getAdapter(IWorkbenchAdapter.class); - return fileAdapter == null ? null : fileAdapter.getImageDescriptor(file); - } - /** - * @see IWorkbenchAdapter#getLabel - */ - public String getLabel(Object o) { - return file.getName(); - } - /** - * Returns the input name for display purposes. For instance, if - * the fully qualified input name is "a\b\MyFile.gif" the return value for - * <code>getName</code> is "MyFile.gif". - */ - public String getName() { - String name = file.getName(); - try { - return Policy.bind("nameAndRevision", name, file.getRevision()); //$NON-NLS-1$ - } catch (TeamException e) { - return name; - } - } - /** - * Returns the logical parent of the given object in its tree. - * Returns <code>null</code> if there is no parent, or if this object doesn't - * belong to a tree. - * - * @param object The object to get the parent for. - */ - public Object getParent(Object o) { - return null; - } - /* - * Returns an interface used to persist the object. If the editor input - * cannot be persisted this method returns <code>null</code>. - */ - public IPersistableElement getPersistable() { - //not persistable - return null; - } - /** - * Returns the underlying IStorage object. - * - * @return an IStorage object. - * @exception CoreException if this method fails - */ - public IStorage getStorage() throws CoreException { - if (storage == null) { - storage = new RemoteFileStorage(file); - } - return storage; - } - /** - * Returns the tool tip text for this editor input. This text - * is used to differentiate between two input with the same name. - * For instance, MyClass.java in folder X and MyClass.java in folder Y. - * <p> - * The format of the path will vary with each input type. For instance, - * if the editor input is of type <code>IFileEditorInput</code> this method - * should return the fully qualified resource path. For editor input of - * other types it may be different. - * </p> - * @return the tool tip text - */ - public String getToolTipText() { - return getFullPath(); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteFileStorage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteFileStorage.java deleted file mode 100644 index d9c6b27be..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteFileStorage.java +++ /dev/null @@ -1,80 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - - -import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.core.resources.IStorage; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.PlatformObject; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFile; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; - -public class RemoteFileStorage extends PlatformObject implements IStorage { - ICVSRemoteFile file; - public RemoteFileStorage(ICVSRemoteFile file) { - this.file = file; - } - - /** - * Returns an open input stream on the contents of this file. - * The client is responsible for closing the stream when finished. - * - * @return an input stream containing the contents of the file - * @exception CoreException if this method fails. - */ - public InputStream getContents() throws CoreException { - try { - final InputStream[] holder = new InputStream[1]; - CVSUIPlugin.runWithProgress(null, true /*cancelable*/, new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - try { - holder[0] = file.getContents(monitor); - } catch (TeamException e) { - throw new InvocationTargetException(e); - } - } - }); - return holder[0]; - } catch (InterruptedException e) { - // operation canceled - } catch (InvocationTargetException e) { - Throwable t = e.getTargetException(); - if (t instanceof TeamException) { - throw new CoreException(((TeamException) t).getStatus()); - } - // should not get here - } - return new ByteArrayInputStream(new byte[0]); - } - public IPath getFullPath() { - ICVSRepositoryLocation location = file.getRepository(); - IPath path = new Path(location.getRootDirectory()); - path = path.setDevice(location.getHost() + Path.DEVICE_SEPARATOR); - path = path.append(file.getRepositoryRelativePath()); - return path; - } - public String getName() { - return file.getName(); - } - public boolean isReadOnly() { - return true; - } -} - diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ResizableWizardDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ResizableWizardDialog.java deleted file mode 100644 index 2025039f5..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ResizableWizardDialog.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - - -import org.eclipse.jface.wizard.IWizard; -import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Shell; - -public class ResizableWizardDialog extends WizardDialog { - /** - * Creates a new resizable wizard dialog. - */ - public ResizableWizardDialog(Shell parent, IWizard wizard) { - super(parent, wizard); - setShellStyle(getShellStyle() | SWT.RESIZE); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ResourceEditionNode.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ResourceEditionNode.java deleted file mode 100644 index 20cd55497..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ResourceEditionNode.java +++ /dev/null @@ -1,158 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - - -import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.compare.CompareUI; -import org.eclipse.compare.IStreamContentAccessor; -import org.eclipse.compare.ITypedElement; -import org.eclipse.compare.structuremergeviewer.IStructureComparator; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.swt.graphics.Image; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.core.sync.IRemoteResource; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteResource; - -/** - * A class for comparing ICVSRemoteResource objects - */ -public class ResourceEditionNode implements IStructureComparator, ITypedElement, IStreamContentAccessor { - private ICVSRemoteResource resource; - private ResourceEditionNode[] children; - - /** - * Creates a new ResourceEditionNode on the given resource edition. - */ - public ResourceEditionNode(ICVSRemoteResource resourceEdition) { - this.resource = resourceEdition; - } - - /** - * Returns true if both resources names are identical. - * The content is not considered. - * @see IComparator#equals - */ - public boolean equals(Object other) { - if (other instanceof ITypedElement) { - String otherName = ((ITypedElement)other).getName(); - return getName().equals(otherName); - } - return super.equals(other); - } - - /** - * Enumerate children of this node (if any). - */ - public Object[] getChildren() { - if (children == null) { - children = new ResourceEditionNode[0]; - if (resource != null) { - try { - CVSUIPlugin.runWithProgress(null, true /*cancelable*/, new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - try { - IRemoteResource[] members = resource.members(monitor); - children = new ResourceEditionNode[members.length]; - for (int i = 0; i < members.length; i++) { - children[i] = new ResourceEditionNode((ICVSRemoteResource)members[i]); - } - } catch (TeamException e) { - throw new InvocationTargetException(e); - } - } - }); - } catch (InterruptedException e) { - // operation canceled - } catch (InvocationTargetException e) { - Throwable t = e.getTargetException(); - if (t instanceof TeamException) { - CVSUIPlugin.log(((TeamException) t)); - } - } - } - } - return children; - } - - /** - * @see IStreamContentAccessor#getContents() - */ - public InputStream getContents() throws CoreException { - if (resource == null) { - return null; - } - try { - final InputStream[] holder = new InputStream[1]; - CVSUIPlugin.runWithProgress(null, true /*cancelable*/, new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - try { - holder[0] = resource.getContents(monitor); - } catch (TeamException e) { - throw new InvocationTargetException(e); - } - } - }); - return holder[0]; - } catch (InterruptedException e) { - // operation canceled - } catch (InvocationTargetException e) { - Throwable t = e.getTargetException(); - if (t instanceof TeamException) { - throw new CoreException(((TeamException) t).getStatus()); - } - // should not get here - } - return new ByteArrayInputStream(new byte[0]); - } - - public Image getImage() { - return CompareUI.getImage(resource); - } - - /** - * Returns the name of this node. - */ - public String getName() { - return resource == null ? "" : resource.getName(); //$NON-NLS-1$ - } - - public ICVSRemoteResource getRemoteResource() { - return resource; - } - - /** - * Returns the comparison type for this node. - */ - public String getType() { - if (resource == null) { - return UNKNOWN_TYPE; - } - if (resource.isContainer()) { - return FOLDER_TYPE; - } - String name = resource.getName(); - name = name.substring(name.lastIndexOf('.') + 1); - return name.length() == 0 ? UNKNOWN_TYPE : name; - } - - /** - * @see IComparator#equals - */ - public int hashCode() { - return getName().hashCode(); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ResourcePropertiesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ResourcePropertiesPage.java deleted file mode 100644 index f3da7e29b..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ResourcePropertiesPage.java +++ /dev/null @@ -1,109 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - - -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Label; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo; -import org.eclipse.ui.dialogs.PropertyPage; - -/** - * A property page which displays the CVS-specific properties for the - * selected resource. - */ -public class ResourcePropertiesPage extends PropertyPage { - // The resource to show properties for - IResource resource; - - /* - * @see PreferencePage#createContents(Composite) - */ - protected Control createContents(Composite parent) { - Composite composite = new Composite(parent, SWT.NONE); - GridLayout layout = new GridLayout(); - layout.numColumns = 2; - layout.marginHeight = layout.marginWidth = 0; - composite.setLayout(layout); - composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - - try { - IResource resource = getSelectedElement(); - if (resource != null) { - ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource); - if (!cvsResource.isManaged()) { - createPair(composite, Policy.bind("ResourcePropertiesPage.status"), Policy.bind("ResourcePropertiesPage.notManaged")); //$NON-NLS-1$ //$NON-NLS-2$ - } else { - boolean hasRemote = false; - if(cvsResource.isFolder()) { - hasRemote = ((ICVSFolder)cvsResource).isCVSFolder(); - } else { - ResourceSyncInfo info = cvsResource.getSyncInfo(); - if(info!=null && !info.isAdded()) { - hasRemote = true; - } - } - createPair(composite, Policy.bind("ResourcePropertiesPage.status"), hasRemote ? Policy.bind("ResourcePropertiesPage.versioned") : Policy.bind("ResourcePropertiesPage.notVersioned")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - } - } catch (TeamException e) { - createPair(composite, Policy.bind("ResourcePropertiesPage.error"), e.getMessage()); //$NON-NLS-1$ - } - return composite; - } - - /** - * Creates a key-value property pair in the given parent. - * - * @param parent the parent for the labels - * @param left the string for the left label - * @param right the string for the right label - */ - protected void createPair(Composite parent, String left, String right) { - Label label = new Label(parent, SWT.NONE); - label.setText(left); - - label = new Label(parent, SWT.NONE); - label.setText(right); - label.setToolTipText(right); - label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - } - - /** - * Returns the element selected when the properties was run - * - * @return the selected element - */ - protected IResource getSelectedElement() { - // get the resource that is the source of this property page - IResource resource = null; - IAdaptable element = getElement(); - if (element instanceof IResource) { - resource = (IResource)element; - } else { - Object adapter = element.getAdapter(IResource.class); - if (adapter instanceof IResource) { - resource = (IResource)adapter; - } - } - return resource; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/SimpleContentProvider.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/SimpleContentProvider.java deleted file mode 100644 index 6fa9117f8..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/SimpleContentProvider.java +++ /dev/null @@ -1,47 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - - -import org.eclipse.jface.viewers.*; - -/** - * A default content provider to prevent subclasses from - * having to implement methods they don't need. - */ -public class SimpleContentProvider implements IStructuredContentProvider { - - /** - * SimpleContentProvider constructor. - */ - public SimpleContentProvider() { - super(); - } - - /* - * @see SimpleContentProvider#dispose() - */ - public void dispose() { - } - - /* - * @see SimpleContentProvider#getElements() - */ - public Object[] getElements(Object element) { - return new Object[0]; - } - - /* - * @see SimpleContentProvider#inputChanged() - */ - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/SynchronizeProjectsDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/SynchronizeProjectsDialog.java deleted file mode 100644 index 9c3465f68..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/SynchronizeProjectsDialog.java +++ /dev/null @@ -1,177 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.dialogs.IDialogSettings; -import org.eclipse.jface.util.IPropertyChangeListener; -import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.graphics.Font; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.IWorkingSet; -import org.eclipse.ui.help.WorkbenchHelp; - -/** - * - */ -public class SynchronizeProjectsDialog extends Dialog { - - private Button outgoingChangesButton; - - private static final String SYNC_OUTGOING_CHANGES = "SyncOutgoingChanges"; //$NON-NLS-1$ - - IWorkingSet workingSet; - boolean syncOutgoingChanges; - - // dialogs settings that are persistent between workbench sessions - private IDialogSettings settings; - private WorkingSetSelectionArea workingSetArea; - - /** - * Creates a filter selection dialog. - * - * @param parentShell the parent shell - * @param input the root element to populate this dialog with - * @param contentProvider the content provider for navigating the model - * @param labelProvider the label provider for displaying model elements - * @param message the message to be displayed at the top of this dialog, or - * <code>null</code> to display a default message - */ - public SynchronizeProjectsDialog(Shell parentShell) { - super(parentShell); - IDialogSettings workbenchSettings = CVSUIPlugin.getPlugin().getDialogSettings(); - this.settings = workbenchSettings.getSection("SynchronizeProjectsDialog");//$NON-NLS-1$ - if (settings == null) { - this.settings = workbenchSettings.addNewSection("SynchronizeProjectsDialog");//$NON-NLS-1$ - } - } - - /** - * Overrides method in Dialog - * - * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(Composite) - */ - protected Control createDialogArea(Composite parent) { - // page group - Composite composite = (Composite)super.createDialogArea(parent); - - Font font = parent.getFont(); - composite.setFont(font); - - workingSetArea = new WorkingSetSelectionArea(this, Policy.bind("SynchronizeProjectsDialog.allSharedProjects"), Policy.bind("SynchronizeProjectsDialog.sharedWorkingSetProjects"), settings); //$NON-NLS-1$ //$NON-NLS-2$ - setWorkingSet(workingSet); - workingSetArea.addPropertyChangeListener(new IPropertyChangeListener() { - public void propertyChange(PropertyChangeEvent event) { - workingSet = (IWorkingSet)event.getNewValue(); - } - }); - workingSetArea.createArea(composite); - - // Create the checkbox to enable/disable working set use - outgoingChangesButton = createCheckbox(composite, Policy.bind("SynchronizeProjectsDialog.syncOutgoingChanges")); //$NON-NLS-1$ - outgoingChangesButton.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - syncOutgoingChanges = outgoingChangesButton.getSelection(); - } - }); - if (settings != null) { - syncOutgoingChanges = settings.getBoolean(SYNC_OUTGOING_CHANGES); - outgoingChangesButton.setSelection(syncOutgoingChanges); - } - - // F1 Help - WorkbenchHelp.setHelp(composite, IHelpContextIds.SYNCHRONIZE_PROJECTS_DIALOG); - - return composite; - } - - /* (non-Javadoc) - * Method declared on Window. - */ - protected void configureShell(Shell newShell) { - super.configureShell(newShell); - newShell.setText(Policy.bind("SynchronizeProjectsDialog.title")); //$NON-NLS-1$ - } - /** - * Returns the selected working set or null if none is selected. - * - * @return the selected working set or null if none is selected. - */ - public IWorkingSet getWorkingSet() { - return workingSet; - } - - /** - * Overrides method in Dialog - * - * @see org.eclipse.jface.dialogs.Dialog#okPressed() - */ - protected void okPressed() { - workingSet = workingSetArea.getWorkingSet(); - if (workingSet != null) { - workingSetArea.useSelectedWorkingSet(); - } - if (settings != null) { - settings.put(SYNC_OUTGOING_CHANGES, outgoingChangesButton.getSelection()); - } - super.okPressed(); - } - /** - * Sets the working set that should be selected in the most recently - * used working set list. - * - * @param workingSet the working set that should be selected. - * has to exist in the list returned by - * org.eclipse.ui.IWorkingSetManager#getRecentWorkingSets(). - * Must not be null. - */ - public void setWorkingSet(IWorkingSet workingSet) { - this.workingSet = workingSet; - - if (workingSetArea != null) { - workingSetArea.setWorkingSet(workingSet); - } - } - - protected Button createCheckbox(Composite parent, String label) { - Button button = new Button(parent, SWT.CHECK | SWT.LEFT); - button.setText(label); - button.setFont(parent.getFont()); - GridData data = new GridData(); - button.setLayoutData(data); - return button; - } - - protected Label createLabel(Composite composite, String text) { - Label label = new Label(composite,SWT.NONE); - if (text != null) { - label.setText(text); - } - label.setFont(composite.getFont()); - return label; - } - - /** - * @return boolean - */ - public boolean isSyncOutgoingChanges() { - return syncOutgoingChanges; - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagAsVersionDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagAsVersionDialog.java deleted file mode 100644 index 9681df498..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagAsVersionDialog.java +++ /dev/null @@ -1,258 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import org.eclipse.core.runtime.IStatus; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.viewers.ColumnWeightData; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.TableLayout; -import org.eclipse.jface.viewers.TableViewer; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jface.viewers.ViewerSorter; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.Table; -import org.eclipse.swt.widgets.TableColumn; -import org.eclipse.swt.widgets.Text; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.internal.ccvs.ui.merge.TagElement; -import org.eclipse.team.internal.ccvs.ui.merge.TagRootElement; -import org.eclipse.team.internal.ccvs.ui.operations.ITagOperation; -import org.eclipse.team.internal.ui.dialogs.DetailsDialog; -import org.eclipse.ui.help.WorkbenchHelp; -import org.eclipse.ui.model.WorkbenchContentProvider; -import org.eclipse.ui.model.WorkbenchLabelProvider; - -public class TagAsVersionDialog extends DetailsDialog { - - private ITagOperation operation; - - private ICVSFolder folder; - - private Text tagText; - private Button moveTagButton; - - private String tagName = ""; //$NON-NLS-1$ - private boolean moveTag = false; - - private static final int TABLE_HEIGHT_HINT = 150; - - private TableViewer existingVersionTable; - - public TagAsVersionDialog(Shell parentShell, String title, ITagOperation operation) { - super(parentShell, title); - this.folder = getFirstFolder(operation.getCVSResources()); - this.operation = operation; - } - - private ICVSFolder getFirstFolder(ICVSResource[] resources) { - if (resources[0].isFolder()) { - return (ICVSFolder)resources[0]; - } else { - return resources[0].getParent(); - } - } - - /** - * @see DetailsDialog#createMainDialogArea(Composite) - */ - protected void createMainDialogArea(Composite parent) { - // create message - Label label = new Label(parent, SWT.WRAP); - label.setText(Policy.bind("TagAction.enterTag")); //$NON-NLS-1$ - GridData data = new GridData( - GridData.GRAB_HORIZONTAL | - GridData.GRAB_VERTICAL | - GridData.HORIZONTAL_ALIGN_FILL | - GridData.VERTICAL_ALIGN_CENTER); - data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);; - label.setLayoutData(data); - label.setFont(parent.getFont()); - - tagText = new Text(parent, SWT.SINGLE | SWT.BORDER); - tagText.setLayoutData(new GridData( - GridData.GRAB_HORIZONTAL | - GridData.HORIZONTAL_ALIGN_FILL)); - tagText.addModifyListener( - new ModifyListener() { - public void modifyText(ModifyEvent e) { - tagName = tagText.getText(); - updateEnablements(); - } - } - ); - - moveTagButton = new Button(parent, SWT.CHECK); - moveTagButton.setText(Policy.bind("TagAction.moveTag")); - moveTagButton.setLayoutData(new GridData( - GridData.GRAB_HORIZONTAL | - GridData.GRAB_VERTICAL | - GridData.HORIZONTAL_ALIGN_FILL | - GridData.VERTICAL_ALIGN_CENTER)); - - moveTagButton.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - moveTag = moveTagButton.getSelection(); - } - }); - - // Add F1 help - WorkbenchHelp.setHelp(parent, IHelpContextIds.TAG_AS_VERSION_DIALOG); - } - - public boolean shouldMoveTag() { - return moveTag; - } - - protected TableViewer createTable(Composite parent) { - Table table = new Table(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER | SWT.SINGLE | SWT.FULL_SELECTION); - GridData data = new GridData(GridData.FILL_BOTH); - data.heightHint = TABLE_HEIGHT_HINT; - table.setLayoutData(data); - TableLayout layout = new TableLayout(); - layout.addColumnData(new ColumnWeightData(100, true)); - table.setLayout(layout); - TableColumn col = new TableColumn(table, SWT.NONE); - col.setResizable(true); - return new TableViewer(table); - } - - /** - * @see DetailsDialog#createDropDownDialogArea(Composite) - */ - protected Composite createDropDownDialogArea(Composite parent) { - // create a composite with standard margins and spacing - Composite composite = new Composite(parent, SWT.NONE); - GridLayout layout = new GridLayout(); - layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN); - layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN); - layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING); - layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING); - composite.setLayout(layout); - composite.setLayoutData(new GridData(GridData.FILL_BOTH)); - composite.setFont(parent.getFont()); - - Label label = new Label(composite, SWT.WRAP); - label.setText(Policy.bind("TagAction.existingVersions")); //$NON-NLS-1$ - GridData data = new GridData( - GridData.GRAB_HORIZONTAL | - GridData.GRAB_VERTICAL | - GridData.HORIZONTAL_ALIGN_FILL | - GridData.VERTICAL_ALIGN_CENTER); - data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);; - label.setLayoutData(data); - label.setFont(composite.getFont()); - - existingVersionTable = createTable(composite); - existingVersionTable.setContentProvider(new WorkbenchContentProvider()); - existingVersionTable.setLabelProvider(new WorkbenchLabelProvider()); - existingVersionTable.setSorter(new ViewerSorter() { - public int compare(Viewer v, Object o1, Object o2) { - int result = super.compare(v, o1, o2); - if (o1 instanceof TagElement && o2 instanceof TagElement) { - return -result; - } - return result; - } - }); - existingVersionTable.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - IStructuredSelection selection = (IStructuredSelection)existingVersionTable.getSelection(); - if(!selection.isEmpty()) { - TagElement element = (TagElement)((IStructuredSelection)existingVersionTable.getSelection()).getFirstElement(); - if(element!=null) { - tagText.setText(element.getTag().getName()); - } - } - } - }); - - Runnable afterRefresh = new Runnable() { - public void run() { - getShell().getDisplay().syncExec(new Runnable() { - public void run() { - existingVersionTable.refresh(); - } - }); - } - }; - - Runnable afterConfigure = new Runnable() { - public void run() { - getShell().getDisplay().syncExec(new Runnable() { - public void run() { - existingVersionTable.setInput(new TagRootElement(folder, CVSTag.VERSION)); - } - }); - } - }; - - TagConfigurationDialog.createTagDefinitionButtons(getShell(), composite, new ICVSFolder[] {folder}, - convertVerticalDLUsToPixels(IDialogConstants.BUTTON_HEIGHT), - convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH), - afterRefresh, afterConfigure); - - existingVersionTable.setInput(new TagRootElement(folder, CVSTag.VERSION)); - - return composite; - } - - /** - * Validates tag name - */ - protected void updateEnablements() { - String message = null; - boolean exists = false; - if(tagName.length() == 0) { - message = ""; //$NON-NLS-1$ - } else { - IStatus status = CVSTag.validateTagName(tagName); - if (!status.isOK()) { - message = status.getMessage(); - } - } - setPageComplete(message == null); - setErrorMessage(message); - } - - /** - * Returns the tag name entered into this dialog - */ - public String getTagName() { - return tagName; - } - - /** - * @return - */ - public ITagOperation getOperation() { - operation.setTag(new CVSTag(tagName, CVSTag.VERSION)); - if (moveTag) { - operation.moveTag(); - } - return operation; - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagConfigurationDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagConfigurationDialog.java deleted file mode 100644 index 9fab2799a..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagConfigurationDialog.java +++ /dev/null @@ -1,783 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.Path; -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.dialogs.IDialogSettings; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.jface.viewers.CheckboxTableViewer; -import org.eclipse.jface.viewers.ColumnWeightData; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.TableLayout; -import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jface.viewers.ViewerSorter; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.graphics.Point; -import org.eclipse.swt.graphics.Rectangle; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.Table; -import org.eclipse.swt.widgets.TableColumn; -import org.eclipse.swt.widgets.Tree; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSFile; -import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.team.internal.ccvs.core.ILogEntry; -import org.eclipse.team.internal.ccvs.ui.merge.ProjectElement; -import org.eclipse.team.internal.ccvs.ui.merge.TagElement; -import org.eclipse.team.internal.ccvs.ui.merge.ProjectElement.ProjectElementSorter; -import org.eclipse.team.internal.ccvs.ui.model.CVSFileElement; -import org.eclipse.team.internal.ccvs.ui.model.CVSFolderElement; -import org.eclipse.team.internal.ccvs.ui.model.CVSRootFolderElement; -import org.eclipse.team.internal.ccvs.ui.model.RemoteContentProvider; -import org.eclipse.team.internal.ccvs.ui.repo.RepositoryManager; -import org.eclipse.ui.help.WorkbenchHelp; -import org.eclipse.ui.model.WorkbenchContentProvider; -import org.eclipse.ui.model.WorkbenchLabelProvider; - -/** - * Allows configuration of the CVS tags that are shown within the workbench. - */ -public class TagConfigurationDialog extends Dialog { - - // show the resource contained within the roots - private TreeViewer cvsResourceTree; - - // shows the tags found on the selected resources - private CheckboxTableViewer cvsTagTree; - - // shows the defined tags for the given root - private TreeViewer cvsDefinedTagsTree; - - // remember the root element in the defined tags tree - private ProjectElement cvsDefinedTagsRootElement; - - // list of auto-refresh files - private org.eclipse.swt.widgets.List autoRefreshFileList; - - // folders from which their children files can be examined for tags - private ICVSFolder[] roots; - private ICVSFolder root; - - // enable selecting auto-refresh files - private boolean allowSettingAutoRefreshFiles = true; - - // preference keys - private final String ALLOWREFRESH_WIDTH_KEY = "AllowRefreshWidth"; //$NON-NLS-1$ - private final String ALLOWREFRESH_HEIGHT_KEY = "AllowRefreshHeight"; //$NON-NLS-1$ - private final String NOREFRESH_WIDTH_KEY = "NoRefreshWidth"; //$NON-NLS-1$ - private final String NOREFRESH_HEIGHT_KEY = "NoRefreshHeight"; //$NON-NLS-1$ - - // buttons - private Button addSelectedTagsButton; - private Button addSelectedFilesButton; - private Button removeFileButton; - private Button removeTagButton; - - // dialogs settings that are persistent between workbench sessions - private IDialogSettings settings; - - class FileSorter extends ViewerSorter { - public int compare(Viewer viewer, Object e1, Object e2) { - boolean oneIsFile = e1 instanceof CVSFileElement; - boolean twoIsFile = e2 instanceof CVSFileElement; - if (oneIsFile != twoIsFile) { - return oneIsFile ? 1 : -1; - } - return super.compare(viewer, e1, e2); - } - } - - public TagConfigurationDialog(Shell shell, ICVSFolder[] roots) { - super(shell); - setShellStyle(SWT.CLOSE|SWT.RESIZE|SWT.APPLICATION_MODAL); - this.roots = roots; - this.root = roots[0]; - if(roots.length>1) { - allowSettingAutoRefreshFiles = false; - } - - IDialogSettings workbenchSettings = CVSUIPlugin.getPlugin().getDialogSettings(); - this.settings = workbenchSettings.getSection("TagConfigurationDialog");//$NON-NLS-1$ - if (settings == null) { - this.settings = workbenchSettings.addNewSection("TagConfigurationDialog");//$NON-NLS-1$ - } - } - - /** - * @see Window#configureShell(Shell) - */ - protected void configureShell(Shell newShell) { - super.configureShell(newShell); - if(roots.length==1) { - newShell.setText(Policy.bind("TagConfigurationDialog.1", roots[0].getName())); //$NON-NLS-1$ - } else { - newShell.setText(Policy.bind("TagConfigurationDialog.2", Integer.toString(roots.length))); //$NON-NLS-1$ //$NON-NLS-2$ - } - } - - /** - * @see Dialog#createDialogArea(Composite) - */ - protected Control createDialogArea(Composite parent) { - Composite shell = new Composite(parent, SWT.NONE); - GridData data = new GridData (GridData.FILL_BOTH); - shell.setLayoutData(data); - GridLayout gridLayout = new GridLayout(); - gridLayout.numColumns = 2; - gridLayout.makeColumnsEqualWidth = true; - shell.setLayout (gridLayout); - - Composite comp = new Composite(shell, SWT.NULL); - gridLayout = new GridLayout(); - gridLayout.numColumns = 1; - gridLayout.marginWidth = 0; - gridLayout.marginHeight = 0; - comp.setLayout(gridLayout); - comp.setLayoutData(new GridData(GridData.FILL_BOTH)); - - Label cvsResourceTreeLabel = new Label(comp, SWT.NONE); - cvsResourceTreeLabel.setText(Policy.bind("TagConfigurationDialog.5")); //$NON-NLS-1$ - data = new GridData(); - data.horizontalSpan = 1; - cvsResourceTreeLabel.setLayoutData(data); - - Tree tree = new Tree(comp, SWT.BORDER | SWT.MULTI); - cvsResourceTree = new TreeViewer (tree); - cvsResourceTree.setContentProvider(new RemoteContentProvider()); - cvsResourceTree.setLabelProvider(new WorkbenchLabelProvider()); - data = new GridData (GridData.FILL_BOTH); - data.heightHint = 150; - data.horizontalSpan = 1; - cvsResourceTree.getTree().setLayoutData(data); - if(roots.length==1) { - cvsResourceTree.setInput(new CVSFolderElement(roots[0], false /*don't include unmanaged resources*/)); - } else { - cvsResourceTree.setInput(new CVSRootFolderElement(roots)); - } - cvsResourceTree.setSorter(new FileSorter()); - cvsResourceTree.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - updateShownTags(); - updateEnablements(); - } - }); - - - comp = new Composite(shell, SWT.NULL); - gridLayout = new GridLayout(); - gridLayout.numColumns = 1; - gridLayout.marginWidth = 0; - gridLayout.marginHeight = 0; - comp.setLayout(gridLayout); - comp.setLayoutData(new GridData(GridData.FILL_BOTH)); - - Label cvsTagTreeLabel = new Label(comp, SWT.NONE); - cvsTagTreeLabel.setText(Policy.bind("TagConfigurationDialog.6")); //$NON-NLS-1$ - data = new GridData(); - data.horizontalSpan = 1; - cvsTagTreeLabel.setLayoutData(data); - - final Table table = new Table(comp, SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER | SWT.MULTI | SWT.FULL_SELECTION | SWT.CHECK); - data = new GridData(GridData.FILL_BOTH); - data.heightHint = 150; - data.horizontalSpan = 1; - table.setLayoutData(data); - TableLayout layout = new TableLayout(); - layout.addColumnData(new ColumnWeightData(60, true)); - table.setLayout(layout); - TableColumn col = new TableColumn(table, SWT.NONE); - col.setResizable(true); - cvsTagTree = new CheckboxTableViewer(table); - cvsTagTree.setContentProvider(new WorkbenchContentProvider()); - cvsTagTree.setLabelProvider(new WorkbenchLabelProvider()); - cvsTagTree.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - updateEnablements(); - } - }); - - Composite selectComp = new Composite(comp, SWT.NONE); - GridLayout selectLayout = new GridLayout(2, true); - selectLayout.marginHeight = selectLayout.marginWidth = 0; - selectComp.setLayout(selectLayout); - selectComp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - Button selectAllButton = new Button(selectComp, SWT.PUSH); - selectAllButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - selectAllButton.setText(Policy.bind("ReleaseCommentDialog.selectAll")); //$NON-NLS-1$ - selectAllButton.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - int nItems = table.getItemCount(); - for (int j=0; j<nItems; j++) - table.getItem(j).setChecked(true); - } - }); - Button deselectAllButton = new Button(selectComp, SWT.PUSH); - deselectAllButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - deselectAllButton.setText(Policy.bind("ReleaseCommentDialog.deselectAll")); //$NON-NLS-1$ - deselectAllButton.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - int nItems = table.getItemCount(); - for (int j=0; j<nItems; j++) - table.getItem(j).setChecked(false); - } - }); - - cvsTagTree.setSorter(new ViewerSorter() { - public int compare(Viewer viewer, Object e1, Object e2) { - if (!(e1 instanceof TagElement) || !(e2 instanceof TagElement)) return super.compare(viewer, e1, e2); - CVSTag tag1 = ((TagElement)e1).getTag(); - CVSTag tag2 = ((TagElement)e2).getTag(); - int type1 = tag1.getType(); - int type2 = tag2.getType(); - if (type1 != type2) { - return type1 - type2; - } - // Sort in reverse order so larger numbered versions are at the top - return -tag1.compareTo(tag2); - } - }); - - Composite rememberedTags = new Composite(shell, SWT.NONE); - data = new GridData (GridData.FILL_BOTH); - data.horizontalSpan = 2; - rememberedTags.setLayoutData(data); - gridLayout = new GridLayout(); - gridLayout.numColumns = 2; - gridLayout.marginHeight = 0; - gridLayout.marginWidth = 0; - rememberedTags.setLayout (gridLayout); - - Label rememberedTagsLabel = new Label (rememberedTags, SWT.NONE); - rememberedTagsLabel.setText (Policy.bind("TagConfigurationDialog.7")); //$NON-NLS-1$ - data = new GridData (); - data.horizontalSpan = 2; - rememberedTagsLabel.setLayoutData (data); - - tree = new Tree(rememberedTags, SWT.BORDER | SWT.MULTI); - cvsDefinedTagsTree = new TreeViewer (tree); - cvsDefinedTagsTree.setContentProvider(new WorkbenchContentProvider()); - cvsDefinedTagsTree.setLabelProvider(new WorkbenchLabelProvider()); - data = new GridData (GridData.FILL_BOTH); - data.heightHint = 100; - data.horizontalAlignment = GridData.FILL; - data.grabExcessHorizontalSpace = true; - cvsDefinedTagsTree.getTree().setLayoutData(data); - cvsDefinedTagsRootElement = new ProjectElement(roots[0], ProjectElement.INCLUDE_BRANCHES | ProjectElement.INCLUDE_VERSIONS); - cvsDefinedTagsRootElement.getBranches().add(CVSUIPlugin.getPlugin().getRepositoryManager().getKnownTags(root, CVSTag.BRANCH)); - cvsDefinedTagsRootElement.getVersions().add(CVSUIPlugin.getPlugin().getRepositoryManager().getKnownTags(root, CVSTag.VERSION)); - cvsDefinedTagsTree.setInput(cvsDefinedTagsRootElement); - cvsDefinedTagsTree.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - updateEnablements(); - } - }); - cvsDefinedTagsTree.setSorter(new ProjectElementSorter()); - - Composite buttonComposite = new Composite(rememberedTags, SWT.NONE); - data = new GridData (); - data.verticalAlignment = GridData.BEGINNING; - buttonComposite.setLayoutData(data); - gridLayout = new GridLayout(); - gridLayout.marginHeight = 0; - gridLayout.marginWidth = 0; - buttonComposite.setLayout (gridLayout); - - addSelectedTagsButton = new Button (buttonComposite, SWT.PUSH); - addSelectedTagsButton.setText (Policy.bind("TagConfigurationDialog.8")); //$NON-NLS-1$ - data = getStandardButtonData(addSelectedTagsButton); - data.horizontalAlignment = GridData.FILL; - addSelectedTagsButton.setLayoutData(data); - addSelectedTagsButton.addListener(SWT.Selection, new Listener() { - public void handleEvent(Event event) { - rememberCheckedTags(); - } - }); - - removeTagButton = new Button (buttonComposite, SWT.PUSH); - removeTagButton.setText (Policy.bind("TagConfigurationDialog.9")); //$NON-NLS-1$ - data = getStandardButtonData(removeTagButton); - data.horizontalAlignment = GridData.FILL; - removeTagButton.setLayoutData(data); - removeTagButton.addListener(SWT.Selection, new Listener() { - public void handleEvent(Event event) { - deleteSelected(); - } - }); - - Button removeAllTags = new Button (buttonComposite, SWT.PUSH); - removeAllTags.setText (Policy.bind("TagConfigurationDialog.10")); //$NON-NLS-1$ - data = getStandardButtonData(removeAllTags); - data.horizontalAlignment = GridData.FILL; - removeAllTags.setLayoutData(data); - removeAllTags.addListener(SWT.Selection, new Listener() { - public void handleEvent(Event event) { - removeAllKnownTags(); - } - }); - - if(allowSettingAutoRefreshFiles) { - Label explanation = new Label(rememberedTags, SWT.WRAP); - explanation.setText(Policy.bind("TagConfigurationDialog.11")); //$NON-NLS-1$ - data = new GridData (); - data.horizontalSpan = 2; - //data.widthHint = 300; - explanation.setLayoutData(data); - - autoRefreshFileList = new org.eclipse.swt.widgets.List(rememberedTags, SWT.BORDER | SWT.MULTI); - data = new GridData (); - data.heightHint = 45; - data.horizontalAlignment = GridData.FILL; - data.grabExcessHorizontalSpace = true; - autoRefreshFileList.setLayoutData(data); - try { - autoRefreshFileList.setItems(CVSUIPlugin.getPlugin().getRepositoryManager().getAutoRefreshFiles(roots[0])); - } catch (CVSException e) { - autoRefreshFileList.setItems(new String[0]); - CVSUIPlugin.log(e); - } - autoRefreshFileList.addSelectionListener(new SelectionListener() { - public void widgetSelected(SelectionEvent e) { - updateEnablements(); - } - public void widgetDefaultSelected(SelectionEvent e) { - updateEnablements(); - } - }); - - Composite buttonComposite2 = new Composite(rememberedTags, SWT.NONE); - data = new GridData (); - data.verticalAlignment = GridData.BEGINNING; - buttonComposite2.setLayoutData(data); - gridLayout = new GridLayout(); - gridLayout.marginHeight = 0; - gridLayout.marginWidth = 0; - buttonComposite2.setLayout (gridLayout); - - addSelectedFilesButton = new Button (buttonComposite2, SWT.PUSH); - addSelectedFilesButton.setText (Policy.bind("TagConfigurationDialog.12")); //$NON-NLS-1$ - data = getStandardButtonData(addSelectedFilesButton); - data.horizontalAlignment = GridData.FILL; - addSelectedFilesButton.setLayoutData(data); - addSelectedFilesButton.addListener(SWT.Selection, new Listener() { - public void handleEvent(Event event) { - addSelectionToAutoRefreshList(); - } - }); - - removeFileButton = new Button (buttonComposite2, SWT.PUSH); - removeFileButton.setText (Policy.bind("TagConfigurationDialog.13")); //$NON-NLS-1$ - data = getStandardButtonData(removeFileButton); - data.horizontalAlignment = GridData.FILL; - removeFileButton.setLayoutData(data); - removeFileButton.addListener(SWT.Selection, new Listener() { - public void handleEvent(Event event) { - String[] selected = autoRefreshFileList.getSelection(); - for (int i = 0; i < selected.length; i++) { - autoRefreshFileList.remove(selected[i]); - autoRefreshFileList.setFocus(); - } - } - }); - WorkbenchHelp.setHelp(autoRefreshFileList, IHelpContextIds.TAG_CONFIGURATION_REFRESHLIST); - } - - Label seperator = new Label(shell, SWT.SEPARATOR | SWT.HORIZONTAL); - data = new GridData (GridData.FILL_BOTH); - data.horizontalSpan = 2; - seperator.setLayoutData(data); - - WorkbenchHelp.setHelp(shell, IHelpContextIds.TAG_CONFIGURATION_OVERVIEW); - - updateEnablements(); - return shell; - } - - private void updateShownTags() { - final CVSFileElement[] filesSelection = getSelectedFiles(); - final Set tags = new HashSet(); - if(filesSelection.length!=0) { - try { - CVSUIPlugin.runWithProgress(getShell(), true /*cancelable*/, new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - monitor.beginTask(Policy.bind("TagConfigurationDialog.22"), filesSelection.length); //$NON-NLS-1$ - try { - for (int i = 0; i < filesSelection.length; i++) { - ICVSFile file = filesSelection[i].getCVSFile(); - tags.addAll(Arrays.asList(getTagsFor(file, Policy.subMonitorFor(monitor, 1)))); - } - } catch (TeamException e) { - // ignore the exception - } finally { - monitor.done(); - } - } - }); - } catch (InterruptedException e) { - // operation cancelled - } catch (InvocationTargetException e) { - // can't happen since we're ignoring all possible exceptions - } - cvsTagTree.getTable().removeAll(); - for (Iterator it = tags.iterator(); it.hasNext();) { - CVSTag tag = (CVSTag) it.next(); - List knownTags = new ArrayList(); - knownTags.addAll(Arrays.asList(cvsDefinedTagsRootElement.getBranches().getTags())); - knownTags.addAll(Arrays.asList(cvsDefinedTagsRootElement.getVersions().getTags())); - if(!knownTags.contains(tag)) { - TagElement tagElem = new TagElement(tag); - cvsTagTree.add(tagElem); - cvsTagTree.setChecked(tagElem, true); - } - } - } - } - - private CVSFileElement[] getSelectedFiles() { - IStructuredSelection selection = (IStructuredSelection)cvsResourceTree.getSelection(); - if (!selection.isEmpty()) { - final List filesSelection = new ArrayList(); - Iterator it = selection.iterator(); - while(it.hasNext()) { - Object o = it.next(); - if(o instanceof CVSFileElement) { - filesSelection.add(o); - } - } - return (CVSFileElement[]) filesSelection.toArray(new CVSFileElement[filesSelection.size()]); - } - return new CVSFileElement[0]; - } - - private void addSelectionToAutoRefreshList() { - IStructuredSelection selection = (IStructuredSelection)cvsResourceTree.getSelection(); - if (!selection.isEmpty()) { - final List filesSelection = new ArrayList(); - Iterator it = selection.iterator(); - while(it.hasNext()) { - Object o = it.next(); - if(o instanceof CVSFileElement) { - filesSelection.add(o); - } - } - if(!filesSelection.isEmpty()) { - for (it = filesSelection.iterator(); it.hasNext();) { - try { - ICVSFile file = ((CVSFileElement)it.next()).getCVSFile(); - ICVSFolder fileParent = file.getParent(); - String filePath = new Path(fileParent.getFolderSyncInfo().getRepository()) - .append(file.getRelativePath(fileParent)).toString(); - if(autoRefreshFileList.indexOf(filePath)==-1) { - autoRefreshFileList.add(filePath); - } - } catch(CVSException e) { - CVSUIPlugin.openError(getShell(), null, null, e); - } - } - } - } - } - - private CVSTag[] getTagsFor(ICVSFile file, IProgressMonitor monitor) throws TeamException { - Set tagSet = new HashSet(); - ILogEntry[] entries = file.getLogEntries(monitor); - for (int j = 0; j < entries.length; j++) { - CVSTag[] tags = entries[j].getTags(); - for (int k = 0; k < tags.length; k++) { - tagSet.add(tags[k]); - } - } - return (CVSTag[])tagSet.toArray(new CVSTag[tagSet.size()]); - } - - private void rememberCheckedTags() { - Object[] checked = cvsTagTree.getCheckedElements(); - for (int i = 0; i < checked.length; i++) { - CVSTag tag = ((TagElement)checked[i]).getTag(); - if(tag.getType() == CVSTag.BRANCH) { - cvsDefinedTagsRootElement.getBranches().add(new CVSTag[] {tag}); - } else { - cvsDefinedTagsRootElement.getVersions().add(new CVSTag[] {tag}); - } - } - cvsDefinedTagsTree.refresh(); - } - - private void deleteSelected() { - IStructuredSelection selection = (IStructuredSelection)cvsDefinedTagsTree.getSelection(); - if (!selection.isEmpty()) { - Iterator it = selection.iterator(); - while(it.hasNext()) { - Object o = it.next(); - if(o instanceof TagElement) { - CVSTag tag = ((TagElement)o).getTag(); - if(tag.getType() == CVSTag.BRANCH) { - cvsDefinedTagsRootElement.getBranches().remove(tag); - } else if(tag.getType()==CVSTag.VERSION) { - cvsDefinedTagsRootElement.getVersions().remove(tag); - } - } - } - } - cvsDefinedTagsTree.refresh(); - cvsDefinedTagsTree.getTree().setFocus(); - } - - private boolean isTagSelectedInKnownTagTree() { - IStructuredSelection selection = (IStructuredSelection)cvsDefinedTagsTree.getSelection(); - if (!selection.isEmpty()) { - final List versions = new ArrayList(); - final List branches = new ArrayList(); - Iterator it = selection.iterator(); - while(it.hasNext()) { - Object o = it.next(); - if(o instanceof TagElement) { - return true; - } - } - } - return false; - } - - private void removeAllKnownTags() { - cvsDefinedTagsRootElement.getBranches().removeAll(); - cvsDefinedTagsRootElement.getVersions().removeAll(); - cvsDefinedTagsTree.refresh(); - } - - private void updateEnablements() { - // add checked tags - Object[] checked = cvsTagTree.getCheckedElements(); - addSelectedTagsButton.setEnabled(checked.length!=0?true:false); - - // Remove known tags - removeTagButton.setEnabled(isTagSelectedInKnownTagTree()?true:false); - - if(allowSettingAutoRefreshFiles) { - // add selected files - addSelectedFilesButton.setEnabled(getSelectedFiles().length!=0?true:false); - - // remove auto refresh files - removeFileButton.setEnabled(autoRefreshFileList.getSelection().length!=0?true:false); - } - } - - /** - * @see Dialog#okPressed() - */ - protected void okPressed() { - try { - // save auto refresh file names - if(allowSettingAutoRefreshFiles) { - RepositoryManager manager = CVSUIPlugin.getPlugin().getRepositoryManager(); - manager.setAutoRefreshFiles(root, autoRefreshFileList.getItems()); - } - - // save defined tags and update all project with the same version tags - final RepositoryManager manager = CVSUIPlugin.getPlugin().getRepositoryManager(); - manager.run(new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - CVSTag[] branches = cvsDefinedTagsRootElement.getBranches().getTags(); - CVSTag[] versions = cvsDefinedTagsRootElement.getVersions().getTags(); - try { - for(int i = 0; i < roots.length; i++) { - CVSTag[] oldTags = manager.getKnownTags(roots[i]); - manager.removeTags(roots[i], oldTags); - if(branches.length > 0) { - manager.addTags(roots[i], branches); - } - if(versions.length>0) { - manager.addTags(roots[i], versions); - } - } - } catch (CVSException e) { - throw new InvocationTargetException(e); - } - } - }, null); - - super.okPressed(); - } catch (CVSException e) { - CVSUIPlugin.openError(getShell(), null, null, e); - } catch (InvocationTargetException e) { - CVSUIPlugin.openError(getShell(), null, null, e); - } catch (InterruptedException e) { - } - } - - /* - * Returns a button that implements the standard refresh tags operation. The runnable is run immediatly after - * the tags are fetched from the server. A client should refresh their widgets that show tags because they - * may of changed. - */ - private static Button createTagRefreshButton(final Shell shell, Composite composite, String title, final ICVSFolder folder, final Runnable runnable) { - Button refreshButton = new Button(composite, SWT.PUSH); - refreshButton.setText (title); - refreshButton.addListener(SWT.Selection, new Listener() { - public void handleEvent(Event event) { - try { - CVSUIPlugin.runWithProgress(shell, true /*cancelable*/, new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - try { - CVSUIPlugin.getPlugin().getRepositoryManager().refreshDefinedTags(folder, false /* replace */, true, monitor); - runnable.run(); - } catch (TeamException e) { - throw new InvocationTargetException(e); - } - } - }); - } catch (InterruptedException e) { - // operation cancelled - } catch (InvocationTargetException e) { - CVSUIPlugin.openError(shell, Policy.bind("TagConfigurationDialog.14"), null, e); //$NON-NLS-1$ - } - } - }); - updateEnablementOnRefreshButton(refreshButton, folder); - return refreshButton; - } - - public static void createTagDefinitionButtons(final Shell shell, Composite composite, final ICVSFolder[] folders, int hHint, int wHint, final Runnable afterRefresh, final Runnable afterConfigure) { - Composite buttonComp = new Composite(composite, SWT.NONE); - GridData data = new GridData (); - data.horizontalAlignment = GridData.END; - buttonComp.setLayoutData(data); - GridLayout layout = new GridLayout(); - layout.numColumns = 2; - layout.marginHeight = 0; - layout.marginWidth = 0; - buttonComp.setLayout (layout); - - final Button refreshButton = TagConfigurationDialog.createTagRefreshButton(shell, buttonComp, Policy.bind("TagConfigurationDialog.20"), folders[0], afterRefresh); //$NON-NLS-1$ - data = new GridData(); - if(hHint!=0 && wHint!=0) { - data.heightHint = hHint; - int widthHint = wHint; - data.widthHint = Math.max(widthHint, refreshButton.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x); - } - data.horizontalAlignment = GridData.END; - data.horizontalSpan = 1; - refreshButton.setLayoutData (data); - - Button addButton = new Button(buttonComp, SWT.PUSH); - addButton.setText (Policy.bind("TagConfigurationDialog.21")); //$NON-NLS-1$ - data = new GridData (); - if(hHint!=0 && wHint!=0) { - data.heightHint = hHint; - int widthHint = wHint; - data.widthHint = Math.max(widthHint, addButton.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x); - } - data.horizontalAlignment = GridData.END; - data.horizontalSpan = 1; - addButton.setLayoutData (data); - addButton.addListener(SWT.Selection, new Listener() { - public void handleEvent(Event event) { - TagConfigurationDialog d = new TagConfigurationDialog(shell, folders); - d.open(); - updateEnablementOnRefreshButton(refreshButton, folders[0]); - afterConfigure.run(); - } - }); - - WorkbenchHelp.setHelp(refreshButton, IHelpContextIds.TAG_CONFIGURATION_REFRESHACTION); - WorkbenchHelp.setHelp(addButton, IHelpContextIds.TAG_CONFIGURATION_OVERVIEW); - } - - private static void updateEnablementOnRefreshButton(Button refreshButton, ICVSFolder project) { - try { - String[] files = CVSUIPlugin.getPlugin().getRepositoryManager().getAutoRefreshFiles(project); - refreshButton.setEnabled(files.length != 0); - } catch (CVSException e) { - refreshButton.setEnabled(false); - CVSUIPlugin.log(e); - } - - } - - /** - * @see Window#getInitialSize() - */ - protected Point getInitialSize() { - int width, height; - if(allowSettingAutoRefreshFiles) { - try { - height = settings.getInt(ALLOWREFRESH_HEIGHT_KEY); - width = settings.getInt(ALLOWREFRESH_WIDTH_KEY); - } catch(NumberFormatException e) { - return super.getInitialSize(); - } - } else { - try { - height = settings.getInt(NOREFRESH_HEIGHT_KEY); - width = settings.getInt(NOREFRESH_WIDTH_KEY); - } catch(NumberFormatException e) { - return super.getInitialSize(); - } - } - return new Point(width, height); - } - - /** - * @see Dialog#cancelPressed() - */ - protected void cancelPressed() { - super.cancelPressed(); - } - - private GridData getStandardButtonData(Button button) { - GridData data = new GridData(); - data.heightHint = convertVerticalDLUsToPixels(IDialogConstants.BUTTON_HEIGHT); - int widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH); - data.widthHint = Math.max(widthHint, button.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x); - return data; - } - - /** - * @see Window#close() - */ - public boolean close() { - Rectangle bounds = getShell().getBounds(); - if(allowSettingAutoRefreshFiles) { - settings.put(ALLOWREFRESH_HEIGHT_KEY, bounds.height); - settings.put(ALLOWREFRESH_WIDTH_KEY, bounds.width); - } else { - settings.put(NOREFRESH_HEIGHT_KEY, bounds.height); - settings.put(NOREFRESH_WIDTH_KEY, bounds.width); - } - return super.close(); - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagSelectionDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagSelectionDialog.java deleted file mode 100644 index a57449ee3..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagSelectionDialog.java +++ /dev/null @@ -1,324 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - - -import org.eclipse.core.resources.IProject; -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.MouseAdapter; -import org.eclipse.swt.events.MouseEvent; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.Tree; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.ui.merge.ProjectElement; -import org.eclipse.team.internal.ccvs.ui.merge.TagElement; -import org.eclipse.team.internal.ccvs.ui.merge.ProjectElement.ProjectElementSorter; -import org.eclipse.team.internal.ccvs.ui.repo.*; -import org.eclipse.ui.help.WorkbenchHelp; -import org.eclipse.ui.model.WorkbenchContentProvider; -import org.eclipse.ui.model.WorkbenchLabelProvider; - -/** - * Dialog to prompt the user to choose a tag for a selected resource - */ -public class TagSelectionDialog extends Dialog { - private ICVSFolder[] folders; - private int includeFlags; - private CVSTag result; - private String helpContext; - - public static final int INCLUDE_HEAD_TAG = ProjectElement.INCLUDE_HEAD_TAG; - public static final int INCLUDE_BASE_TAG = ProjectElement.INCLUDE_BASE_TAG; - public static final int INCLUDE_BRANCHES = ProjectElement.INCLUDE_BRANCHES; - public static final int INCLUDE_VERSIONS = ProjectElement.INCLUDE_VERSIONS; - public static final int INCLUDE_ALL_TAGS = ProjectElement.INCLUDE_ALL_TAGS; - - // widgets; - private TreeViewer tagTree; - private Button okButton; - - // dialog title, should indicate the action in which the tag selection - // dialog is being shown - private String title; - private String message; - - private boolean recurse = true; - private boolean showRecurse; - - // constants - private static final int SIZING_DIALOG_WIDTH = 400; - private static final int SIZING_DIALOG_HEIGHT = 250; - - public static CVSTag getTagToCompareWith(Shell shell, IProject[] projects) { - return getTagToCompareWith(shell, getCVSFoldersFor(projects)); - } - - public static CVSTag getTagToCompareWith(Shell shell, ICVSFolder[] folders) { - TagSelectionDialog dialog = new TagSelectionDialog(shell, folders, - Policy.bind("CompareWithTagAction.message"), //$NON-NLS-1$ - Policy.bind("TagSelectionDialog.Select_a_Tag_1"), //$NON-NLS-1$ - TagSelectionDialog.INCLUDE_ALL_TAGS, - false, /* show recurse*/ - IHelpContextIds.COMPARE_TAG_SELECTION_DIALOG); - dialog.setBlockOnOpen(true); - int result = dialog.open(); - if (result == Dialog.CANCEL) { - return null; - } - return dialog.getResult(); - } - /** - * Creates a new TagSelectionDialog. - * @param resource The resource to select a version for. - */ - public TagSelectionDialog(Shell parentShell, IProject[] projects, String title, String message, int includeFlags, boolean showRecurse, String helpContext) { - this(parentShell, getCVSFoldersFor(projects), title, message, includeFlags, showRecurse, helpContext); //$NON-NLS-1$ - } - - private static ICVSFolder[] getCVSFoldersFor(IProject[] projects) { - ICVSFolder[] folders = new ICVSFolder[projects.length]; - for (int i = 0; i < projects.length; i++) { - folders[i] = CVSWorkspaceRoot.getCVSFolderFor(projects[i]); - } - return folders; - } - - /** - * Creates a new TagSelectionDialog. - * @param resource The resource to select a version for. - */ - public TagSelectionDialog(Shell parentShell, ICVSFolder[] folders, String title, String message, int includeFlags, boolean showRecurse, String helpContext) { - super(parentShell); - this.folders = folders; - this.title = title; - this.message = message; - this.includeFlags = includeFlags; - this.showRecurse = showRecurse; - this.helpContext = helpContext; - setShellStyle(getShellStyle() | SWT.RESIZE); - } - - /* (non-Javadoc) - * Method declared on Window. - */ - protected void configureShell(Shell newShell) { - super.configureShell(newShell); - newShell.setText(title); - } - - /** - * Creates this window's widgetry. - * <p> - * The default implementation of this framework method - * creates this window's shell (by calling <code>createShell</code>), - * its control (by calling <code>createContents</code>), - * and initializes this window's shell bounds - * (by calling <code>initializeBounds</code>). - * This framework method may be overridden; however, - * <code>super.create</code> must be called. - * </p> - */ - public void create() { - super.create(); - initialize(); - } - - /** - * Add buttons to the dialog's button bar. - * - * @param parent the button bar composite - */ - protected void createButtonsForButtonBar(Composite parent) { - // create OK and Cancel buttons by default - okButton = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true); - okButton.setEnabled(false); - createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false); - } - - /** - * Creates and returns the contents of the upper part - * of this dialog (above the button bar). - * <p> - * The default implementation of this framework method - * creates and returns a new <code>Composite</code> with - * standard margins and spacing. - * Subclasses should override. - * </p> - * - * @param the parent composite to contain the dialog area - * @return the dialog area control - */ - protected Control createDialogArea(Composite parent) { - Composite top = (Composite)super.createDialogArea(parent); - // Add F1 help - if (helpContext != null) { - WorkbenchHelp.setHelp(top, helpContext); - } - Composite inner = new Composite(top, SWT.NULL); - GridData data = new GridData(GridData.FILL_BOTH); - data.widthHint = SIZING_DIALOG_WIDTH; - data.heightHint = SIZING_DIALOG_HEIGHT; - inner.setLayoutData(data); - GridLayout layout = new GridLayout(); - inner.setLayout(layout); - - Label l = new Label (inner, SWT.NONE); - l.setText(message); //$NON-NLS-1$ - - tagTree = createTree(inner); - tagTree.setInput(new ProjectElement(folders[0], includeFlags)); - tagTree.setSorter(new ProjectElementSorter()); - Runnable refresh = new Runnable() { - public void run() { - getShell().getDisplay().syncExec(new Runnable() { - public void run() { - tagTree.refresh(); - } - }); - } - }; - - if(showRecurse) { - final Button recurseCheck = new Button(top, SWT.CHECK); - recurseCheck.setText(Policy.bind("TagSelectionDialog.recurseOption")); //$NON-NLS-1$ - recurseCheck.addListener(SWT.Selection, new Listener() { - public void handleEvent(Event event) { - recurse = recurseCheck.getSelection(); - } - }); - recurseCheck.setSelection(true); - } - - - TagConfigurationDialog.createTagDefinitionButtons(getShell(), top, folders, - convertVerticalDLUsToPixels(IDialogConstants.BUTTON_HEIGHT), - convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH), - refresh, refresh); - - Label seperator = new Label(top, SWT.SEPARATOR | SWT.HORIZONTAL); - data = new GridData (GridData.FILL_BOTH); - data.horizontalSpan = 2; - seperator.setLayoutData(data); - - updateEnablement(); - - return top; - } - - - /** - * Utility method that creates a label instance - * and sets the default layout data. - * - * @param parent the parent for the new label - * @param text the text for the new label - * @return the new label - */ - protected Label createLabel(Composite parent, String text) { - Label label = new Label(parent, SWT.LEFT); - label.setText(text); - GridData data = new GridData(); - data.horizontalSpan = 1; - data.horizontalAlignment = GridData.FILL; - label.setLayoutData(data); - return label; - } - - protected TreeViewer createTree(Composite parent) { - Tree tree = new Tree(parent, SWT.SINGLE | SWT.BORDER); - tree.setLayoutData(new GridData(GridData.FILL_BOTH)); - TreeViewer result = new TreeViewer(tree); - result.setContentProvider(new WorkbenchContentProvider()); - result.setLabelProvider(new WorkbenchLabelProvider()); - result.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - updateEnablement(); - } - }); - // select and close on double click - // To do: use defaultselection instead of double click - result.getTree().addMouseListener(new MouseAdapter() { - public void mouseDoubleClick(MouseEvent e) { - IStructuredSelection selection = (IStructuredSelection)tagTree.getSelection(); - if (!selection.isEmpty() && (selection.getFirstElement() instanceof TagElement)) { - okPressed(); - } - } - }); - result.setSorter(new RepositorySorter()); - return result; - } - - /** - * Returns the selected tag. - */ - public CVSTag getResult() { - return result; - } - - public boolean getRecursive() { - return recurse; - } - - /** - * Initializes the dialog contents. - */ - protected void initialize() { - okButton.setEnabled(false); - } - - /** - * Notifies that the ok button of this dialog has been pressed. - * <p> - * The default implementation of this framework method sets - * this dialog's return code to <code>Window.OK</code> - * and closes the dialog. Subclasses may override. - * </p> - */ - protected void okPressed() { - IStructuredSelection selection = (IStructuredSelection)tagTree.getSelection(); - Object o = selection.getFirstElement(); - TagElement element = (TagElement)o; - result = element.getTag(); - super.okPressed(); - } - - - /** - * Updates the dialog enablement. - */ - protected void updateEnablement() { - if(okButton!=null) { - IStructuredSelection selection = (IStructuredSelection)tagTree.getSelection(); - if (selection.isEmpty() || !(selection.getFirstElement() instanceof TagElement)) { - okButton.setEnabled(false); - } else { - okButton.setEnabled(true); - } - } - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagetLocationSelectionDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagetLocationSelectionDialog.java deleted file mode 100644 index 5e3317424..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagetLocationSelectionDialog.java +++ /dev/null @@ -1,438 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import java.io.File; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IWorkspace; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Platform; -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.resource.JFaceColors; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.DirectoryDialog; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.Text; -import org.eclipse.ui.dialogs.SelectionDialog; - -/** - * Select the target location that will be the parent of the selected projects. - * The behavior of the dialog differs between 1 project and multiple projects. - * For one project, the location specified is the location of the project and - * the project name can be modified. For multiple projects, it is the parent - * location which is specified. - */ -public class TagetLocationSelectionDialog extends SelectionDialog { - - // widgets - private Text projectNameField; - private Text locationPathField; - private Label locationLabel; - private Label statusMessageLabel; - private Button browseButton; - - // state - private boolean useDefaults = true; - private IProject[] targetProjects; - private String newProjectName; - private String targetLocation; - - // constants - private static final int SIZING_TEXT_FIELD_WIDTH = 250; - - /** - * Constructor. - * @param parentShell - */ - public TagetLocationSelectionDialog(Shell parentShell, String title, IProject targetProject) { - this(parentShell, title, new IProject[] { targetProject }); - } - - /** - * Constructor. - * @param parentShell - */ - public TagetLocationSelectionDialog(Shell parentShell, String title, IProject[] targetProjects) { - super(parentShell); - setTitle(title); - this.targetProjects = targetProjects; - if (targetProjects.length == 1) newProjectName = targetProjects[0].getName(); - } - - /* (non-Javadoc) - * Method declared on Dialog. - */ - protected Control createDialogArea(Composite parent) { - // page group - Composite composite = (Composite) super.createDialogArea(parent); - composite.setLayout(new GridLayout()); - composite.setLayoutData(new GridData(GridData.FILL_BOTH)); - - if (isSingleCheckout()) - createProjectNameGroup(composite); - createProjectLocationGroup(composite); - - //Add in a label for status messages if required - statusMessageLabel = new Label(composite, SWT.NONE); - statusMessageLabel.setLayoutData(new GridData(GridData.FILL_BOTH)); - - Dialog.applyDialogFont(parent); - return composite; - } - - /** - * Creates the project name specification controls. - * - * @param parent the parent composite - */ - private void createProjectNameGroup(Composite parent) { - // project specification group - Composite projectGroup = new Composite(parent,SWT.NONE); - GridLayout layout = new GridLayout(); - layout.numColumns = 2; - projectGroup.setLayout(layout); - projectGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - - // new project label - Label projectLabel = new Label(projectGroup,SWT.NONE); - projectLabel.setText(Policy.bind("TargetLocationSelectionDialog.projectNameLabel")); //$NON-NLS-1$ - - // new project name entry field - projectNameField = new Text(projectGroup, SWT.BORDER); - GridData data = new GridData(GridData.FILL_HORIZONTAL); - data.widthHint = SIZING_TEXT_FIELD_WIDTH; - projectNameField.setLayoutData(data); - - // Set the initial value first before listener - // to avoid handling an event during the creation. - projectNameField.setText(getNewProjectName()); - projectNameField.selectAll(); - - createNameListener(); - - } - - /** - * Create the listener that is used to validate the entries for the receiver - */ - private void createNameListener() { - - Listener listener = new Listener() { - public void handleEvent(Event event) { - newProjectName = projectNameField.getText(); - setLocationForSelection(false); - applyValidationResult(checkValid()); - } - }; - - this.projectNameField.addListener(SWT.Modify, listener); - } - - /** - * Set the location to the default location if we are set to useDefaults. - */ - private void setLocationForSelection(boolean changed) { - if (useDefaults) { - IPath defaultPath = null; - if (isSingleCheckout()) { - try { - defaultPath = getSingleProject().getDescription().getLocation(); - } catch (CoreException e) { - // ignore - } - if (defaultPath == null) { - defaultPath = Platform.getLocation().append(getSingleProject().getName()); - } - } else { - defaultPath = Platform.getLocation(); - } - locationPathField.setText(defaultPath.toOSString()); - targetLocation = null; - } else if (changed) { - IPath location = null; - try { - location = this.targetProjects[0].getDescription().getLocation(); - } catch (CoreException e) { - // ignore the exception - } - if (location == null) { - targetLocation = null; - locationPathField.setText(""); //$NON-NLS-1$ - } else { - if (isSingleCheckout()) { - targetLocation = location.toOSString(); - } else { - targetLocation = location.removeLastSegments(1).toOSString(); - } - locationPathField.setText(targetLocation); - } - } - } - - /** - * Creates the project location specification controls. - * - * @param parent the parent composite - */ - private final void createProjectLocationGroup(Composite parent) { - - // project specification group - Composite projectGroup = new Composite(parent, SWT.NONE); - GridLayout layout = new GridLayout(); - layout.numColumns = 3; - projectGroup.setLayout(layout); - projectGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - - final Button useDefaultsButton = - new Button(projectGroup, SWT.CHECK | SWT.RIGHT); - useDefaultsButton.setText(Policy.bind("TargetLocationSelectionDialog.useDefaultLabel")); //$NON-NLS-1$ - useDefaultsButton.setSelection(this.useDefaults); - GridData buttonData = new GridData(); - buttonData.horizontalSpan = 3; - useDefaultsButton.setLayoutData(buttonData); - - createUserSpecifiedProjectLocationGroup(projectGroup, !this.useDefaults); - - SelectionListener listener = new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - useDefaults = useDefaultsButton.getSelection(); - browseButton.setEnabled(!useDefaults); - locationPathField.setEnabled(!useDefaults); - locationLabel.setEnabled(!useDefaults); - setLocationForSelection(true); - } - }; - useDefaultsButton.addSelectionListener(listener); - } - - /** - * Creates the project location specification controls. - * - * @return the parent of the widgets created - * @param projectGroup the parent composite - * @param enabled - sets the initial enabled state of the widgets - */ - private Composite createUserSpecifiedProjectLocationGroup(Composite projectGroup, boolean enabled) { - - // location label - locationLabel = new Label(projectGroup, SWT.NONE); - if (isSingleCheckout()) { - locationLabel.setText(Policy.bind("TargetLocationSelectionDialog.locationLabel")); //$NON-NLS-1$ - } else { - locationLabel.setText(Policy.bind("TargetLocationSelectionDialog.parentDirectoryLabel")); //$NON-NLS-1$ - } - locationLabel.setEnabled(enabled); - - // project location entry field - locationPathField = new Text(projectGroup, SWT.BORDER); - GridData data = new GridData(GridData.FILL_HORIZONTAL); - data.widthHint = SIZING_TEXT_FIELD_WIDTH; - locationPathField.setLayoutData(data); - locationPathField.setEnabled(enabled); - - // browse button - this.browseButton = new Button(projectGroup, SWT.PUSH); - this.browseButton.setText(Policy.bind("TargetLocationSelectionDialog.browseLabel")); //$NON-NLS-1$ - this.browseButton.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent event) { - handleLocationBrowseButtonPressed(); - } - }); - this.browseButton.setEnabled(enabled); - setButtonLayoutData(this.browseButton); - - // Set the initial value first before listener - // to avoid handling an event during the creation. - setLocationForSelection(true); - createLocationListener(); - return projectGroup; - - } - - /** - * Open an appropriate directory browser - */ - private void handleLocationBrowseButtonPressed() { - DirectoryDialog dialog = new DirectoryDialog(locationPathField.getShell()); - if (isSingleCheckout()) { - dialog.setMessage(Policy.bind("TargetLocationSelectionDialog.messageForSingle", newProjectName)); //$NON-NLS-1$ - } else { - dialog.setMessage(Policy.bind("TargetLocationSelectionDialog.messageForMulti", new Integer(targetProjects.length).toString())); //$NON-NLS-1$ - } - - String dirName = locationPathField.getText(); - if (!dirName.equals("")) {//$NON-NLS-1$ - File path = new File(dirName); - if (path.exists()) - dialog.setFilterPath(dirName); - } - - String selectedDirectory = dialog.open(); - if (selectedDirectory != null) { - if (targetProjects.length == 1) { - locationPathField.setText(new Path(selectedDirectory).append(newProjectName).toOSString()); - } else { - locationPathField.setText(new Path(selectedDirectory).toOSString()); - } - } - targetLocation = locationPathField.getText(); - } - - /** - * Method isSingleCheckout. - * @return boolean - */ - private boolean isSingleCheckout() { - return targetProjects.length == 1; - } - - private IProject getSingleProject() { - if (newProjectName == null || newProjectName.length() == 0 || targetProjects[0].getName().equals(newProjectName)) - return targetProjects[0]; - else - return ResourcesPlugin.getWorkspace().getRoot().getProject(newProjectName); - } - - /** - * Create the listener that is used to validate the location entered by the iser - */ - private void createLocationListener() { - - Listener listener = new Listener() { - public void handleEvent(Event event) { - applyValidationResult(checkValid()); - } - }; - - this.locationPathField.addListener(SWT.Modify, listener); - } - - /** - * Check the message. If it is null then continue otherwise inform the user via the - * status value and disable the OK. - * @param message - the error message to show if it is not null. - */ - private void applyValidationResult(String errorMsg) { - - if (errorMsg == null) { - statusMessageLabel.setText("");//$NON-NLS-1$ - getOkButton().setEnabled(true); - } else { - statusMessageLabel.setForeground( - JFaceColors.getErrorText( - statusMessageLabel.getDisplay())); - statusMessageLabel.setText(errorMsg); - getOkButton().setEnabled(false); - } - } - /** - * Check whether the entries are valid. If so return null. Otherwise - * return a string that indicates the problem. - */ - private String checkValid() { - if (isSingleCheckout()) { - String valid = checkValidName(); - if (valid != null) - return valid; - } - return checkValidLocation(); - } - /** - * Check if the entry in the widget location is valid. If it is valid return null. Otherwise - * return a string that indicates the problem. - */ - private String checkValidLocation() { - - if (useDefaults) { - targetLocation = null; - return null; - } else { - targetLocation = locationPathField.getText(); - if (targetLocation.equals("")) {//$NON-NLS-1$ - return(Policy.bind("TagetLocationSelectionDialog.locationEmpty")); //$NON-NLS-1$ - } - else{ - IPath path = new Path("");//$NON-NLS-1$ - if (!path.isValidPath(targetLocation)) { - return Policy.bind("TagetLocationSelectionDialog.invalidLocation"); //$NON-NLS-1$ - } - } - - if (isSingleCheckout()) { - IStatus locationStatus = - ResourcesPlugin.getWorkspace().validateProjectLocation( - getSingleProject(), - new Path(targetLocation)); - - if (!locationStatus.isOK()) - return locationStatus.getMessage(); - } else { - for (int i = 0; i < targetProjects.length; i++) { - ResourcesPlugin.getWorkspace().validateProjectLocation( - targetProjects[i], - new Path(targetLocation).append(targetProjects[i].getName())); - } - } - - return null; - } - } - /** - * Check if the entries in the widget are valid. If they are return null otherwise - * return a string that indicates the problem. - */ - private String checkValidName() { - - newProjectName = this.projectNameField.getText(); - IWorkspace workspace = ResourcesPlugin.getWorkspace(); - IStatus nameStatus = workspace.validateName(newProjectName, IResource.PROJECT); - if (!nameStatus.isOK()) - return nameStatus.getMessage(); -// IProject newProject = workspace.getRoot().getProject(newProjectName); -// if (newProject.exists()) { -// return Policy.bind("TagetLocationSelectionDialog.alreadyExists", newProjectName); //$NON-NLS-1$ -// } - - return null; - } - - /** - * @return String - */ - public String getNewProjectName() { - return newProjectName; - } - - /** - * @return String - */ - public String getTargetLocation() { - return targetLocation; - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TextViewerAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TextViewerAction.java deleted file mode 100644 index f2491e590..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TextViewerAction.java +++ /dev/null @@ -1,41 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - - -import org.eclipse.jface.action.Action; -import org.eclipse.jface.text.ITextOperationTarget; -import org.eclipse.jface.text.ITextViewer; -import org.eclipse.ui.texteditor.IUpdate; - -public class TextViewerAction extends Action implements IUpdate { - private int operationCode = -1; - private ITextOperationTarget operationTarget; - - public TextViewerAction(ITextViewer viewer, int operationCode) { - this.operationCode = operationCode; - operationTarget = viewer.getTextOperationTarget(); - update(); - } - public void update() { - boolean wasEnabled = isEnabled(); - boolean isEnabled = (operationTarget != null && operationTarget.canDoOperation(operationCode)); - setEnabled(isEnabled); - if (wasEnabled != isEnabled) { - firePropertyChange(ENABLED, wasEnabled ? Boolean.TRUE : Boolean.FALSE, isEnabled ? Boolean.TRUE : Boolean.FALSE); - } - } - public void run() { - if (operationCode != -1 && operationTarget != null) { - operationTarget.doOperation(operationCode); - } - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TimeoutProgressMonitorDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TimeoutProgressMonitorDialog.java deleted file mode 100644 index 42130ae0e..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TimeoutProgressMonitorDialog.java +++ /dev/null @@ -1,88 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.jface.dialogs.ProgressMonitorDialog; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.jface.operation.ModalContext; -import org.eclipse.swt.custom.BusyIndicator; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Shell; - -public class TimeoutProgressMonitorDialog extends ProgressMonitorDialog { - // the timeout - private int timeout; - // the number of currently running runnables. - private int runningRunnables = 0; - - /** - * Creates a progress monitor dialog under the given shell. - * The dialog has a standard title and no image. - * <code>open</code> is non-blocking. - * - * @param parent the parent shell - * @param timeout the delay after which the dialog will be opened during a run() - */ - public TimeoutProgressMonitorDialog(Shell parent, int timeout) { - super(parent); - this.timeout = timeout; - } - - /* (non-Javadoc) - * Method declared on IRunnableContext. - * Runs the given <code>IRunnableWithProgress</code> with the progress monitor for this - * progress dialog. The dialog is opened before it is run, and closed after it completes. - */ - public void run(final boolean fork, boolean cancelable, final IRunnableWithProgress runnable) throws InvocationTargetException, InterruptedException { - setCancelable(cancelable); - create(); // create the Shell but don't open it yet - try { - runningRunnables++; - final Display display = getShell().getDisplay(); - display.timerExec(timeout, new Runnable() { - public void run() { - Shell shell = getShell(); - if (shell != null && ! shell.isDisposed()) open(); - } - }); - - final Exception[] holder = new Exception[1]; - BusyIndicator.showWhile(display, new Runnable() { - public void run() { - try { - ModalContext.run(runnable, fork, getProgressMonitor(), display); - } catch (InvocationTargetException ite) { - holder[0] = ite; - } catch (InterruptedException ie) { - holder[0] = ie; - } - } - }); - if (holder[0] != null) { - if (holder[0] instanceof InvocationTargetException) { - throw (InvocationTargetException) holder[0]; - } else if (holder[0] instanceof InterruptedException) { - throw (InterruptedException) holder[0]; - } - } - } finally { - runningRunnables--; - close(); - } - } - - public boolean close() { - if (runningRunnables <= 0) return super.close(); - return false; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/UserValidationDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/UserValidationDialog.java deleted file mode 100644 index f449c2583..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/UserValidationDialog.java +++ /dev/null @@ -1,189 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - - -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.Text; -import org.eclipse.ui.help.WorkbenchHelp; - -/** - * A dialog for prompting for a username and password - */ -public class UserValidationDialog extends Dialog { - // widgets - protected Text usernameField; - protected Text passwordField; - - protected String domain; - protected String defaultUsername; - protected String password = null; - - // whether or not the username can be changed - protected boolean isUsernameMutable = true; - protected String username = null; - protected String message = null; - - /** - * Creates a new UserValidationDialog. - * - * @param parentShell the parent shell - * @param location the location - * @param defaultName the default user name - * @param message a mesage to display to the user - */ - public UserValidationDialog(Shell parentShell, String location, String defaultName, String message) { - super(parentShell); - this.defaultUsername = defaultName; - this.domain = location; - this.message = message; - } - /** - * @see Window#configureShell - */ - protected void configureShell(Shell newShell) { - super.configureShell(newShell); - newShell.setText(Policy.bind("UserValidationDialog.required")); //$NON-NLS-1$ - // set F1 help - WorkbenchHelp.setHelp(newShell, IHelpContextIds.USER_VALIDATION_DIALOG); - } - /** - * @see Window#create - */ - public void create() { - super.create(); - // add some default values - usernameField.setText(defaultUsername); - - if (isUsernameMutable) { - // give focus to username field - usernameField.selectAll(); - usernameField.setFocus(); - } else { - usernameField.setEditable(false); - passwordField.setFocus(); - } - } - /** - * @see Dialog#createDialogArea - */ - protected Control createDialogArea(Composite parent) { - Composite main = new Composite(parent, SWT.NONE); - GridLayout layout = new GridLayout(); - layout.numColumns = 3; - main.setLayout(layout); - main.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - - if (message != null) { - Label messageLabel = new Label(main, SWT.WRAP); - messageLabel.setText(message); - messageLabel.setForeground(messageLabel.getDisplay().getSystemColor(SWT.COLOR_RED)); - GridData data = new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL); - data.horizontalSpan = 3; - data.widthHint = 400; - messageLabel.setLayoutData(data); - } - - Label label = new Label(main, SWT.WRAP); - if (isUsernameMutable) { - label.setText(Policy.bind("UserValidationDialog.labelUser", domain)); //$NON-NLS-1$ - } else { - label.setText(Policy.bind("UserValidationDialog.labelPassword", new Object[] {defaultUsername, domain})); //$NON-NLS-1$ - } - GridData data = new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL); - data.horizontalSpan = 3; - data.widthHint = 400; - label.setLayoutData(data); - - createUsernameFields(main); - createPasswordFields(main); - - return main; - } - /** - * Creates the three widgets that represent the password entry area. - * - * @param parent the parent of the widgets - */ - protected void createPasswordFields(Composite parent) { - new Label(parent, SWT.NONE).setText(Policy.bind("UserValidationDialog.password")); //$NON-NLS-1$ - - passwordField = new Text(parent, SWT.BORDER | SWT.PASSWORD); - GridData data = new GridData(GridData.FILL_HORIZONTAL); - data.horizontalSpan = 2; - data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.ENTRY_FIELD_WIDTH); - passwordField.setLayoutData(data); - } - /** - * Creates the three widgets that represent the user name entry area. - * - * @param parent the parent of the widgets - */ - protected void createUsernameFields(Composite parent) { - new Label(parent, SWT.NONE).setText(Policy.bind("UserValidationDialog.user")); //$NON-NLS-1$ - - usernameField = new Text(parent, SWT.BORDER); - GridData data = new GridData(GridData.FILL_HORIZONTAL); - data.horizontalSpan = 2; - data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.ENTRY_FIELD_WIDTH); - usernameField.setLayoutData(data); - } - /** - * Returns the password entered by the user, or null - * if the user canceled. - * - * @return the entered password - */ - public String getPassword() { - return password; - } - /** - * Returns the username entered by the user, or null - * if the user canceled. - * - * @return the entered username - */ - public String getUsername() { - return username; - } - /** - * Notifies that the ok button of this dialog has been pressed. - * <p> - * The default implementation of this framework method sets - * this dialog's return code to <code>Window.OK</code> - * and closes the dialog. Subclasses may override. - * </p> - */ - protected void okPressed() { - password = passwordField.getText(); - username = usernameField.getText(); - - super.okPressed(); - } - /** - * Sets whether or not the username field should be mutable. - * This method must be called before create(), otherwise it - * will be ignored. - * - * @param value whether the username is mutable - */ - public void setUsernameMutable(boolean value) { - isUsernameMutable = value; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/VersionCollator.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/VersionCollator.java deleted file mode 100644 index 475fa5d72..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/VersionCollator.java +++ /dev/null @@ -1,64 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -/** - * Collator to compare two CVS revisions - */ -public class VersionCollator { - public int compare(String revision1, String revision2) { - if (revision1 == null && revision2 == null) return 0; - if (revision1 == null) return -1; - if (revision2 == null) return 1; - int[] revision1Segments = getIntSegments(revision1); - int[] revision2Segments = getIntSegments(revision2); - for (int i = 0; i < revision1Segments.length && i < revision2Segments.length; i++) { - int i1 = revision1Segments[i]; - int i2 = revision2Segments[i]; - if (i1 != i2) { - return i1 > i2 ? 1 : -1; - } - } - if (revision1Segments.length != revision2Segments.length) { - return revision1Segments.length > revision2Segments.length ? 1 : -1; - } - return 0; - } - - int[] getIntSegments(String string) { - int size = string.length(); - if (size == 0) return new int[0]; - StringBuffer buffer = new StringBuffer(); - List list = new ArrayList(); - for (int i = 0; i < size; i++) { - char ch = string.charAt(i); - if (ch == '.') { - list.add(new Integer(buffer.toString())); - buffer = new StringBuffer(); - } else { - buffer.append(ch); - } - } - list.add(new Integer(buffer.toString())); - int[] result = new int[list.size()]; - Iterator it = list.iterator(); - for (int i = 0; i < result.length; i++) { - result[i] = ((Integer)it.next()).intValue(); - } - return result; - } -} - diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WatchEditPreferencePage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WatchEditPreferencePage.java deleted file mode 100644 index a36bee70c..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WatchEditPreferencePage.java +++ /dev/null @@ -1,71 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import org.eclipse.core.runtime.Preferences; -import org.eclipse.jface.preference.BooleanFieldEditor; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.preference.RadioGroupFieldEditor; -import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; - -/** - * This page contains preferences related to the cvs watch/edit commands - */ -public class WatchEditPreferencePage extends CVSFieldEditorPreferencePage { - - /** - * @see org.eclipse.team.internal.ccvs.ui.CVSPreferencePage#getPageHelpContextId() - */ - protected String getPageHelpContextId() { - return IHelpContextIds.WATCH_EDIT_PREFERENCE_PAGE; - } - /** - * @see org.eclipse.team.internal.ccvs.ui.CVSFieldEditorPreferencePage#getPageDescription() - */ - protected String getPageDescription() { - return Policy.bind("WatchEditPreferencePage.description"); //$NON-NLS-1$; - } - - /** - * @see org.eclipse.jface.preference.FieldEditorPreferencePage#createFieldEditors() - */ - protected void createFieldEditors() { - addField(new BooleanFieldEditor( - ICVSUIConstants.PREF_CHECKOUT_READ_ONLY, - Policy.bind("WatchEditPreferencePage.checkoutReadOnly"), //$NON-NLS-1$ - BooleanFieldEditor.DEFAULT, - getFieldEditorParent())); - addField(new RadioGroupFieldEditor( - ICVSUIConstants.PREF_EDIT_ACTION, - Policy.bind("WatchEditPreferencePage.validateEditSaveAction"), //$NON-NLS-1$ - 1, - new String[][] {{Policy.bind("WatchEditPreferencePage.edit"), CVSUIPlugin.EDIT}, {Policy.bind("WatchEditPreferencePage.highjack"), CVSUIPlugin.HIGHJACK}}, //$NON-NLS-1$ //$NON-NLS-2$ - getFieldEditorParent(), true)); - } - - /** - * @see org.eclipse.jface.preference.IPreferencePage#performOk() - */ - public boolean performOk() { - if (!super.performOk()) return false; - pushPreferences(); - return true; - } - - private void pushPreferences() { - IPreferenceStore source = getCVSPreferenceStore(); - Preferences target = CVSProviderPlugin.getPlugin().getPluginPreferences(); - target.setValue( - CVSProviderPlugin.READ_ONLY, - source.getBoolean(ICVSUIConstants.PREF_CHECKOUT_READ_ONLY)); - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkInProgressPreferencePage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkInProgressPreferencePage.java deleted file mode 100644 index d6b233686..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkInProgressPreferencePage.java +++ /dev/null @@ -1,53 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import org.eclipse.jface.preference.BooleanFieldEditor; -import org.eclipse.jface.preference.FieldEditorPreferencePage; -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.IWorkbenchPreferencePage; - -public class WorkInProgressPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage { - - public WorkInProgressPreferencePage() { - super(GRID); - setTitle("CVS Work In Progress"); - setDescription("Preferences for enabling features that are not copmlete:"); - setPreferenceStore(CVSUIPlugin.getPlugin().getPreferenceStore()); - } - - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) - */ - public void createControl(Composite parent) { - super.createControl(parent); - //WorkbenchHelp.setHelp(getControl(), IDebugHelpContextIds.CONSOLE_PREFERENCE_PAGE); - } - - /* (non-Javadoc) - * @see org.eclipse.jface.preference.FieldEditorPreferencePage#createFieldEditors() - */ - public void createFieldEditors() { - addField(new BooleanFieldEditor(ICVSUIConstants.BACKGROUND_REPOVIEW, "Enable background fetching of resources in the CVS Repositories view", SWT.NONE, getFieldEditorParent())); - addField(new BooleanFieldEditor(ICVSUIConstants.BACKGROUND_OPERATIONS, "Enable operations to be run in the background (e.g. checkout, update, commit)", SWT.NONE, getFieldEditorParent())); - } - - /* (non-Javadoc) - * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) - */ - /* (non-Javadoc) - * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) - */ - public void init(IWorkbench workbench) { - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkbenchUserAuthenticator.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkbenchUserAuthenticator.java deleted file mode 100644 index b76026ac5..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkbenchUserAuthenticator.java +++ /dev/null @@ -1,147 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.core.IFileTypeInfo; -import org.eclipse.team.core.IIgnoreInfo; -import org.eclipse.team.core.Team; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.core.IUserAuthenticator; -import org.eclipse.team.internal.ccvs.core.IUserInfo; - -/** - * An authenticator that prompts the user for authentication info, - * and stores the results in the Platform's authentication keyring. - */ -public class WorkbenchUserAuthenticator implements IUserAuthenticator { - public static boolean USE_ALTERNATE_PROMPTER = false; - - /** - * WorkbenchUserAuthenticator constructor. - */ - public WorkbenchUserAuthenticator() { - super(); - // Initialize USE_ALTERNATE_PROMPTER - IIgnoreInfo[] ignores = Team.getAllIgnores(); - boolean found = false; - for (int i = 0; i < ignores.length; i++) { - if (ignores[i].getPattern().equals("*.notes")) { //$NON-NLS-1$ - found = true; - } - } - if (!found) return; - IFileTypeInfo[] types = Team.getAllTypes(); - for (int i = 0; i < types.length; i++) { - if (types[i].getExtension().equals("notes")) { //$NON-NLS-1$ - USE_ALTERNATE_PROMPTER = true; - return; - } - } - USE_ALTERNATE_PROMPTER = false; - } - /** - * @see IUserAuthenticator#authenticateUser - */ - public void promptForUserInfo(final ICVSRepositoryLocation location, final IUserInfo userinfo, final String message) throws CVSException { - if (!userinfo.isUsernameMutable() && USE_ALTERNATE_PROMPTER) { - alternatePromptForUserInfo(userinfo); - return; - } - // ask the user for a password - final String[] result = new String[2]; - Display display = Display.getCurrent(); - if (display != null) { - promptForPassword(location, userinfo.getUsername(), message, userinfo.isUsernameMutable(), result); - } else { - // sync exec in default thread - Display.getDefault().syncExec(new Runnable() { - public void run() { - promptForPassword(location, userinfo.getUsername(), message, userinfo.isUsernameMutable(), result); - } - }); - } - - if (result[0] == null) { - throw new OperationCanceledException(Policy.bind("WorkbenchUserAuthenticator.cancelled")); //$NON-NLS-1$ - } - - if (userinfo.isUsernameMutable()) - userinfo.setUsername(result[0]); - userinfo.setPassword(result[1]); - } - - /** - * Asks the user to enter a password. Places the - * results in the supplied string[]. result[0] must - * contain the username, result[1] must contain the password. - * If the user canceled, both values must be zero. - * - * @param location the location to obtain the password for - * @param username the username - * @param message a message to display to the user - * @param userMutable whether the user can be changed in the dialog - * @param result a String array of length two in which to put the result - */ - private void promptForPassword(final ICVSRepositoryLocation location, final String username, final String message, final boolean userMutable, final String[] result) { - Display display = Display.getCurrent(); - Shell shell = new Shell(display); - UserValidationDialog dialog = new UserValidationDialog(shell, location.getLocation(), (username==null)?"":username, message);//$NON-NLS-1$ - dialog.setUsernameMutable(userMutable); - dialog.open(); - shell.dispose(); - - result[0] = dialog.getUsername(); - result[1] = dialog.getPassword(); - } - - /** - * Special alternate prompting. Returns the password. Username must be fixed. - */ - private String alternatePromptForPassword(final String username) { - Display display = Display.getCurrent(); - Shell shell = new Shell(display); - AlternateUserValidationDialog dialog = new AlternateUserValidationDialog(shell, (username == null) ? "" : username); //$NON-NLS-1$ - dialog.setUsername(username); - int result = dialog.open(); - shell.dispose(); - if (result == Dialog.CANCEL) return null; - return dialog.getPassword(); - } - /** - * Special alternate prompting. - */ - public void alternatePromptForUserInfo(final IUserInfo userinfo) throws CVSException { - // ask the user for a password - final String[] result = new String[1]; - Display display = Display.getCurrent(); - if (display != null) { - result[0] = alternatePromptForPassword(userinfo.getUsername()); - } else { - // sync exec in default thread - Display.getDefault().syncExec(new Runnable() { - public void run() { - result[0] = alternatePromptForPassword(userinfo.getUsername()); - } - }); - } - - if (result[0] == null) { - throw new OperationCanceledException(Policy.bind("WorkbenchUserAuthenticator.The_operation_was_canceled_by_the_user_1")); //$NON-NLS-1$ - } - - userinfo.setPassword(result[0]); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkingSetSelectionArea.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkingSetSelectionArea.java deleted file mode 100644 index b7dd0f871..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkingSetSelectionArea.java +++ /dev/null @@ -1,309 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.dialogs.IDialogSettings; -import org.eclipse.jface.util.IPropertyChangeListener; -import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.jface.window.Window; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Combo; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.team.internal.ui.dialogs.DialogArea; -import org.eclipse.ui.IWorkingSet; -import org.eclipse.ui.IWorkingSetManager; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.dialogs.IWorkingSetSelectionDialog; - -/** - * @author Administrator - * - * To change this generated comment edit the template variable "typecomment": - * Window>Preferences>Java>Templates. - * To enable and disable the creation of type comments go to - * Window>Preferences>Java>Code Generation. - */ -public class WorkingSetSelectionArea extends DialogArea { - - private Button noWorkingSetButton; - private Button workingSetButton; - private Combo mruList; - private Button selectButton; - private IWorkingSet workingSet, oldWorkingSet; - - private String noWorkingSetText; - private String workingSetText; - - private static final String USE_WORKING_SET = "UseWorkingSet"; //$NON-NLS-1$ - public static final String SELECTED_WORKING_SET = "SelectedWorkingSet"; //$NON-NLS-1$ - - /* - * Used to update the mru list box when working sets are - * renamed in the working set selection dialog. - */ - private IPropertyChangeListener workingSetChangeListener = new IPropertyChangeListener() { - public void propertyChange(PropertyChangeEvent event) { - String property = event.getProperty(); - Object newValue = event.getNewValue(); - - if (IWorkingSetManager.CHANGE_WORKING_SET_NAME_CHANGE.equals(property) && - newValue instanceof IWorkingSet) { - String newName = ((IWorkingSet) newValue).getName(); - int count = mruList.getItemCount(); - for (int i = 0; i < count; i++) { - String item = mruList.getItem(i); - IWorkingSet workingSet = (IWorkingSet) mruList.getData(item); - if (workingSet == newValue) { - boolean isTopItem = (mruList.getData(mruList.getText()) == workingSet); - mruList.remove(i); - mruList.add(newName, i); - mruList.setData(newName, workingSet); - if (isTopItem) { - mruList.setText(newName); - } - break; - } - } - } - } - }; - - public WorkingSetSelectionArea(Dialog parentDialog) { - super(parentDialog, null); - } - - public WorkingSetSelectionArea(Dialog parentDialog, String noWorkingSetText, String workingSetText, IDialogSettings settings) { - super(parentDialog, settings); - this.noWorkingSetText = noWorkingSetText; - this.workingSetText = workingSetText; - } - - /** - * Overrides method in Dialog - * - * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(Composite) - */ - public Control createArea(Composite parent) { - Composite composite = createComposite(parent, 2); - initializeDialogUnits(composite); - GridData data = new GridData(GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_CENTER); - composite.setLayoutData(data); - GridLayout layout = new GridLayout(); - layout.marginWidth = 0; - layout.numColumns = 2; - composite.setLayout(layout); - - // Create the checkbox to enable/disable working set use - noWorkingSetButton = createRadioButton(composite, noWorkingSetText, 2); - workingSetButton = createRadioButton(composite, workingSetText, 2); - workingSetButton.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - handleWorkingSetButtonSelection(); - } - }); - - boolean useWorkingSet = false; - if (settings != null) { - useWorkingSet = settings.getBoolean(USE_WORKING_SET); - } - noWorkingSetButton.setSelection(!useWorkingSet); - workingSetButton.setSelection(useWorkingSet); - - // Create the combo/button which allows working set selection - mruList = new Combo(composite, SWT.DROP_DOWN | SWT.READ_ONLY); - data = new GridData(GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_CENTER); - data.horizontalIndent=15; - mruList.setLayoutData(data); - mruList.setFont(composite.getFont()); - - selectButton = createButton(composite, Policy.bind("WorkingSetSelectionArea.workingSetOther"), GridData.HORIZONTAL_ALIGN_FILL); //$NON-NLS-1$ - selectButton.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent event) { - handleWorkingSetSelection(); - } - }); - - initializeMru(); - initializeWorkingSet(); - - mruList.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - handleMruSelection(); - } - }); - - return composite; - } - - /** - * Method handleMruSelection. - */ - private void handleMruSelection() { - String selectedWorkingSet = mruList.getText(); - oldWorkingSet = workingSet; - workingSet = (IWorkingSet) mruList.getData(selectedWorkingSet); - if (settings != null) - settings.put(SELECTED_WORKING_SET, selectedWorkingSet); - handleWorkingSetChange(); - } - - /** - * Opens the working set selection dialog if the "Other..." item - * is selected in the most recently used working set list. - */ - private void handleWorkingSetSelection() { - IWorkingSetSelectionDialog dialog = PlatformUI.getWorkbench().getWorkingSetManager().createWorkingSetSelectionDialog(getShell(), false); - IWorkingSetManager workingSetManager = PlatformUI.getWorkbench().getWorkingSetManager(); - IWorkingSet workingSet = workingSetManager.getWorkingSet(mruList.getText()); - - if (workingSet != null) { - dialog.setSelection(new IWorkingSet[]{workingSet}); - } - // add a change listener to detect a working set name change - workingSetManager.addPropertyChangeListener(workingSetChangeListener); - if (dialog.open() == Window.OK) { - IWorkingSet[] result = dialog.getSelection(); - if (result != null && result.length > 0) { - workingSet = result[0]; - String workingSetName = workingSet.getName(); - if (mruList.indexOf(workingSetName) != -1) { - mruList.remove(workingSetName); - } - mruList.add(workingSetName, 0); - mruList.setText(workingSetName); - mruList.setData(workingSetName, workingSet); - handleMruSelection(); - } - else { - workingSet = null; - } - // remove deleted working sets from the mru list box - String[] mruNames = mruList.getItems(); - for (int i = 0; i < mruNames.length; i++) { - if (workingSetManager.getWorkingSet(mruNames[i]) == null) { - mruList.remove(mruNames[i]); - } - } - } - workingSetManager.removePropertyChangeListener(workingSetChangeListener); - } - - /** - * Sets the enabled state of the most recently used working set list - * based on the checked state of the working set check box. - */ - private void handleWorkingSetButtonSelection() { - boolean useWorkingSet = workingSetButton.getSelection(); - if (settings != null) - settings.put(USE_WORKING_SET, useWorkingSet); - mruList.setEnabled(useWorkingSet); - selectButton.setEnabled(useWorkingSet); - if (useWorkingSet && mruList.getSelectionIndex() >= 0) { - handleMruSelection(); - } else if (!useWorkingSet) { - handleDeselection(); - } - } - - private void handleDeselection() { - oldWorkingSet = workingSet; - workingSet = null; - handleWorkingSetChange(); - } - - private void handleWorkingSetChange() { - firePropertyChangeChange(SELECTED_WORKING_SET, oldWorkingSet, workingSet); - } - - /** - * Populates the most recently used working set list with MRU items from - * the working set manager as well as adds an item to enable selection of - * a working set not in the MRU list. - */ - private void initializeMru() { - IWorkingSet[] workingSets = PlatformUI.getWorkbench().getWorkingSetManager().getRecentWorkingSets(); - - for (int i = 0; i < workingSets.length; i++) { - String workingSetName = workingSets[i].getName(); - mruList.add(workingSetName); - mruList.setData(workingSetName, workingSets[i]); - } - if (workingSets.length > 0) { - mruList.setText(workingSets[0].getName()); - } - } - - /** - * Initializes the state of the working set part of the dialog. - */ - private void initializeWorkingSet() { - if (workingSet == null && settings != null && settings.getBoolean(USE_WORKING_SET)) { - IWorkingSet mruSet = PlatformUI.getWorkbench().getWorkingSetManager().getWorkingSet(settings.get(SELECTED_WORKING_SET)); - if (mruSet != null) { - // the call to setWorkingSet will re-invoke the initializeWorkingSet method - setWorkingSet(mruSet); - return; - } - } - workingSetButton.setSelection(workingSet != null); - handleWorkingSetButtonSelection(); - if (workingSet != null && mruList.indexOf(workingSet.getName()) != -1) { - mruList.setText(workingSet.getName()); - } - handleWorkingSetChange(); - } - - /** - * Returns the selected working set or null if none is selected. - * - * @return the selected working set or null if none is selected. - */ - public IWorkingSet getWorkingSet() { - return workingSet; - } - - /** - * Indicate that the selected working set is actually being used so it can - * be added to the "most recently used" list. - */ - public void useSelectedWorkingSet() { - // Add the selected working set to the MRU list before returning it - if (workingSet != null) { - PlatformUI.getWorkbench().getWorkingSetManager().addRecentWorkingSet(workingSet); - } - } - - /** - * Sets the working set that should be selected in the most recently - * used working set list. - * - * @param workingSet the working set that should be selected. - * has to exist in the list returned by - * org.eclipse.ui.IWorkingSetManager#getRecentWorkingSets(). - * Must not be null. - */ - public void setWorkingSet(IWorkingSet workingSet) { - oldWorkingSet = this.workingSet; - this.workingSet = workingSet; - - if (workingSetButton != null && mruList != null) { - initializeWorkingSet(); - } - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/XMLWriter.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/XMLWriter.java deleted file mode 100644 index 1b2e1fbbc..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/XMLWriter.java +++ /dev/null @@ -1,116 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui; - -import java.io.*; -import java.util.*; -/** - * A simple XML writer. - */ -public class XMLWriter extends PrintWriter { - protected int tab; - - /* constants */ - protected static final String XML_VERSION = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"; //$NON-NLS-1$ - -public XMLWriter(OutputStream output) throws UnsupportedEncodingException { - super(new OutputStreamWriter(output, "UTF8")); //$NON-NLS-1$ - tab = 0; - println(XML_VERSION); -} -public void endTag(String name) { - tab--; - printTag('/' + name, null); -} -public void printSimpleTag(String name, Object value) { - if (value != null) { - printTag(name, null, true, false); - print(getEscaped(String.valueOf(value))); - printTag('/' + name, null, false, true); - } -} -public void printTabulation() { - for (int i = 0; i < tab; i++) - super.print('\t'); -} -private void printTag(String name, HashMap parameters) { - printTag(name, parameters, true, true); -} -private void printTag(String name, HashMap parameters, boolean tab, boolean newLine) { - printTag(name, parameters, tab, newLine, false); -} -private void printTag(String name, HashMap parameters, boolean tab, boolean newLine, boolean end) { - StringBuffer sb = new StringBuffer(); - sb.append("<"); //$NON-NLS-1$ - sb.append(name); - if (parameters != null) - for (Enumeration enum = Collections.enumeration(parameters.keySet()); enum.hasMoreElements();) { - sb.append(" "); //$NON-NLS-1$ - String key = (String) enum.nextElement(); - sb.append(key); - sb.append("=\""); //$NON-NLS-1$ - sb.append(getEscaped(String.valueOf(parameters.get(key)))); - sb.append("\""); //$NON-NLS-1$ - } - if (end) - sb.append('/'); - sb.append(">"); //$NON-NLS-1$ - if (tab) - printTabulation(); - if (newLine) - println(sb.toString()); - else - print(sb.toString()); -} -public void startTag(String name, HashMap parameters) { - startTag(name, parameters, true); -} -public void startTag(String name, HashMap parameters, boolean newLine) { - printTag(name, parameters, true, newLine); - tab++; -} -public void startAndEndTag(String name, HashMap parameters, boolean newLine) { - printTag(name, parameters, true, true, true); -} -private static void appendEscapedChar(StringBuffer buffer, char c) { - String replacement = getReplacement(c); - if (replacement != null) { - buffer.append('&'); - buffer.append(replacement); - buffer.append(';'); - } else { - buffer.append(c); - } -} -public static String getEscaped(String s) { - StringBuffer result = new StringBuffer(s.length() + 10); - for (int i = 0; i < s.length(); ++i) - appendEscapedChar(result, s.charAt(i)); - return result.toString(); -} -private static String getReplacement(char c) { - // Encode special XML characters into the equivalent character references. - // These five are defined by default for all XML documents. - switch (c) { - case '<' : - return "lt"; //$NON-NLS-1$ - case '>' : - return "gt"; //$NON-NLS-1$ - case '"' : - return "quot"; //$NON-NLS-1$ - case '\'' : - return "apos"; //$NON-NLS-1$ - case '&' : - return "amp"; //$NON-NLS-1$ - } - return null; -} -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/AddAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/AddAction.java deleted file mode 100644 index 4ba874e43..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/AddAction.java +++ /dev/null @@ -1,128 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.actions; - -import java.lang.reflect.InvocationTargetException; -import java.util.Hashtable; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSTeamProvider; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.ui.actions.WorkspaceModifyOperation; - -/** - * AddAction performs a 'cvs add' command on the selected resources. If a - * container is selected, its children are recursively added. - */ -public class AddAction extends WorkspaceAction { - - /* - * @see CVSAction#execute() - */ - public void execute(IAction action) throws InterruptedException, InvocationTargetException { - if (!promptForAddOfIgnored()) return; - run(new WorkspaceModifyOperation() { - public void execute(IProgressMonitor monitor) throws InterruptedException, InvocationTargetException { - try { - Hashtable table = getProviderMapping(); - Set keySet = table.keySet(); - monitor.beginTask("", keySet.size() * 1000); //$NON-NLS-1$ - monitor.setTaskName(Policy.bind("AddAction.adding")); //$NON-NLS-1$ - Iterator iterator = keySet.iterator(); - while (iterator.hasNext()) { - IProgressMonitor subMonitor = Policy.subMonitorFor(monitor, 1000); - CVSTeamProvider provider = (CVSTeamProvider)iterator.next(); - List list = (List)table.get(provider); - IResource[] providerResources = (IResource[])list.toArray(new IResource[list.size()]); - provider.add(providerResources, IResource.DEPTH_INFINITE, subMonitor); - } - } catch (TeamException e) { - throw new InvocationTargetException(e); - } finally { - monitor.done(); - } - } - }, true /* cancelable */, PROGRESS_DIALOG); - - } - - /** - * Method promptForAddOfIgnored. - */ - private boolean promptForAddOfIgnored() { - IResource[] resources = getSelectedResources(); - boolean prompt = false; - for (int i = 0; i < resources.length; i++) { - ICVSResource resource = CVSWorkspaceRoot.getCVSResourceFor(resources[i]); - try { - if (resource.isIgnored()) { - prompt = true; - break; - } - } catch (CVSException e) { - handle(e); - } - } - if (prompt) { - return MessageDialog.openQuestion(getShell(), Policy.bind("AddAction.addIgnoredTitle"), Policy.bind("AddAction.addIgnoredQuestion")); //$NON-NLS-1$ //$NON-NLS-2$ - } - return true; - } - - /* - * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getErrorTitle() - */ - protected String getErrorTitle() { - return Policy.bind("AddAction.addFailed"); //$NON-NLS-1$ - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForManagedResources() - */ - protected boolean isEnabledForManagedResources() { - return false; - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForUnmanagedResources() - */ - protected boolean isEnabledForUnmanagedResources() { - return true; - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForIgnoredResources() - */ - protected boolean isEnabledForIgnoredResources() { - return true; - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForCVSResource(org.eclipse.team.internal.ccvs.core.ICVSResource) - */ - protected boolean isEnabledForCVSResource(ICVSResource cvsResource) throws CVSException { - // Add to version control should never be enabled for linked resources - IResource resource = cvsResource.getIResource(); - if (resource.isLinked()) return false; - return super.isEnabledForCVSResource(cvsResource); - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/AddToWorkspaceAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/AddToWorkspaceAction.java deleted file mode 100644 index 8d13812bb..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/AddToWorkspaceAction.java +++ /dev/null @@ -1,191 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.actions; - -import java.io.File; -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.Path; -import org.eclipse.jface.action.IAction; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.core.client.Checkout; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ui.dialogs.IPromptCondition; -import org.eclipse.team.internal.ui.dialogs.PromptingDialog; -import org.eclipse.ui.actions.WorkspaceModifyOperation; - -/** - * Add some remote resources to the workspace. Current implementation: - * -Works only for remote folders - * -Does not prompt for project name; uses folder name instead - */ -public class AddToWorkspaceAction extends CVSAction { - /** - * Returns the selected remote folders. - * Remove any module aliases as they may cause problems on checkout this way - */ - protected ICVSRemoteFolder[] getSelectedRemoteFolders() { - ICVSRemoteFolder[] allFolders = super.getSelectedRemoteFolders(); - if (allFolders.length == 0) return allFolders; - ArrayList resources = new ArrayList(); - for (int i = 0; i < allFolders.length; i++) { - ICVSRemoteFolder folder = allFolders[i]; - if (!Checkout.ALIAS.isElementOf(folder.getLocalOptions())) { - resources.add(folder); - } - } - return (ICVSRemoteFolder[])resources.toArray(new ICVSRemoteFolder[resources.size()]); - } - - /* - * @see CVSAction#execute() - */ - public void execute(IAction action) throws InvocationTargetException, InterruptedException { - checkoutSelectionIntoWorkspaceDirectory(); - } - - protected void checkoutSelectionIntoWorkspaceDirectory() throws InvocationTargetException, InterruptedException { - run(new WorkspaceModifyOperation() { - public void execute(IProgressMonitor monitor) throws InterruptedException, InvocationTargetException { - try { - ICVSRemoteFolder[] folders = getSelectedRemoteFolders(); - - List targetProjects = new ArrayList(); - Map targetFolders = new HashMap(); - for (int i = 0; i < folders.length; i++) { - String name = folders[i].getName(); - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name); - targetFolders.put(name, folders[i]); - targetProjects.add(project); - } - - IResource[] projects = (IResource[]) targetProjects.toArray(new IResource[targetProjects.size()]); - - PromptingDialog prompt = new PromptingDialog(getShell(), projects, - getOverwriteLocalAndFileSystemPrompt(), - Policy.bind("ReplaceWithAction.confirmOverwrite"));//$NON-NLS-1$ - projects = prompt.promptForMultiple(); - - monitor.beginTask(null, 100); - if (projects.length != 0) { - IProject[] localFolders = new IProject[projects.length]; - ICVSRemoteFolder[] remoteFolders = new ICVSRemoteFolder[projects.length]; - for (int i = 0; i < projects.length; i++) { - localFolders[i] = (IProject)projects[i]; - remoteFolders[i] = (ICVSRemoteFolder)targetFolders.get(projects[i].getName()); - } - - monitor.setTaskName(getTaskName(remoteFolders)); - CVSWorkspaceRoot.checkout(remoteFolders, localFolders, Policy.subMonitorFor(monitor, 100)); - } - } catch (TeamException e) { - throw new InvocationTargetException(e); - } finally { - monitor.done(); - } - } - }, true /* cancelable */, PROGRESS_DIALOG); - } - - /* - * @see TeamAction#isEnabled() - */ - protected boolean isEnabled() throws TeamException { - ICVSRemoteFolder[] resources = getSelectedRemoteFolders(); - if (resources.length == 0) return false; - for (int i = 0; i < resources.length; i++) { - if (resources[i] instanceof ICVSRepositoryLocation) return false; - } - return true; - } - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getErrorTitle() - */ - protected String getErrorTitle() { - return Policy.bind("AddToWorkspaceAction.checkoutFailed"); //$NON-NLS-1$ - } - - /* - * Prompt the user to overwrite any projects that overlap with the module expansions. - * - * This is an all or nothing prompt. If the user says no to one project overwrite - * then the whole operation must be aborted. This is because there is no easy way to - * map the module expansions back to their remote modules. - */ - private boolean promptForOverwrite(String[] expansions) throws InterruptedException { - - // If the target project exists, prompt the user for overwrite - Set targetProjects = new HashSet(); - for (int i = 0; i < expansions.length; i++) { - String string = expansions[i]; - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(new Path(string).segment(0)); - targetProjects.add(project); - } - IResource[] projects = (IResource[]) targetProjects.toArray(new IResource[targetProjects.size()]); - PromptingDialog prompt = new PromptingDialog(getShell(), projects, - getOverwriteLocalAndFileSystemPrompt(), - Policy.bind("ReplaceWithAction.confirmOverwrite"), - true /* all or nothing*/);//$NON-NLS-1$ - return (prompt.promptForMultiple().length == projects.length); - } - - protected static String getTaskName(ICVSRemoteFolder[] remoteFolders) { - if (remoteFolders.length == 1) { - ICVSRemoteFolder folder = remoteFolders[0]; - String label = folder.getRepositoryRelativePath(); - if (label.equals(FolderSyncInfo.VIRTUAL_DIRECTORY)) { - label = folder.getName(); - } - return Policy.bind("AddToWorkspace.taskName1", label); //$NON-NLS-1$ - } - else { - return Policy.bind("AddToWorkspace.taskNameN", new Integer(remoteFolders.length).toString()); //$NON-NLS-1$ - } - } - - protected IPromptCondition getOverwriteLocalAndFileSystemPrompt() { - return new IPromptCondition() { - // prompt if resource in workspace exists or exists in local file system - public boolean needsPrompt(IResource resource) { - File localLocation = getFileLocation(resource); - if(resource.exists() || localLocation.exists()) { - return true; - } - return false; - } - public String promptMessage(IResource resource) { - File localLocation = getFileLocation(resource); - if(resource.exists()) { - return Policy.bind("AddToWorkspaceAction.thisResourceExists", resource.getName());//$NON-NLS-1$ - } else { - return Policy.bind("AddToWorkspaceAction.thisExternalFileExists", resource.getName());//$NON-NLS-1$ - } - } - private File getFileLocation(IResource resource) { - return new File(resource.getParent().getLocation().toFile(), resource.getName()); - } - }; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/BranchAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/BranchAction.java deleted file mode 100644 index c79269e39..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/BranchAction.java +++ /dev/null @@ -1,193 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.actions; - -import java.lang.reflect.InvocationTargetException; -import java.util.Hashtable; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.SubProgressMonitor; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.dialogs.InputDialog; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.CVSTeamProvider; -import org.eclipse.team.internal.ccvs.core.ICVSFile; -import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo; -import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo; -import org.eclipse.team.internal.ccvs.ui.BranchPromptDialog; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ccvs.ui.repo.RepositoryManager; -import org.eclipse.ui.actions.WorkspaceModifyOperation; - -/** - * BranchAction tags the selected resources with a branch tag specified by the user, - * and optionally updates the local resources to point to the new branch. - */ -public class BranchAction extends WorkspaceAction { - - /* - * @see CVSAction#execute() - */ - public void execute(IAction action) throws InvocationTargetException, InterruptedException { - - // Prompt for the branch tag and whether to start working in the branch - final IResource[] resources = getSelectedResources(); - boolean allSticky = areAllResourcesSticky(resources); - ICVSFolder folder = CVSWorkspaceRoot.getCVSFolderFor(resources[0].getProject()); - final BranchPromptDialog dialog = new BranchPromptDialog(getShell(), - Policy.bind("BranchWizard.title"), //$NON-NLS-1$ - folder, - allSticky, - calculateInitialVersionName(resources,allSticky)); - if (dialog.open() != InputDialog.OK) return; - - // Capture the dialog info in local variables - final String tagString = dialog.getBranchTagName(); - final boolean update = dialog.getUpdate(); - final String versionString = dialog.getVersionTagName(); - final CVSTag rootVersionTag = (versionString == null) ? null : new CVSTag(versionString, CVSTag.VERSION); - final CVSTag branchTag = new CVSTag(tagString, CVSTag.BRANCH); - - // For non-projects determine if the tag being loaded is the same as the resource's parent - // If it's not, warn the user that they will be mixing tags - if (update) { - try { - if(!CVSAction.checkForMixingTags(getShell(), resources, branchTag)) { - return; - } - } catch (CVSException e) { - throw new InvocationTargetException(e); - } - } - - final RepositoryManager manager = CVSUIPlugin.getPlugin().getRepositoryManager(); - - // perform the branch - run(new WorkspaceModifyOperation() { - public void execute(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - - Hashtable table = getProviderMapping(resources); - Set keySet = table.keySet(); - monitor.beginTask(null, keySet.size() * 1000); - Iterator iterator = keySet.iterator(); - while (iterator.hasNext()) { - IProgressMonitor subMonitor = new SubProgressMonitor(monitor, 1000); - CVSTeamProvider provider = (CVSTeamProvider)iterator.next(); - List list = (List)table.get(provider); - IResource[] providerResources = (IResource[])list.toArray(new IResource[list.size()]); - try { - ICVSRepositoryLocation root = provider.getCVSWorkspaceRoot().getRemoteLocation(); - if (!areAllResourcesSticky(resources)) { - // version everything in workspace with the root version tag specified in dialog - provider.makeBranch(providerResources, rootVersionTag, branchTag, update, subMonitor); - } else { - // all resources are versions, use that version as the root of the branch - provider.makeBranch(providerResources, null, branchTag, update, subMonitor); - } - if (rootVersionTag != null || update) { - for (int i = 0; i < providerResources.length; i++) { - ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(providerResources[i]); - if (rootVersionTag != null) { - manager.addTags(cvsResource, new CVSTag[] { rootVersionTag }); - } - if (update) { - manager.addTags(cvsResource, new CVSTag[] { branchTag }); - } - } - } - } catch (TeamException e) { - // Accumulate the status which will be displayed by CVSAction#endOperation(IAction) - addStatus(e.getStatus()); - } - } - } - }, true /* cancelable */, PROGRESS_DIALOG); - } - - /** - * Answers <code>true</code> if all resources in the array have a sticky tag - */ - private boolean areAllResourcesSticky(IResource[] resources) { - for (int i = 0; i < resources.length; i++) { - if(!hasStickyTag(resources[i])) return false; - } - return true; - } - - /** - * Answers <code>true</code> if the resource has a sticky tag - */ - private boolean hasStickyTag(IResource resource) { - try { - ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource); - CVSTag tag; - if(cvsResource.isFolder()) { - FolderSyncInfo folderInfo = ((ICVSFolder)cvsResource).getFolderSyncInfo(); - tag = folderInfo.getTag(); - } else { - ResourceSyncInfo info = cvsResource.getSyncInfo(); - tag = info.getTag(); - } - if(tag!=null) { - int tagType = tag.getType(); - if(tagType==CVSTag.VERSION) { - return true; - } - } - } catch(CVSException e) { - CVSUIPlugin.log(e); - return false; - } - return false; - } - - private String calculateInitialVersionName(IResource[] resources, boolean allSticky) { - String versionName = ""; //$NON-NLS-1$ - try { - if(allSticky) { - IResource stickyResource = resources[0]; - if(stickyResource.getType()==IResource.FILE) { - ICVSFile cvsFile = CVSWorkspaceRoot.getCVSFileFor((IFile)stickyResource); - versionName = cvsFile.getSyncInfo().getTag().getName(); - } else { - ICVSFolder cvsFolder = CVSWorkspaceRoot.getCVSFolderFor((IContainer)stickyResource); - versionName = cvsFolder.getFolderSyncInfo().getTag().getName(); - } - } - } catch(CVSException e) { - CVSUIPlugin.log(e); - versionName = ""; //$NON-NLS-1$ - } - return versionName; - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getErrorTitle() - */ - protected String getErrorTitle() { - return Policy.bind("BranchWizard.errorBranching"); //$NON-NLS-1$ - } - -} - diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java deleted file mode 100644 index e245bd325..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java +++ /dev/null @@ -1,469 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.actions; - -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; - -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.MultiStatus; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.dialogs.ProgressMonitorDialog; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.swt.custom.BusyIndicator; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSStatus; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteResource; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.internal.ccvs.core.ILogEntry; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.ui.AvoidableMessageDialog; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ccvs.ui.repo.RepositoryManager; -import org.eclipse.team.internal.ui.actions.TeamAction; -import org.eclipse.team.internal.ui.dialogs.IPromptCondition; -import org.eclipse.ui.PlatformUI; - -/** - * CVSAction is the common superclass for all CVS actions. It provides - * facilities for enablement handling, standard error handling, selection - * retrieval and prompting. - */ -abstract public class CVSAction extends TeamAction { - - private List accumulatedStatus = new ArrayList(); - - /** - * Common run method for all CVS actions. - */ - final public void run(IAction action) { - try { - if (!beginExecution(action)) return; - execute(action); - endExecution(); - } catch (InvocationTargetException e) { - // Handle the exception and any accumulated errors - handle(e); - } catch (InterruptedException e) { - // Show any problems that have occured so far - handle(null); - } catch (TeamException e) { - // Handle the exception and any accumulated errors - handle(e); - } - } - - /** - * This method gets invoked before the <code>CVSAction#execute(IAction)</code> - * method. It can preform any prechecking and initialization required before - * the action is executed. Sunclasses may override but must invoke this - * inherited method to ensure proper initialization of this superclass is performed. - * These included prepartion to accumulate IStatus and checking for dirty editors. - */ - protected boolean beginExecution(IAction action) throws TeamException { - accumulatedStatus.clear(); - if(needsToSaveDirtyEditors()) { - if(!saveAllEditors()) { - return false; - } - } - return true; - } - - /** - * Actions must override to do their work. - */ - abstract protected void execute(IAction action) throws InvocationTargetException, InterruptedException; - - /** - * This method gets invoked after <code>CVSAction#execute(IAction)</code> - * if no exception occured. Sunclasses may override but should invoke this - * inherited method to ensure proper handling oy any accumulated IStatus. - */ - protected void endExecution() throws TeamException { - if ( ! accumulatedStatus.isEmpty()) { - handle(null); - } - } - - /** - * Add a status to the list of accumulated status. - * These will be provided to method handle(Exception, IStatus[]) - * when the action completes. - */ - protected void addStatus(IStatus status) { - accumulatedStatus.add(status); - } - - /** - * Return the list of status accumulated so far by the action. This - * will include any OK status that were added using addStatus(IStatus) - */ - protected IStatus[] getAccumulatedStatus() { - return (IStatus[]) accumulatedStatus.toArray(new IStatus[accumulatedStatus.size()]); - } - - /** - * Return the title to be displayed on error dialogs. - * Sunclasses should override to present a custon message. - */ - protected String getErrorTitle() { - return Policy.bind("CVSAction.errorTitle"); //$NON-NLS-1$ - } - - /** - * Return the title to be displayed on error dialogs when warnigns occur. - * Sunclasses should override to present a custon message. - */ - protected String getWarningTitle() { - return Policy.bind("CVSAction.warningTitle"); //$NON-NLS-1$ - } - - /** - * Return the message to be used for the parent MultiStatus when - * mulitple errors occur during an action. - * Sunclasses should override to present a custon message. - */ - protected String getMultiStatusMessage() { - return Policy.bind("CVSAction.multipleProblemsMessage"); //$NON-NLS-1$ - } - - /** - * Return the status to be displayed in an error dialog for the given list - * of non-OK status. - * - * This method can be overridden bu subclasses. Returning an OK status will - * prevent the error dialog from being shown. - */ - protected IStatus getStatusToDisplay(IStatus[] problems) { - if (problems.length == 1) { - return problems[0]; - } - MultiStatus combinedStatus = new MultiStatus(CVSUIPlugin.ID, 0, getMultiStatusMessage(), null); //$NON-NLS-1$ - for (int i = 0; i < problems.length; i++) { - combinedStatus.merge(problems[i]); - } - return combinedStatus; - } - - /** - * Method that implements generic handling of an exception. - * - * Thsi method will also use any accumulated status when determining what - * information (if any) to show the user. - * - * @param exception the exception that occured (or null if none occured) - * @param status any status accumulated by the action before the end of - * the action or the exception occured. - */ - protected void handle(Exception exception) { - // Get the non-OK statii - List problems = new ArrayList(); - IStatus[] status = getAccumulatedStatus(); - if (status != null) { - for (int i = 0; i < status.length; i++) { - IStatus iStatus = status[i]; - if ( ! iStatus.isOK() || iStatus.getCode() == CVSStatus.SERVER_ERROR) { - problems.add(iStatus); - } - } - } - // Handle the case where there are no problem statii - if (problems.size() == 0) { - if (exception == null) return; - handle(exception, getErrorTitle(), null); - return; - } - - // For now, display both the exception and the problem status - // Later, we can determine how to display both together - if (exception != null) { - handle(exception, getErrorTitle(), null); - } - - String message = null; - IStatus statusToDisplay = getStatusToDisplay((IStatus[]) problems.toArray(new IStatus[problems.size()])); - if (statusToDisplay.isOK()) return; - if (statusToDisplay.isMultiStatus() && statusToDisplay.getChildren().length == 1) { - message = statusToDisplay.getMessage(); - statusToDisplay = statusToDisplay.getChildren()[0]; - } - String title; - if (statusToDisplay.getSeverity() == IStatus.ERROR) { - title = getErrorTitle(); - } else { - title = getWarningTitle(); - } - CVSUIPlugin.openError(getShell(), title, message, new CVSException(statusToDisplay)); - } - - /** - * Convenience method for running an operation with the appropriate progress. - * Any exceptions are propogated so they can be handled by the - * <code>CVSAction#run(IAction)</code> error handling code. - * - * @param runnable the runnable which executes the operation - * @param cancelable indicate if a progress monitor should be cancelable - * @param progressKind one of PROGRESS_BUSYCURSOR or PROGRESS_DIALOG - */ - final protected void run(final IRunnableWithProgress runnable, boolean cancelable, int progressKind) throws InvocationTargetException, InterruptedException { - final Exception[] exceptions = new Exception[] {null}; - - // Ensure that no repository view refresh happens until after the action - final IRunnableWithProgress innerRunnable = new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - getRepositoryManager().run(runnable, monitor); - } - }; - - switch (progressKind) { - case PROGRESS_BUSYCURSOR : - BusyIndicator.showWhile(Display.getCurrent(), new Runnable() { - public void run() { - try { - innerRunnable.run(new NullProgressMonitor()); - } catch (InvocationTargetException e) { - exceptions[0] = e; - } catch (InterruptedException e) { - exceptions[0] = e; - } - } - }); - break; - case PROGRESS_DIALOG : - default : - new ProgressMonitorDialog(getShell()).run(cancelable, true, innerRunnable); - break; - } - if (exceptions[0] != null) { - if (exceptions[0] instanceof InvocationTargetException) - throw (InvocationTargetException)exceptions[0]; - else - throw (InterruptedException)exceptions[0]; - } - } - - /** - * Answers if the action would like dirty editors to saved - * based on the CVS preference before running the action. By - * default, CVSActions do not save dirty editors. - */ - protected boolean needsToSaveDirtyEditors() { - return false; - } - - /** - * Returns the selected CVS resources - */ - protected ICVSResource[] getSelectedCVSResources() { - ArrayList resources = null; - if (!selection.isEmpty()) { - resources = new ArrayList(); - Iterator elements = ((IStructuredSelection) selection).iterator(); - while (elements.hasNext()) { - Object next = elements.next(); - if (next instanceof ICVSResource) { - resources.add(next); - continue; - } - if (next instanceof IAdaptable) { - IAdaptable a = (IAdaptable) next; - Object adapter = a.getAdapter(ICVSResource.class); - if (adapter instanceof ICVSResource) { - resources.add(adapter); - continue; - } - } - } - } - if (resources != null && !resources.isEmpty()) { - return (ICVSResource[])resources.toArray(new ICVSResource[resources.size()]); - } - return new ICVSResource[0]; - } - - /** - * Get selected CVS remote folders - */ - protected ICVSRemoteFolder[] getSelectedRemoteFolders() { - ArrayList resources = null; - if (!selection.isEmpty()) { - resources = new ArrayList(); - Iterator elements = ((IStructuredSelection) selection).iterator(); - while (elements.hasNext()) { - Object next = elements.next(); - if (next instanceof ICVSRemoteFolder) { - resources.add(next); - continue; - } - if (next instanceof IAdaptable) { - IAdaptable a = (IAdaptable) next; - Object adapter = a.getAdapter(ICVSRemoteFolder.class); - if (adapter instanceof ICVSRemoteFolder) { - resources.add(adapter); - continue; - } - } - } - } - if (resources != null && !resources.isEmpty()) { - return (ICVSRemoteFolder[])resources.toArray(new ICVSRemoteFolder[resources.size()]); - } - return new ICVSRemoteFolder[0]; - } - - /** - * Returns the selected remote resources - */ - protected ICVSRemoteResource[] getSelectedRemoteResources() { - ArrayList resources = null; - if (!selection.isEmpty()) { - resources = new ArrayList(); - Iterator elements = ((IStructuredSelection)selection).iterator(); - while (elements.hasNext()) { - Object next = elements.next(); - if (next instanceof ICVSRemoteResource) { - resources.add(next); - continue; - } - if (next instanceof ILogEntry) { - resources.add(((ILogEntry)next).getRemoteFile()); - continue; - } - if (next instanceof IAdaptable) { - IAdaptable a = (IAdaptable) next; - Object adapter = a.getAdapter(ICVSRemoteResource.class); - if (adapter instanceof ICVSRemoteResource) { - resources.add(adapter); - continue; - } - } - } - } - if (resources != null && !resources.isEmpty()) { - ICVSRemoteResource[] result = new ICVSRemoteResource[resources.size()]; - resources.toArray(result); - return result; - } - return new ICVSRemoteResource[0]; - } - - /** - * A helper prompt condition for prompting for CVS dirty state. - */ - public static IPromptCondition getOverwriteLocalChangesPrompt(final IResource[] dirtyResources) { - return new IPromptCondition() { - List resources = Arrays.asList(dirtyResources); - public boolean needsPrompt(IResource resource) { - return resources.contains(resource); - } - public String promptMessage(IResource resource) { - return Policy.bind("ReplaceWithAction.localChanges", resource.getName());//$NON-NLS-1$ - } - }; - } - - /** - * Checks if a the resources' parent's tags are different then the given tag. - * Prompts the user that they are adding mixed tags and returns <code>true</code> if - * the user wants to continue or <code>false</code> otherwise. - */ - public static boolean checkForMixingTags(final Shell shell, IResource[] resources, final CVSTag tag) throws CVSException { - final IPreferenceStore store = CVSUIPlugin.getPlugin().getPreferenceStore(); - if(!store.getBoolean(ICVSUIConstants.PREF_PROMPT_ON_MIXED_TAGS)) { - return true; - }; - - final boolean[] result = new boolean[] { true }; - - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; - if (resource.getType() != IResource.PROJECT) { - ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource); - CVSTag parentTag = cvsResource.getParent().getFolderSyncInfo().getTag(); - // prompt if the tags are not equal - // consider BASE to be equal the parent tag since we don't make BASE sticky on replace - if (!CVSTag.equalTags(tag, parentTag) && !CVSTag.equalTags(tag, CVSTag.BASE)) { - shell.getDisplay().syncExec(new Runnable() { - public void run() { - AvoidableMessageDialog dialog = new AvoidableMessageDialog( - shell, - Policy.bind("CVSAction.mixingTagsTitle"), //$NON-NLS-1$ - null, // accept the default window icon - Policy.bind("CVSAction.mixingTags", tag.getName()), //$NON-NLS-1$ - MessageDialog.QUESTION, - new String[] {IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL}, - 0); - - result[0] = dialog.open() == 0; - if(result[0] && dialog.isDontShowAgain()) { - store.setValue(ICVSUIConstants.PREF_PROMPT_ON_MIXED_TAGS, false); - } - } - }); - // only prompt once - break; - } - } - } - return result[0]; - } - - /** - * Based on the CVS preference for saving dirty editors this method will either - * ignore dirty editors, save them automatically, or prompt the user to save them. - * - * @return <code>true</code> if the command succeeded, and <code>false</code> - * if at least one editor with unsaved changes was not saved - */ - private boolean saveAllEditors() { - final int option = CVSUIPlugin.getPlugin().getPreferenceStore().getInt(ICVSUIConstants.PREF_SAVE_DIRTY_EDITORS); - final boolean[] okToContinue = new boolean[] {true}; - if (option != ICVSUIConstants.OPTION_NEVER) { - Display.getDefault().syncExec(new Runnable() { - public void run() { - boolean confirm = option == ICVSUIConstants.OPTION_PROMPT; - okToContinue[0] = PlatformUI.getWorkbench().saveAllEditors(confirm); - } - }); - } - return okToContinue[0]; - } - /** - * @see org.eclipse.team.internal.ui.actions.TeamAction#handle(java.lang.Exception, java.lang.String, java.lang.String) - */ - protected void handle(Exception exception, String title, String message) { - CVSUIPlugin.openError(getShell(), title, message, exception, CVSUIPlugin.LOG_NONTEAM_EXCEPTIONS); - } - - protected RepositoryManager getRepositoryManager() { - return CVSUIPlugin.getPlugin().getRepositoryManager(); - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CheckoutAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CheckoutAction.java deleted file mode 100644 index aaa43375c..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CheckoutAction.java +++ /dev/null @@ -1,56 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.actions; - -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.jface.action.IAction; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.ui.operations.CheckoutMultipleProjectsOperation; - -/** - * Checkout a remote module into the workspace ensuring that the user is prompted for - * any overwrites that may occur. - */ -public class CheckoutAction extends CVSAction { - - /** - * @see CVSAction#execute(IAction) - */ - protected void execute(IAction action) throws InvocationTargetException, InterruptedException { - try { - new CheckoutMultipleProjectsOperation(getShell(), getSelectedRemoteFolders(), null) - .run(); - } catch (CVSException e) { - throw new InvocationTargetException(e); - } - } - - /** - * @see TeamAction#isEnabled() - */ - protected boolean isEnabled() throws TeamException { - ICVSRemoteFolder[] folders = getSelectedRemoteFolders(); - if (folders.length == 0) return false; - // only enabled when all folders are in the same repository - ICVSRepositoryLocation location = folders[0].getRepository(); - for (int i = 1; i < folders.length; i++) { - ICVSRemoteFolder folder = folders[i]; - if (!folder.getRepository().equals(location)) { - return false; - } - } - return true; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CheckoutAsAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CheckoutAsAction.java deleted file mode 100644 index 36a37932a..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CheckoutAsAction.java +++ /dev/null @@ -1,64 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.actions; - -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ccvs.ui.operations.HasProjectMetaFileOperation; -import org.eclipse.team.internal.ccvs.ui.wizards.CheckoutAsWizard; -import org.eclipse.ui.PlatformUI; - -/** - * Add a remote resource to the workspace. Current implementation: - * -Works only for remote folders - * -Does not prompt for project name; uses folder name instead - */ -public class CheckoutAsAction extends AddToWorkspaceAction { - - /* - * @see IActionDelegate#run(IAction) - */ - public void execute(IAction action) throws InvocationTargetException, InterruptedException { - final ICVSRemoteFolder[] folders = getSelectedRemoteFolders(); - try { - CheckoutAsWizard wizard = new CheckoutAsWizard(folders, allowProjectConfiguration(folders)); - WizardDialog dialog = new WizardDialog(shell, wizard); - dialog.open(); - } catch (CVSException e) { - throw new InvocationTargetException(e); - } - } - - protected boolean allowProjectConfiguration(ICVSRemoteFolder[] folders) throws CVSException, InterruptedException { - if (folders.length != 1) return false; - return !HasProjectMetaFileOperation.hasMetaFile(getShell(), folders[0], PlatformUI.getWorkbench().getActiveWorkbenchWindow()); - } - - /* - * @see TeamAction#isEnabled() - */ - protected boolean isEnabled() throws TeamException { - return getSelectedRemoteFolders().length > 0; - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getErrorTitle() - */ - protected String getErrorTitle() { - return Policy.bind("CheckoutAsAction.checkoutFailed"); //$NON-NLS-1$ - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CommitAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CommitAction.java deleted file mode 100644 index d432e8b44..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CommitAction.java +++ /dev/null @@ -1,192 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.actions; - -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IResourceVisitor; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.internal.ccvs.core.ICVSRunnable; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ccvs.ui.repo.RepositoryManager; -import org.eclipse.ui.actions.WorkspaceModifyOperation; - -/** - * Action for checking in files to a CVS provider. - * Prompts the user for a release comment. - */ -public class CommitAction extends WorkspaceAction { - - /* - * @see CVSAction#execute(IAction) - */ - public void execute(IAction action) throws InvocationTargetException, InterruptedException { - final IResource[] resources = getSelectedResources(); - final RepositoryManager manager = CVSUIPlugin.getPlugin().getRepositoryManager(); - final String[] comment = new String[] {null}; - final IResource[][] resourcesToBeAdded = new IResource[][] { null }; - run(new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InterruptedException, InvocationTargetException { - try { - // search for any non-added, non-ignored resources in the selection - IResource[] unadded = getUnaddedResources(resources, monitor); - resourcesToBeAdded[0] = promptForResourcesToBeAdded(manager, unadded); - if (resourcesToBeAdded[0] == null) return; - comment[0] = promptForComment(manager, resources); - } catch (TeamException e) { - throw new InvocationTargetException(e); - } - } - }, true /* cancelable */, PROGRESS_BUSYCURSOR); //$NON-NLS-1$ - - if (comment[0] == null) return; - - run(new WorkspaceModifyOperation() { - public void execute(IProgressMonitor monitor) throws InterruptedException, InvocationTargetException { - try { - // execute the add and commit in a single CVS runnable so sync changes are batched - CVSWorkspaceRoot.getCVSFolderFor(ResourcesPlugin.getWorkspace().getRoot()).run( - new ICVSRunnable() { - public void run(IProgressMonitor monitor) throws CVSException { - try { - int ticks=100; - monitor.beginTask(null, ticks); - if (resourcesToBeAdded[0].length > 0) { - int addTicks = 20; - manager.add(resourcesToBeAdded[0], Policy.subMonitorFor(monitor, addTicks)); - ticks-=addTicks; - } - IResource[] shared = getSharedResources(resources); - if (shared.length == 0) return; - manager.commit(shared, comment[0], Policy.subMonitorFor(monitor,ticks)); - } catch (TeamException e) { - throw CVSException.wrapException(e); - } - } - }, monitor); - } catch (CVSException e) { - throw new InvocationTargetException(e); - } finally { - monitor.done(); - } - } - }, true /* cancelable */, PROGRESS_DIALOG); //$NON-NLS-1$ - } - - /** - * Method getUnaddedResources. - * @param resources - * @param iProgressMonitor - * @return IResource[] - */ - private IResource[] getUnaddedResources(IResource[] resources, IProgressMonitor iProgressMonitor) throws CVSException { - final List unadded = new ArrayList(); - final CVSException[] exception = new CVSException[] { null }; - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; - // visit each resource deeply - try { - resource.accept(new IResourceVisitor() { - public boolean visit(IResource resource) throws CoreException { - ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource); - // skip ignored resources and their children - try { - if (cvsResource.isIgnored()) - return false; - // visit the children of shared resources - if (cvsResource.isManaged()) - return true; - if (cvsResource.isFolder() && ((ICVSFolder)cvsResource).isCVSFolder()) - return true; - } catch (CVSException e) { - exception[0] = e; - } - // don't add folders to avoid comitting empty folders - if (resource.getType() == IResource.FOLDER) - return true; - // file is unshared so record it - unadded.add(resource); - // no need to go into children because add is deep - return false; - } - }, IResource.DEPTH_INFINITE, true /* include phantoms */); - } catch (CoreException e) { - throw CVSException.wrapException(e); - } - if (exception[0] != null) throw exception[0]; - } - return (IResource[]) unadded.toArray(new IResource[unadded.size()]); - } - - - /* - * Return all resources in the provided collection that are shared with a repo - * @param resources - * @return IResource[] - */ - private IResource[] getSharedResources(IResource[] resources) throws CVSException { - List shared = new ArrayList(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; - ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource); - if (cvsResource.isManaged() - || (cvsResource.isFolder() && ((ICVSFolder)cvsResource).isCVSFolder())) { - shared.add(resource); - } - } - return (IResource[]) shared.toArray(new IResource[shared.size()]); - } - - /** - * Prompts the user for a release comment. - * @return the comment, or null to cancel - */ - protected String promptForComment(RepositoryManager manager, IResource[] resourcesToCommit) { - return manager.promptForComment(getShell(), resourcesToCommit); - } - - private IResource[] promptForResourcesToBeAdded(RepositoryManager manager, IResource[] unadded) { - return manager.promptForResourcesToBeAdded(getShell(), unadded); - } - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getErrorTitle() - */ - protected String getErrorTitle() { - return Policy.bind("CommitAction.commitFailed"); //$NON-NLS-1$ - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForUnmanagedResources() - */ - protected boolean isEnabledForUnmanagedResources() { - return true; - } - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForNonExistantResources() - */ - protected boolean isEnabledForNonExistantResources() { - return true; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteResourcesAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteResourcesAction.java deleted file mode 100644 index 1ccf064e5..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteResourcesAction.java +++ /dev/null @@ -1,58 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.actions; - -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.compare.CompareUI; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteResource; -import org.eclipse.team.internal.ccvs.ui.CVSCompareEditorInput; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ccvs.ui.ResourceEditionNode; - -/** - * This action is used for comparing two arbitrary remote resources. This is - * enabled in the repository explorer. - */ -public class CompareRemoteResourcesAction extends CVSAction { - - public void execute(IAction action) throws InvocationTargetException, InterruptedException { - run(new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException { - ICVSRemoteResource[] editions = getSelectedRemoteResources(); - if (editions == null || editions.length != 2) { - MessageDialog.openError(getShell(), Policy.bind("CompareRemoteResourcesAction.unableToCompare"), Policy.bind("CompareRemoteResourcesAction.selectTwoResources")); //$NON-NLS-1$ //$NON-NLS-2$ - return; - } - ResourceEditionNode left = new ResourceEditionNode(editions[0]); - ResourceEditionNode right = new ResourceEditionNode(editions[1]); - CompareUI.openCompareEditorOnPage( - new CVSCompareEditorInput(left, right), - getTargetPage()); - } - }, false /* cancelable */, PROGRESS_BUSYCURSOR); - } - - /* - * @see TeamAction#isEnabled() - */ - protected boolean isEnabled() throws TeamException { - ICVSRemoteResource[] resources = getSelectedRemoteResources(); - if (resources.length != 2) return false; - return resources[0].isContainer() == resources[1].isContainer(); - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteWithTagAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteWithTagAction.java deleted file mode 100644 index 3eadde99f..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteWithTagAction.java +++ /dev/null @@ -1,109 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.actions; - -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.compare.CompareUI; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSFile; -import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteResource; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.core.connection.CVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.core.resources.RemoteFolderTreeBuilder; -import org.eclipse.team.internal.ccvs.ui.CVSCompareEditorInput; -import org.eclipse.team.internal.ccvs.ui.ResourceEditionNode; -import org.eclipse.team.internal.ccvs.ui.TagSelectionDialog; - -/** - * @author Administrator - * - * To change this generated comment edit the template variable "typecomment": - * Window>Preferences>Java>Templates. - * To enable and disable the creation of type comments go to - * Window>Preferences>Java>Code Generation. - */ -public class CompareRemoteWithTagAction extends CVSAction { - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#execute(org.eclipse.jface.action.IAction) - */ - protected void execute(IAction action) throws InvocationTargetException, InterruptedException { - - ICVSRemoteResource[] editions = getSelectedRemoteResources(); - if (editions.length == 0) return; - final ICVSRemoteResource resource = editions[0]; - - final ResourceEditionNode[] input = new ResourceEditionNode[] { null /* left */, null /* right */}; - final CVSTag[] tag = new CVSTag[] { null}; - - run(new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException { - ICVSFolder folder; - if (resource instanceof ICVSRemoteFolder) { - folder = (ICVSFolder)resource; - } else { - folder = resource.getParent(); - } - tag[0] = TagSelectionDialog.getTagToCompareWith(getShell(), new ICVSFolder[] {folder}); - } - }, false /* cancelable */, PROGRESS_BUSYCURSOR); - - if (tag[0] == null) return; - - final ICVSRemoteResource[] remote = new ICVSRemoteResource[] { null }; - if (resource.isFolder()) { - remote[0] = resource.forTag(tag[0]); - } else { - run(new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException { - try { - ICVSRepositoryLocation location = resource.getRepository(); - remote[0] = RemoteFolderTreeBuilder.buildRemoteTree((CVSRepositoryLocation)location, (ICVSFile)resource, tag[0], monitor); - } catch (CVSException e) { - throw new InvocationTargetException(e); - } - } - }, false /* cancelable */, PROGRESS_DIALOG); - } - - input[0] = new ResourceEditionNode(resource); - input[1] = new ResourceEditionNode(remote[0]); - - if (input[0] == null || input[1] == null) return; - - run(new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException { - CompareUI.openCompareEditorOnPage( - new CVSCompareEditorInput(input[0] /* left */, input[1] /* right */), - getTargetPage()); - } - }, false /* cancelable */, PROGRESS_BUSYCURSOR); - } - - /** - * @see org.eclipse.team.internal.ui.actions.TeamAction#isEnabled() - */ - protected boolean isEnabled() throws TeamException { - ICVSRemoteResource[] resources = getSelectedRemoteResources(); - // Only support single select for now. - // Need to avoid overlap if multi-select is supported - return resources.length == 1; - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithRemoteAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithRemoteAction.java deleted file mode 100644 index 4563ab09b..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithRemoteAction.java +++ /dev/null @@ -1,128 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.actions; - -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.compare.CompareUI; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo; -import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo; -import org.eclipse.team.internal.ccvs.ui.CVSLocalCompareEditorInput; -import org.eclipse.team.internal.ccvs.ui.Policy; - -public class CompareWithRemoteAction extends WorkspaceAction { - - public void execute(IAction action) throws InvocationTargetException, InterruptedException { - final IResource[] resources = getSelectedResources(); - final CVSTag[] tags = new CVSTag[resources.length]; - try { - for (int i = 0; i < resources.length; i++) { - tags[i] = getTag(resources[i]); - } - } catch(CVSException e) { - throw new InvocationTargetException(e); - } - - // Show the compare viewer - run(new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException { - CompareUI.openCompareEditorOnPage( - new CVSLocalCompareEditorInput(resources, tags), - getTargetPage()); - } - }, false /* cancelable */, PROGRESS_BUSYCURSOR); - } - - protected CVSTag getTag(IResource resource) throws CVSException { - ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource); - return getTag(cvsResource); - } - - protected CVSTag getTag(ICVSResource cvsResource) throws CVSException { - CVSTag tag = null; - if (cvsResource.isFolder()) { - FolderSyncInfo folderInfo = ((ICVSFolder)cvsResource).getFolderSyncInfo(); - if (folderInfo!=null) { - tag = folderInfo.getTag(); - if(tag == null) { - tag = CVSTag.DEFAULT; - } - } - } else { - ResourceSyncInfo info = cvsResource.getSyncInfo(); - if (info != null) { - tag = info.getTag(); - } - } - if (tag==null) { - if (cvsResource.getParent().isCVSFolder()) { - tag = cvsResource.getParent().getFolderSyncInfo().getTag(); - if(tag == null) { - tag = CVSTag.DEFAULT; - } - } - } - return tag; - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getErrorTitle() - */ - protected String getErrorTitle() { - return Policy.bind("CompareWithRemoteAction.compare"); //$NON-NLS-1$ - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForCVSResource(org.eclipse.team.internal.ccvs.core.ICVSResource) - */ - protected boolean isEnabledForCVSResource(ICVSResource cvsResource) throws CVSException { - if (super.isEnabledForCVSResource(cvsResource)) { - // Don't enable if there are sticky file revisions in the lineup - if (!cvsResource.isFolder()) { - ResourceSyncInfo info = cvsResource.getSyncInfo(); - if (info != null && info.getTag() != null) { - String revision = info.getRevision(); - String tag = info.getTag().getName(); - if (revision.equals(tag)) return false; - } - } - return true; - } else { - return getTag(cvsResource) != null; - } - } - - /* - * Update the text label for the action based on the tags in the - * selection. - * @see TeamAction#setActionEnablement(org.eclipse.jface.action.IAction) - */ - protected void setActionEnablement(IAction action) { - super.setActionEnablement(action); - action.setText(calculateActionTagValue()); - } - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForNonExistantResources() - */ - protected boolean isEnabledForNonExistantResources() { - return true; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithRevisionAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithRevisionAction.java deleted file mode 100644 index b41b7886f..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithRevisionAction.java +++ /dev/null @@ -1,124 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.actions; - -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.compare.CompareUI; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFile; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.internal.ccvs.core.ILogEntry; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.ui.CVSCompareRevisionsInput; -import org.eclipse.team.internal.ccvs.ui.Policy; - -public class CompareWithRevisionAction extends WorkspaceAction { - - /** - * Returns the selected remote file - */ - protected ICVSRemoteFile getSelectedRemoteFile() { - IResource[] resources = getSelectedResources(); - if (resources.length != 1) return null; - if (!(resources[0] instanceof IFile)) return null; - IFile file = (IFile)resources[0]; - try { - return (ICVSRemoteFile)CVSWorkspaceRoot.getRemoteResourceFor(file); - } catch (TeamException e) { - handle(e, null, null); - return null; - } - } - - /* - * @see CVSAction#execute(IAction) - */ - public void execute(IAction action) throws InvocationTargetException, InterruptedException { - - // Setup holders - final ICVSRemoteFile[] file = new ICVSRemoteFile[] { null }; - final ILogEntry[][] entries = new ILogEntry[][] { null }; - - // Get the selected file - run(new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException { - file[0] = getSelectedRemoteFile(); - } - }, false /* cancelable */, PROGRESS_BUSYCURSOR); - - if (file[0] == null) { - // No revisions for selected file - MessageDialog.openWarning(getShell(), Policy.bind("CompareWithRevisionAction.noRevisions"), Policy.bind("CompareWithRevisionAction.noRevisionsLong")); //$NON-NLS-1$ //$NON-NLS-2$ - return; - } - - // Fetch the log entries - run(new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException { - try { - monitor.beginTask(Policy.bind("CompareWithRevisionAction.fetching"), 100); //$NON-NLS-1$ - entries[0] = file[0].getLogEntries(Policy.subMonitorFor(monitor, 100)); - monitor.done(); - } catch (TeamException e) { - throw new InvocationTargetException(e); - } - } - }, true /* cancelable */, PROGRESS_DIALOG); - - if (entries[0] == null) return; - - // Show the compare viewer - run(new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException { - CompareUI.openCompareEditorOnPage( - new CVSCompareRevisionsInput((IFile)getSelectedResources()[0], entries[0]), - getTargetPage()); - } - }, false /* cancelable */, PROGRESS_BUSYCURSOR); - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getErrorTitle() - */ - protected String getErrorTitle() { - return Policy.bind("CompareWithRevisionAction.compare"); //$NON-NLS-1$ - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForCVSResource(org.eclipse.team.internal.ccvs.core.ICVSResource) - */ - protected boolean isEnabledForCVSResource(ICVSResource cvsResource) throws CVSException { - return (!cvsResource.isFolder() && super.isEnabledForCVSResource(cvsResource)); - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForMultipleResources() - */ - protected boolean isEnabledForMultipleResources() { - return false; - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForAddedResources() - */ - protected boolean isEnabledForAddedResources() { - return false; - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithTagAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithTagAction.java deleted file mode 100644 index b81125a8d..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithTagAction.java +++ /dev/null @@ -1,54 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.actions; - -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.compare.CompareUI; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteResource; -import org.eclipse.team.internal.ccvs.ui.CVSLocalCompareEditorInput; -import org.eclipse.team.internal.ccvs.ui.TagSelectionDialog; - -public class CompareWithTagAction extends WorkspaceAction { - - public void execute(IAction action) throws InvocationTargetException, InterruptedException { - final ICVSRemoteResource[] remoteResource = new ICVSRemoteResource[] { null }; - final IResource[] resources = getSelectedResources(); - - IProject[] projects = new IProject[resources.length]; - for (int i = 0; i < resources.length; i++) { - projects[i] = resources[i].getProject(); - } - final CVSTag tag = TagSelectionDialog.getTagToCompareWith(getShell(), projects); - if (tag == null) return; - // Show the compare viewer - run(new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException { - CompareUI.openCompareEditorOnPage( - new CVSLocalCompareEditorInput(resources, tag), - getTargetPage()); - } - }, false /* cancelable */, PROGRESS_BUSYCURSOR); - } - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForNonExistantResources() - */ - protected boolean isEnabledForNonExistantResources() { - return true; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ConfigureTagsFromRepoViewOnFolder.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ConfigureTagsFromRepoViewOnFolder.java deleted file mode 100644 index b8bce4213..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ConfigureTagsFromRepoViewOnFolder.java +++ /dev/null @@ -1,102 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.actions; - -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.Iterator; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.Path; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ccvs.ui.TagConfigurationDialog; -import org.eclipse.team.internal.ccvs.ui.model.RemoteModule; -; - -/** - * DefineTagAction remembers a tag by name - */ -public class ConfigureTagsFromRepoViewOnFolder extends CVSAction { - - /** - * Returns the selected remote folders - */ - protected ICVSRemoteFolder[] getSelectedRemoteFolders() { - ArrayList resources = null; - if (!selection.isEmpty()) { - resources = new ArrayList(); - Iterator elements = ((IStructuredSelection) selection).iterator(); - while (elements.hasNext()) { - Object next = elements.next(); - if (next instanceof RemoteModule) { - next = ((RemoteModule)next).getCVSResource(); - } - if (next instanceof ICVSRemoteFolder) { - ICVSRemoteFolder folder = (ICVSRemoteFolder)next; - if (folder.isDefinedModule()) { - resources.add(next); - } else if(new Path(((ICVSRemoteFolder)next).getRepositoryRelativePath()).segmentCount()==1) { - resources.add(next); - } - } - } - } - if (resources != null && !resources.isEmpty()) { - return (ICVSRemoteFolder[])resources.toArray(new ICVSRemoteFolder[resources.size()]); - } - return new ICVSRemoteFolder[0]; - } - - /* - * @see CVSAction@execute(IAction) - */ - public void execute(IAction action) throws InvocationTargetException, InterruptedException { - run(new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException { - final ICVSRemoteFolder[] roots = getSelectedRemoteFolders(); - final Shell shell = getShell(); - shell.getDisplay().syncExec(new Runnable() { - public void run() { - ICVSFolder[] cvsFolders = new ICVSFolder[roots.length]; - for (int i = 0; i < roots.length; i++) { - cvsFolders[i] = (ICVSFolder)roots[i]; - } - TagConfigurationDialog d = new TagConfigurationDialog(shell, cvsFolders); - d.open(); - } - }); - } - }, false /* cancelable */, PROGRESS_BUSYCURSOR); - } - - /* - * @see TeamAction#isEnabled() - */ - protected boolean isEnabled() throws TeamException { - ICVSRemoteFolder[] roots = getSelectedRemoteFolders(); - if (roots.length != 1) return false; - return true; - } - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getErrorTitle() - */ - protected String getErrorTitle() { - return Policy.bind("ConfigureTagsFromRepoViewConfigure_Tag_Error_1"); //$NON-NLS-1$ - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ContentAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ContentAction.java deleted file mode 100644 index b9be21b63..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ContentAction.java +++ /dev/null @@ -1,88 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.actions; - -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.core.sync.ILocalSyncElement; -import org.eclipse.team.internal.ccvs.ui.AvoidableMessageDialog; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ccvs.ui.sync.CVSSyncCompareInput; -import org.eclipse.ui.IEditorActionDelegate; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.actions.ActionDelegate; - -public class ContentAction extends ActionDelegate implements IEditorActionDelegate { - - /** - * Is <code>null</code> if the current active editor is not a compare editor - * with a CVS editor input. Or else this input refer to the input in the active - * CVS compare editor. - */ - private CVSSyncCompareInput syncInput; - - /** - * Should only be called if action is enabled and the current active editor is a - * CVS compare editor. - * - * @see IActionDelegate#run(IAction) - */ - public void run(IAction action) { - final IPreferenceStore store = CVSUIPlugin.getPlugin().getPreferenceStore(); - if (store.getBoolean(ICVSUIConstants.PREF_PROMPT_ON_CHANGE_GRANULARITY)) { - Shell shell = syncInput.getViewer().getControl().getShell(); - AvoidableMessageDialog dialog = new AvoidableMessageDialog( - shell, - Policy.bind("ContentAction.Confirm_Long_Operation_1"), //$NON-NLS-1$ - null, // accept the default window icon - Policy.bind("ContentAction.Changing_this_setting_will_involve_contacting_the_server_and_may_be_long-running_2"), //$NON-NLS-1$ - MessageDialog.QUESTION, - new String[] {IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL}, - 0); - - boolean result = dialog.open() == 0; - if (result && dialog.isDontShowAgain()) { - store.setValue(ICVSUIConstants.PREF_PROMPT_ON_CHANGE_GRANULARITY, false); - } - if (!result) { - action.setChecked(! action.isChecked()); - return; - } - } - syncInput.setSyncGranularity(action.isChecked() ? ILocalSyncElement.GRANULARITY_CONTENTS : ILocalSyncElement.GRANULARITY_TIMESTAMP); - } - - /** - * Called when the active editor changes. Enablement of this action depends - * on the editor type and editr input of the active editor. - * - * @see IEditorActionDelegate#setActiveEditor(IAction, IEditorPart) - */ - public void setActiveEditor(IAction action, IEditorPart targetEditor) { - if (targetEditor != null) { - IEditorInput input = targetEditor.getEditorInput(); - if (input instanceof CVSSyncCompareInput) { - this.syncInput = (CVSSyncCompareInput)input; - action.setEnabled(true); - action.setChecked(syncInput.getSyncGranularity() != ILocalSyncElement.GRANULARITY_TIMESTAMP); - return; - } - } - syncInput = null; - action.setEnabled(false); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/EditAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/EditAction.java deleted file mode 100644 index db65ff609..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/EditAction.java +++ /dev/null @@ -1,78 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.actions; - -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.jface.action.IAction; -import org.eclipse.team.core.Team; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSTeamProvider; -import org.eclipse.team.internal.ccvs.core.ICVSFile; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.ui.actions.WorkspaceModifyOperation; - -public class EditAction extends WorkspaceAction { - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#execute(org.eclipse.jface.action.IAction) - */ - protected void execute(IAction action) throws InvocationTargetException, InterruptedException { - // Get the editors - final EditorsAction editors = new EditorsAction(); - run(new WorkspaceModifyOperation() { - public void execute(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - executeProviderAction(editors,monitor); - } - },true /* cancelable */, PROGRESS_DIALOG); - - // If there are editors show them - // and prompt the user to - // execute the edit command - if (!editors.promptToEdit(shell)) { - return; - } - - - run(new WorkspaceModifyOperation() { - public void execute(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - executeProviderAction(new IProviderAction() { - public IStatus execute(CVSTeamProvider provider, IResource[] resources, IProgressMonitor monitor) throws CVSException { - provider.edit(resources, false /* recurse */, true /* notify server */, ICVSFile.NO_NOTIFICATION, monitor); - return Team.OK_STATUS; - } - }, monitor); - } - }, true /* cancelable */, PROGRESS_DIALOG); - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForAddedResources() - */ - protected boolean isEnabledForAddedResources() { - return false; - } - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForCVSResource(org.eclipse.team.internal.ccvs.core.ICVSResource) - */ - protected boolean isEnabledForCVSResource(ICVSResource cvsResource) throws CVSException { - if (cvsResource.isFolder()) return false; - if (super.isEnabledForCVSResource(cvsResource)) { - return ((ICVSFile)cvsResource).isReadOnly(); - } else { - return false; - } - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/EditorsAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/EditorsAction.java deleted file mode 100644 index 53000f69f..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/EditorsAction.java +++ /dev/null @@ -1,110 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2003 CSC SoftwareConsult GmbH & Co. OHG, Germany and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * CSC - Intial implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.actions; - -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.core.Team; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSTeamProvider; -import org.eclipse.team.internal.ccvs.core.EditorsInfo; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.EditorsDialog; -import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction.IProviderAction; -import org.eclipse.team.internal.ccvs.ui.Policy; - - -/** - * This Action gets the <code>EditorsInfo[]</code> - * It is used by the <code>ShowEditorAction</code> - * and <code>ShowEditorAction</code>. - * - * @author <a href="mailto:gregor.kohlwes@csc.com,kohlwes@gmx.net">Gregor - * Kohlwes</a> - * - */ -public class EditorsAction implements IProviderAction, IRunnableWithProgress { - EditorsInfo[] f_editorsInfo = new EditorsInfo[0]; - CVSTeamProvider f_provider; - IResource[] f_resources; - - public EditorsAction() { - } - - public EditorsAction(CVSTeamProvider provider, IResource[] resources) { - f_provider = provider; - f_resources = resources; - } - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction.IProviderAction#execute(org.eclipse.team.internal.ccvs.core.CVSTeamProvider, org.eclipse.core.resources.IResource, org.eclipse.core.runtime.IProgressMonitor) - */ - public IStatus execute(CVSTeamProvider provider, IResource[] resources, IProgressMonitor monitor) - throws CVSException { - f_editorsInfo = provider.editors(resources, monitor); - return Team.OK_STATUS; - } - - public boolean isPerformEdit() { - return CVSUIPlugin.EDIT.equals(CVSUIPlugin.getPlugin().getPreferenceStore().getString(ICVSUIConstants.PREF_EDIT_ACTION)); - } - - - public boolean promptToEdit(Shell shell) { - - if (!isPerformEdit()) return true; - - if (f_editorsInfo.length > 0) { - final EditorsDialog view = new EditorsDialog(shell, f_editorsInfo); - // Open the dialog using a sync exec (there are no guarentees that we - // were called from the UI thread - CVSUIPlugin.openDialog(shell, new CVSUIPlugin.IOpenableInShell() { - public void open(Shell shell) { - view.open(); - } - }, CVSUIPlugin.PERFORM_SYNC_EXEC); - return (view.getReturnCode() == EditorsDialog.OK); - } - return true; - - - - } - - /** - * @see org.eclipse.jface.operation.IRunnableWithProgress#run(org.eclipse.core.runtime.IProgressMonitor) - */ - public void run(IProgressMonitor monitor) - throws InvocationTargetException, InterruptedException { - if (f_provider == null || f_resources == null) { - throw new InvocationTargetException(new RuntimeException(Policy.bind("EditorsAction.classNotInitialized", this.getClass().getName()))); //$NON-NLS-1$ - } - try { - execute(f_provider,f_resources,monitor); - } catch (CVSException e) { - throw new InvocationTargetException(e); - } - } - - /** - * Returns the f_editorsInfo. - * @return EditorsInfo[] - */ - public EditorsInfo[] getEditorsInfo() { - return f_editorsInfo; - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/GenerateDiffFileAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/GenerateDiffFileAction.java deleted file mode 100644 index 304dc1f7b..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/GenerateDiffFileAction.java +++ /dev/null @@ -1,55 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.actions; - -import org.eclipse.core.resources.IResource; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ccvs.ui.wizards.GenerateDiffFileWizard; - -/** - * Action to generate a patch file using the CVS diff command. - * - * NOTE: This is a temporary action and should eventually be replaced - * by a create patch command in the compare viewer. - */ -public class GenerateDiffFileAction extends WorkspaceAction { - - /** (Non-javadoc) - * Method declared on IActionDelegate. - */ - public void execute(IAction action) { - final String title = Policy.bind("GenerateCVSDiff.title"); //$NON-NLS-1$ - final IResource[] resources = getSelectedResources(); - GenerateDiffFileWizard wizard = new GenerateDiffFileWizard(new StructuredSelection(resources), resources[0]); - wizard.setWindowTitle(title); - WizardDialog dialog = new WizardDialog(getShell(), wizard); - dialog.setMinimumPageSize(350, 250); - dialog.open(); - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForMultipleResources() - */ - protected boolean isEnabledForMultipleResources() { - return false; - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForUnmanagedResources() - */ - protected boolean isEnabledForUnmanagedResources() { - return true; - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/IgnoreAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/IgnoreAction.java deleted file mode 100644 index e76d644f4..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/IgnoreAction.java +++ /dev/null @@ -1,70 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.actions; - -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.action.IAction; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.ui.IgnoreResourcesDialog; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.ui.actions.WorkspaceModifyOperation; - -public class IgnoreAction extends WorkspaceAction { - - protected void execute(final IAction action) throws InvocationTargetException, InterruptedException { - run(new WorkspaceModifyOperation() { - public void execute(IProgressMonitor monitor) throws InterruptedException, InvocationTargetException { - IResource[] resources = getSelectedResources(); - IgnoreResourcesDialog dialog = new IgnoreResourcesDialog(getShell(), resources); - if (dialog.open() != IgnoreResourcesDialog.OK) return; - - try { - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; - String pattern = dialog.getIgnorePatternFor(resource); - ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource); - cvsResource.setIgnoredAs(pattern); - } - // fix the action enablement - if (action != null) action.setEnabled(isEnabled()); - } catch (TeamException e) { - throw new InvocationTargetException(e); - } - } - }, false /* cancelable */, PROGRESS_BUSYCURSOR); - } - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getErrorTitle() - */ - protected String getErrorTitle() { - return Policy.bind("IgnoreAction.ignore"); //$NON-NLS-1$ - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForManagedResources() - */ - protected boolean isEnabledForManagedResources() { - return false; - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForUnmanagedResources() - */ - protected boolean isEnabledForUnmanagedResources() { - return true; - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/MergeAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/MergeAction.java deleted file mode 100644 index 28024f6e0..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/MergeAction.java +++ /dev/null @@ -1,35 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.actions; - -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.internal.ccvs.ui.merge.MergeWizard; - -public class MergeAction extends WorkspaceAction { - - /* - * @see CVSAction#execute() - */ - public void execute(IAction action) { - final Shell shell = getShell(); - shell.getDisplay().syncExec(new Runnable() { - public void run() { - MergeWizard wizard = new MergeWizard(); - wizard.setResources(getSelectedResources()); - WizardDialog dialog = new WizardDialog(shell, wizard); - dialog.open(); - } - }); - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/MoveRemoteTagAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/MoveRemoteTagAction.java deleted file mode 100644 index 5a0463d72..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/MoveRemoteTagAction.java +++ /dev/null @@ -1,63 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.actions; - -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ccvs.ui.TagSelectionDialog; -import org.eclipse.team.internal.ccvs.ui.operations.ITagOperation; - -public class MoveRemoteTagAction extends TagInRepositoryAction { - - /** - * @see TagRemoteAction#promptForTag(ICVSFolder[]) - */ - protected ITagOperation configureOperation() { - // Allow the user to select a tag - ITagOperation operation = createTagOperation(); - TagSelectionDialog dialog = new TagSelectionDialog(getShell(), getCVSFolders(operation.getCVSResources()), - Policy.bind("MoveTagAction.title"), //$NON-NLS-1$ - Policy.bind("MoveTagAction.message"), //$NON-NLS-1$ - TagSelectionDialog.INCLUDE_BRANCHES | TagSelectionDialog.INCLUDE_VERSIONS, - true, /* show recurse */ - IHelpContextIds.TAG_REMOTE_WITH_EXISTING_DIALOG); - dialog.setBlockOnOpen(true); - if (dialog.open() == Dialog.CANCEL) { - return null; - } - CVSTag tag = dialog.getResult(); - if (tag == null) return null; - operation.setTag(tag); - operation.moveTag(); - boolean recursive = dialog.getRecursive(); - if (!recursive) { - operation.recurse(); - } - return operation; - } - - private ICVSFolder[] getCVSFolders(ICVSResource[] resources) { - ICVSFolder[] folders = new ICVSFolder[resources.length]; - for (int i = 0; i < resources.length; i++) { - if (resources[i].isFolder()) { - folders[i] = (ICVSFolder)resources[i]; - } else { - folders[i] = resources[i].getParent(); - } - } - return folders; - - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/NewRepositoryAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/NewRepositoryAction.java deleted file mode 100644 index 18877b9b9..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/NewRepositoryAction.java +++ /dev/null @@ -1,52 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.actions; - -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.internal.ccvs.ui.wizards.NewLocationWizard; -import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.ui.IWorkbenchWindowActionDelegate; - -public class NewRepositoryAction implements IWorkbenchWindowActionDelegate { - Shell shell; - - /** - * @see IWorkbenchWindowActionDelegate#dispose() - */ - public void dispose() { - } - - /** - * @see IWorkbenchWindowActionDelegate#init(IWorkbenchWindow) - */ - public void init(IWorkbenchWindow window) { - this.shell = window.getShell(); - } - - /** - * @see IActionDelegate#run(IAction) - */ - public void run(IAction action) { - NewLocationWizard wizard = new NewLocationWizard(); - WizardDialog dialog = new WizardDialog(shell, wizard); - dialog.open(); - } - - /** - * @see IActionDelegate#selectionChanged(IAction, ISelection) - */ - public void selectionChanged(IAction action, ISelection selection) { - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/OpenLogEntryAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/OpenLogEntryAction.java deleted file mode 100644 index 4e20c96e0..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/OpenLogEntryAction.java +++ /dev/null @@ -1,116 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.actions; - -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.Iterator; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFile; -import org.eclipse.team.internal.ccvs.core.ILogEntry; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ccvs.ui.RemoteFileEditorInput; -import org.eclipse.ui.IEditorDescriptor; -import org.eclipse.ui.IEditorRegistry; -import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.PartInitException; - -public class OpenLogEntryAction extends CVSAction { - /** - * Returns the selected remote files - */ - protected ILogEntry[] getSelectedLogEntries() { - ArrayList entries = null; - if (!selection.isEmpty()) { - entries = new ArrayList(); - Iterator elements = ((IStructuredSelection) selection).iterator(); - while (elements.hasNext()) { - Object next = elements.next(); - if (next instanceof ILogEntry) { - entries.add((ILogEntry)next); - continue; - } - if (next instanceof IAdaptable) { - IAdaptable a = (IAdaptable) next; - Object adapter = a.getAdapter(ILogEntry.class); - if (adapter instanceof ILogEntry) { - entries.add(adapter); - continue; - } - } - } - } - if (entries != null && !entries.isEmpty()) { - ILogEntry[] result = new ILogEntry[entries.size()]; - entries.toArray(result); - return result; - } - return new ILogEntry[0]; - } - /* - * @see CVSAction#execute(IAction) - */ - public void execute(IAction action) throws InterruptedException, InvocationTargetException { - run(new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException { - IWorkbench workbench = CVSUIPlugin.getPlugin().getWorkbench(); - IEditorRegistry registry = workbench.getEditorRegistry(); - IWorkbenchPage page = workbench.getActiveWorkbenchWindow().getActivePage(); - final ILogEntry[] entries = getSelectedLogEntries(); - for (int i = 0; i < entries.length; i++) { - if (entries[i].isDeletion()) { - MessageDialog.openError(getShell(), Policy.bind("OpenLogEntryAction.deletedTitle"), Policy.bind("OpenLogEntryAction.deleted")); //$NON-NLS-1$ //$NON-NLS-2$ - } else { - ICVSRemoteFile file = entries[i].getRemoteFile(); - String filename = file.getName(); - IEditorDescriptor descriptor = registry.getDefaultEditor(filename); - String id; - if (descriptor == null) { - id = "org.eclipse.ui.DefaultTextEditor"; //$NON-NLS-1$ - } else { - id = descriptor.getId(); - } - try { - try { - page.openEditor(new RemoteFileEditorInput(file), id); - } catch (PartInitException e) { - if (id.equals("org.eclipse.ui.DefaultTextEditor")) { //$NON-NLS-1$ - throw e; - } else { - page.openEditor(new RemoteFileEditorInput(file), "org.eclipse.ui.DefaultTextEditor"); //$NON-NLS-1$ - } - } - } catch (PartInitException e) { - throw new InvocationTargetException(e); - } - } - } - } - }, false, PROGRESS_BUSYCURSOR); //$NON-NLS-1$ - } - /* - * @see TeamAction#isEnabled() - */ - protected boolean isEnabled() throws TeamException { - ILogEntry[] entries = getSelectedLogEntries(); - if (entries.length == 0) return false; - return true; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/OpenRemoteFileAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/OpenRemoteFileAction.java deleted file mode 100644 index 1e1562467..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/OpenRemoteFileAction.java +++ /dev/null @@ -1,124 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.actions; - -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.Iterator; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFile; -import org.eclipse.team.internal.ccvs.core.ILogEntry; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.RemoteFileEditorInput; -import org.eclipse.ui.IEditorDescriptor; -import org.eclipse.ui.IEditorRegistry; -import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.PartInitException; - -public class OpenRemoteFileAction extends CVSAction { - /** - * Returns the selected remote files - */ - protected ICVSRemoteFile[] getSelectedRemoteFiles() { - ArrayList resources = null; - if (!selection.isEmpty()) { - resources = new ArrayList(); - Iterator elements = ((IStructuredSelection) selection).iterator(); - while (elements.hasNext()) { - Object next = elements.next(); - if (next instanceof ICVSRemoteFile) { - resources.add(next); - continue; - } - if (next instanceof ILogEntry) { - resources.add(((ILogEntry)next).getRemoteFile()); - continue; - } - if (next instanceof IAdaptable) { - IAdaptable a = (IAdaptable) next; - Object adapter = a.getAdapter(ICVSRemoteFile.class); - if (adapter instanceof ICVSRemoteFile) { - resources.add(adapter); - continue; - } - } - } - } - if (resources != null && !resources.isEmpty()) { - ICVSRemoteFile[] result = new ICVSRemoteFile[resources.size()]; - resources.toArray(result); - return result; - } - return new ICVSRemoteFile[0]; - } - /* - * @see CVSAction#execute(IAction) - */ - public void execute(IAction action) throws InterruptedException, InvocationTargetException { - run(new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException { -/* IWorkbenchPage page = CVSUIPlugin.getPlugin().getWorkbench().getActiveWorkbenchWindow().getActivePage(); - ICVSRemoteFile[] files = getSelectedRemoteFiles(); - for (int i = 0; i < files.length; i++) { - try { - page.openEditor(new RemoteFileEditorInput(files[i]), "org.eclipse.ui.DefaultTextEditor"); //$NON-NLS-1$ - } catch (PartInitException e) { - throw new InvocationTargetException(e); - } - }*/ - - IWorkbench workbench = CVSUIPlugin.getPlugin().getWorkbench(); - IEditorRegistry registry = workbench.getEditorRegistry(); - IWorkbenchPage page = workbench.getActiveWorkbenchWindow().getActivePage(); - ICVSRemoteFile[] files = getSelectedRemoteFiles(); - for (int i = 0; i < files.length; i++) { - ICVSRemoteFile file = files[i]; - String filename = file.getName(); - IEditorDescriptor descriptor = registry.getDefaultEditor(filename); - String id; - if (descriptor == null) { - id = "org.eclipse.ui.DefaultTextEditor"; //$NON-NLS-1$ - } else { - id = descriptor.getId(); - } - try { - try { - page.openEditor(new RemoteFileEditorInput(files[i]), id); - } catch (PartInitException e) { - if (id.equals("org.eclipse.ui.DefaultTextEditor")) { //$NON-NLS-1$ - throw e; - } else { - page.openEditor(new RemoteFileEditorInput(files[i]), "org.eclipse.ui.DefaultTextEditor"); //$NON-NLS-1$ - } - } - } catch (PartInitException e) { - throw new InvocationTargetException(e); - } - } - } - }, false, PROGRESS_BUSYCURSOR); //$NON-NLS-1$ - } - /* - * @see TeamAction#isEnabled() - */ - protected boolean isEnabled() throws TeamException { - ICVSRemoteFile[] resources = getSelectedRemoteFiles(); - if (resources.length == 0) return false; - return true; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithRemoteAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithRemoteAction.java deleted file mode 100644 index b705cad65..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithRemoteAction.java +++ /dev/null @@ -1,129 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.actions; - -import java.lang.reflect.InvocationTargetException; -import java.util.Hashtable; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.SubProgressMonitor; -import org.eclipse.jface.action.IAction; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSTeamProvider; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.core.InfiniteSubProgressMonitor; -import org.eclipse.team.internal.ui.dialogs.IPromptCondition; -import org.eclipse.ui.actions.WorkspaceModifyOperation; - -public class ReplaceWithRemoteAction extends WorkspaceAction { - public void execute(IAction action) throws InvocationTargetException, InterruptedException { - - run(new WorkspaceModifyOperation() { - public void execute(IProgressMonitor monitor) throws InterruptedException, InvocationTargetException { - try { - monitor = Policy.monitorFor(monitor); - monitor.beginTask(null, 100); - IResource resources[] = checkOverwriteOfDirtyResources(getSelectedResources(), new InfiniteSubProgressMonitor(monitor, 20)); - if(resources.length > 0) { - performReplace(resources, Policy.subMonitorFor(monitor, 80)); - } - } catch (TeamException e) { - throw new InvocationTargetException(e); - } finally { - monitor.done(); - } - } - }, true /* cancelable */, PROGRESS_DIALOG); - } - - protected void performReplace(IResource[] resources, IProgressMonitor monitor) throws TeamException { - try { - Hashtable table = getProviderMapping(resources); - Set keySet = table.keySet(); - monitor.beginTask(null, keySet.size() * 10); //$NON-NLS-1$ - monitor.setTaskName(Policy.bind("ReplaceWithRemoteAction.replacing")); //$NON-NLS-1$ - Iterator iterator = keySet.iterator(); - while (iterator.hasNext()) { - IProgressMonitor subMonitor = new SubProgressMonitor(monitor, 10); - CVSTeamProvider provider = (CVSTeamProvider)iterator.next(); - List list = (List)table.get(provider); - IResource[] providerResources = (IResource[])list.toArray(new IResource[list.size()]); - provider.get(providerResources, IResource.DEPTH_INFINITE, subMonitor); - } - } finally { - monitor.done(); - } - } - - protected IPromptCondition getPromptCondition(IResource[] dirtyResources) { - return getOverwriteLocalChangesPrompt(dirtyResources); - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getErrorTitle() - */ - protected String getErrorTitle() { - return Policy.bind("ReplaceWithRemoteAction.problemMessage"); //$NON-NLS-1$ - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForAddedResources() - */ - protected boolean isEnabledForAddedResources() { - return false; - } - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForNonExistantResources() - */ - protected boolean isEnabledForNonExistantResources() { - return true; - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForCVSResource(org.eclipse.team.internal.ccvs.core.ICVSResource) - */ - protected boolean isEnabledForCVSResource(ICVSResource cvsResource) throws CVSException { - if (super.isEnabledForCVSResource(cvsResource)) { - // Don't enable if there are sticky file revisions in the lineup - if (!cvsResource.isFolder()) { - ResourceSyncInfo info = cvsResource.getSyncInfo(); - if (info != null && info.getTag() != null) { - String revision = info.getRevision(); - String tag = info.getTag().getName(); - if (revision.equals(tag)) return false; - } - } - return true; - } else { - return false; - } - } - - /* - * Update the text label for the action based on the tags in the - * selection. - * - * @see TeamAction#setActionEnablement(org.eclipse.jface.action.IAction) - */ - protected void setActionEnablement(IAction action) { - super.setActionEnablement(action); - - action.setText(calculateActionTagValue()); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithTagAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithTagAction.java deleted file mode 100644 index 6e8313439..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithTagAction.java +++ /dev/null @@ -1,144 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.actions; - -import java.lang.reflect.InvocationTargetException; -import java.util.Hashtable; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.SubProgressMonitor; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.CVSTeamProvider; -import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ccvs.ui.TagSelectionDialog; -import org.eclipse.ui.actions.WorkspaceModifyOperation; - -/** - * Action for replace with tag. - */ -public class ReplaceWithTagAction extends WorkspaceAction { - /* - * Method declared on IActionDelegate. - */ - public void execute(IAction action) throws InterruptedException, InvocationTargetException { - - // Setup the holders - final IResource[] resource = new IResource[] {null}; - final CVSTag[] tag = new CVSTag[] {null}; - final boolean[] recurse = new boolean[] {true}; - - // Show a busy cursor while display the tag selection dialog - run(new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InterruptedException, InvocationTargetException { - - IResource[] resources; - try { - resources = - checkOverwriteOfDirtyResources( - getSelectedResources(), - null /* no progress just a busy cursor for now */); - } catch (CVSException e) { - throw new InvocationTargetException(e); - } - if(resources.length == 0) { - // nothing to do - return; - } - // show the tags for the projects of the selected resources - IProject[] projects = new IProject[resources.length]; - for (int i = 0; i < resources.length; i++) { - projects[i] = resources[i].getProject(); - } - TagSelectionDialog dialog = new TagSelectionDialog(getShell(), projects, - Policy.bind("ReplaceWithTagAction.message"), //$NON-NLS-1$ - Policy.bind("TagSelectionDialog.Select_a_Tag_1"), //$NON-NLS-1$ - TagSelectionDialog.INCLUDE_ALL_TAGS, - true, /*show recurse*/ - IHelpContextIds.REPLACE_TAG_SELECTION_DIALOG); //$NON-NLS-1$ - dialog.setBlockOnOpen(true); - if (dialog.open() == Dialog.CANCEL) { - return; - } - tag[0] = dialog.getResult(); - recurse[0] = dialog.getRecursive(); - - // For non-projects determine if the tag being loaded is the same as the resource's parent - // If it's not, warn the user that they will have strange sync behavior - try { - if(!CVSAction.checkForMixingTags(getShell(), resources, tag[0])) { - tag[0] = null; - return; - } - } catch (CVSException e) { - throw new InvocationTargetException(e); - } - } - }, false /* cancelable */, PROGRESS_BUSYCURSOR); //$NON-NLS-1$ - - if (tag[0] == null) return; - - // Display a progress dialog while replacing - run(new WorkspaceModifyOperation() { - public void execute(IProgressMonitor monitor) throws InterruptedException, InvocationTargetException { - try { - int depth = recurse[0] ? IResource.DEPTH_INFINITE : IResource.DEPTH_ONE; - Hashtable table = getProviderMapping(); - Set keySet = table.keySet(); - monitor.beginTask("", keySet.size() * 1000); //$NON-NLS-1$ - monitor.setTaskName(Policy.bind("ReplaceWithTagAction.replacing", tag[0].getName())); //$NON-NLS-1$ - Iterator iterator = keySet.iterator(); - while (iterator.hasNext()) { - IProgressMonitor subMonitor = new SubProgressMonitor(monitor, 1000); - CVSTeamProvider provider = (CVSTeamProvider)iterator.next(); - List list = (List)table.get(provider); - IResource[] providerResources = (IResource[])list.toArray(new IResource[list.size()]); - provider.get(providerResources, depth, tag[0], Policy.subMonitorFor(monitor, 100)); - } - } catch (TeamException e) { - throw new InvocationTargetException(e); - } finally { - monitor.done(); - } - } - }, true /* cancelable */, PROGRESS_DIALOG); - } - - protected boolean equalTags(CVSTag tag1, CVSTag tag2) { - if (tag1 == null) tag1 = CVSTag.DEFAULT; - if (tag2 == null) tag2 = CVSTag.DEFAULT; - return tag1.equals(tag2); - } - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getErrorTitle() - */ - protected String getErrorTitle() { - return Policy.bind("ReplaceWithTagAction.replace"); //$NON-NLS-1$ - } - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForNonExistantResources() - */ - protected boolean isEnabledForNonExistantResources() { - return true; - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/RestoreFromRepositoryAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/RestoreFromRepositoryAction.java deleted file mode 100644 index 0b746d236..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/RestoreFromRepositoryAction.java +++ /dev/null @@ -1,203 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.actions; - -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; -import org.eclipse.team.internal.ccvs.core.CVSStatus; -import org.eclipse.team.internal.ccvs.core.ICVSFile; -import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.internal.ccvs.core.ICVSRunnable; -import org.eclipse.team.internal.ccvs.core.client.Command; -import org.eclipse.team.internal.ccvs.core.client.CommandOutputListener; -import org.eclipse.team.internal.ccvs.core.client.Log; -import org.eclipse.team.internal.ccvs.core.client.Session; -import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption; -import org.eclipse.team.internal.ccvs.core.client.Command.QuietOption; -import org.eclipse.team.internal.ccvs.core.connection.CVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.core.connection.CVSServerException; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ccvs.ui.ResizableWizardDialog; -import org.eclipse.team.internal.ccvs.ui.wizards.RestoreFromRepositoryWizard; - -/** - * @author Administrator - * - * To change this generated comment edit the template variable "typecomment": - * Window>Preferences>Java>Templates. - * To enable and disable the creation of type comments go to - * Window>Preferences>Java>Code Generation. - */ -public class RestoreFromRepositoryAction extends CVSAction { - - /* - * This class handles the output from "cvs log -R ..." where -R - * indicates that only the RCS file name is to be returned. Files - * that have been deleted will be in the Attic. The Attic may also - * contains files that exist on a branch but not in HEAD - */ - class AtticLogListener extends CommandOutputListener { - private static final String ATTIC = "Attic"; //$NON-NLS-1$ - private static final String RCS_FILE_POSTFIX = ",v"; //$NON-NLS-1$ - private static final String LOGGING_PREFIX = "Logging "; //$NON-NLS-1$ - ICVSFolder currentFolder; - List atticFiles = new ArrayList(); - - public IStatus messageLine( - String line, - ICVSRepositoryLocation location, - ICVSFolder commandRoot, - IProgressMonitor monitor) { - - // Find all RCS file names that contain "Attic" - int index = line.indexOf(ATTIC); - if (index == -1) return OK; - // Extract the file name and path from the RCS path - String filePath = line.substring(index); - int start = line.indexOf(Session.SERVER_SEPARATOR, index); - String fileName = line.substring(start + 1); - if (fileName.endsWith(RCS_FILE_POSTFIX)) { - fileName = fileName.substring(0, fileName.length() - RCS_FILE_POSTFIX.length()); - } - try { - atticFiles.add(currentFolder.getFile(fileName)); - } catch (CVSException e) { - return e.getStatus(); - } - return OK; - } - - public IStatus errorLine( - String line, - ICVSRepositoryLocation location, - ICVSFolder commandRoot, - IProgressMonitor monitor) { - - CVSRepositoryLocation repo = (CVSRepositoryLocation)location; - String folderPath = repo.getServerMessageWithoutPrefix(line, SERVER_PREFIX); - if (folderPath != null) { - if (folderPath.startsWith(LOGGING_PREFIX)) { - folderPath = folderPath.substring(LOGGING_PREFIX.length()); - try { - currentFolder = commandRoot.getFolder(folderPath); - } catch (CVSException e) { - return e.getStatus(); - } - return OK; - } - } - return super.errorLine(line, location, commandRoot, monitor); - } - - public ICVSFile[] getAtticFilePaths() { - return (ICVSFile[]) atticFiles.toArray(new ICVSFile[atticFiles.size()]); - } - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#execute(org.eclipse.jface.action.IAction) - */ - protected void execute(IAction action) throws InvocationTargetException, InterruptedException { - IContainer resource = (IContainer)getSelectedResources()[0]; - ICVSFile[] files = fetchDeletedFiles(resource); - if (files == null) return; - if (files.length == 0) { - MessageDialog.openInformation(getShell(), Policy.bind("RestoreFromRepositoryAction.noFilesTitle"), Policy.bind("RestoreFromRepositoryAction.noFilesMessage", resource.getName())); //$NON-NLS-1$ //$NON-NLS-2$ - return; - } - RestoreFromRepositoryWizard wizard = new RestoreFromRepositoryWizard(resource, files); - WizardDialog dialog = new ResizableWizardDialog(shell, wizard); - dialog.setMinimumPageSize(350, 250); - dialog.open(); - } - - /** - * @see org.eclipse.team.internal.ui.actions.TeamAction#isEnabled() - */ - protected boolean isEnabled() throws TeamException { - IResource[] resources = getSelectedResources(); - if (resources.length != 1) return false; - if (resources[0].getType() == IResource.FILE) return false; - ICVSFolder folder = CVSWorkspaceRoot.getCVSFolderFor((IContainer)resources[0]); - if (!folder.isCVSFolder()) return false; - return true; - } - - private ICVSFile[] fetchDeletedFiles(final IContainer parent) { - final ICVSFile[][] files = new ICVSFile[1][0]; - files[0] = null; - try { - run(new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - try { - ICVSFolder folder = CVSWorkspaceRoot.getCVSFolderFor(parent); - FolderSyncInfo info = folder.getFolderSyncInfo(); - ICVSRepositoryLocation location = CVSProviderPlugin.getPlugin().getRepository(info.getRoot()); - files[0] = fetchFilesInAttic(location, folder, monitor); - } catch (CVSException e) { - throw new InvocationTargetException(e); - } - } - }, true, PROGRESS_DIALOG); - } catch (InvocationTargetException e) { - handle(e); - } catch (InterruptedException e) { - return null; - } - return files[0]; - } - - /* - * Fetch the RCS paths (minus the Attic segment) of all files in the Attic. - * This path includes the repository root path. - */ - private ICVSFile[] fetchFilesInAttic(ICVSRepositoryLocation location, final ICVSFolder parent, IProgressMonitor monitor) throws CVSException { - final AtticLogListener listener = new AtticLogListener(); - Session.run(location, parent, false, new ICVSRunnable() { - public void run(IProgressMonitor monitor) throws CVSException { - monitor = Policy.monitorFor(monitor); - monitor.beginTask(null, 100); - QuietOption quietness = CVSProviderPlugin.getPlugin().getQuietness(); - try { - CVSProviderPlugin.getPlugin().setQuietness(Command.VERBOSE); - IStatus status = Command.LOG.execute(Command.NO_GLOBAL_OPTIONS, - new LocalOption[] { Log.RCS_FILE_NAMES_ONLY }, - new ICVSResource[] { parent }, listener, - Policy.subMonitorFor(monitor, 100)); - if (status.getCode() == CVSStatus.SERVER_ERROR) { - throw new CVSServerException(status); - } - } finally { - CVSProviderPlugin.getPlugin().setQuietness(quietness); - monitor.done(); - } - } - }, monitor); - return listener.getAtticFilePaths(); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/SetKeywordSubstitutionAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/SetKeywordSubstitutionAction.java deleted file mode 100644 index dffb82f44..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/SetKeywordSubstitutionAction.java +++ /dev/null @@ -1,39 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.actions; - -import org.eclipse.core.resources.IResource; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.team.internal.ccvs.core.client.Command.KSubstOption; -import org.eclipse.team.internal.ccvs.ui.ResizableWizardDialog; -import org.eclipse.team.internal.ccvs.ui.wizards.KSubstWizard; - -/** - * TagAction tags the selected resources with a version tag specified by the user. - */ -public class SetKeywordSubstitutionAction extends WorkspaceAction { - private KSubstOption previousOption = null; // automatic - - /* - * @see IActionDelegate#run(IAction) - */ - public void execute(IAction action) { - final IResource[] resources = getSelectedResources(); - KSubstWizard wizard = new KSubstWizard(resources, IResource.DEPTH_INFINITE, previousOption); - WizardDialog dialog = new ResizableWizardDialog(getShell(), wizard); - wizard.setParentDialog(dialog); - dialog.setMinimumPageSize(350, 250); - dialog.open(); - previousOption = wizard.getKSubstOption(); - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowAnnotationAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowAnnotationAction.java deleted file mode 100644 index d40d616c2..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowAnnotationAction.java +++ /dev/null @@ -1,173 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.actions; - -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; -import org.eclipse.team.internal.ccvs.core.CVSStatus; -import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFile; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.internal.ccvs.core.ICVSRunnable; -import org.eclipse.team.internal.ccvs.core.client.Annotate; -import org.eclipse.team.internal.ccvs.core.client.Command; -import org.eclipse.team.internal.ccvs.core.client.Session; -import org.eclipse.team.internal.ccvs.core.client.listeners.AnnotateListener; -import org.eclipse.team.internal.ccvs.core.client.listeners.LogEntry; -import org.eclipse.team.internal.ccvs.core.connection.CVSServerException; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo; -import org.eclipse.team.internal.ccvs.ui.AnnotateView; -import org.eclipse.team.internal.ccvs.ui.Policy; - -public class ShowAnnotationAction extends CVSAction { - -/** - * Action to open a CVS Annotate View - */ - - public void execute(IAction action) throws InvocationTargetException, InterruptedException { - // Get the selected resource. - final ICVSResource cvsResource = getSingleSelectedCVSResource(); - execute(cvsResource); - } - - public void execute(final ICVSResource cvsResource) throws InvocationTargetException, InterruptedException { - - final AnnotateListener listener = new AnnotateListener(); - if (cvsResource == null) { - return; - } - // Get the selected revision - final String revision; - try { - revision = cvsResource.getSyncInfo().getRevision(); - } catch (CVSException e) { - throw new InvocationTargetException(e); - } - - // Run the CVS Annotate action with a progress monitor - run(new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - fetchAnnotation(listener, cvsResource, revision, monitor); - } - }, true, PROGRESS_DIALOG); - - // Open the view - AnnotateView view = AnnotateView.openInActivePerspective(); - if (view == null) { - return; - } - - // Populate the view. - - if (listener.hasError()) { - throw new InvocationTargetException(new CVSException("Unexpected response from CVS Server: " + listener.getError())); - } else { - view.showAnnotations(cvsResource, listener.getCvsAnnotateBlocks(), listener.getContents()); - } - } - - /** - * Send the CVS annotate command - * @param listener - * @param cvsResource - * @param revision - * @param monitor - * @throws InvocationTargetException - */ - private void fetchAnnotation(final AnnotateListener listener, final ICVSResource cvsResource, final String revision, IProgressMonitor monitor) throws InvocationTargetException { - - try { - ICVSFolder folder = cvsResource.getParent(); - final FolderSyncInfo info = folder.getFolderSyncInfo(); - ICVSRepositoryLocation location = CVSProviderPlugin.getPlugin().getRepository(info.getRoot()); - Session.run(location, folder, false, new ICVSRunnable() { - public void run(IProgressMonitor monitor) throws CVSException { - monitor = Policy.monitorFor(monitor); - monitor.beginTask(null, 100); - Command.QuietOption quietness = CVSProviderPlugin.getPlugin().getQuietness(); - try { - CVSProviderPlugin.getPlugin().setQuietness(Command.VERBOSE); - final Command.LocalOption[] localOption; - if (revision == null) { - localOption = Command.NO_LOCAL_OPTIONS; - } else { - localOption = new Command.LocalOption[1]; - localOption[0] = Annotate.makeRevisionOption(revision); - } - IStatus status = Command.ANNOTATE.execute(Command.NO_GLOBAL_OPTIONS, - localOption, new ICVSResource[] { cvsResource }, listener, - Policy.subMonitorFor(monitor, 100)); - if (status.getCode() == CVSStatus.SERVER_ERROR) { - throw new CVSServerException(status); - } - } finally { - CVSProviderPlugin.getPlugin().setQuietness(quietness); - monitor.done(); - } - } - }, monitor); - } catch (CVSException e) { - throw new InvocationTargetException(e); - } - } - - /** - * Ony enabled for single resource selection - */ - protected boolean isEnabled() throws TeamException { - return (selection.size() == 1); - } - - /** - * This action is called from one of a Resource Navigator a - * CVS Resource Navigator or a History Log Viewer. Return - * the selected resource as an ICVSResource - * - * @return ICVSResource - */ - protected ICVSResource getSingleSelectedCVSResource() { - - // Selected from a Resource Navigator - IResource[] resources = getSelectedResources(); - if (resources.length == 1) { - IContainer parent = resources[0].getParent(); - ICVSFolder folder = CVSWorkspaceRoot.getCVSFolderFor(parent); - return CVSWorkspaceRoot.getCVSResourceFor(resources[0]); - } - - // Selected from a CVS Resource Navigator - ICVSResource[] cvsResources = getSelectedCVSResources(); - if (cvsResources.length == 1) { - return cvsResources[0]; - } - - // Selected from a History Viewer - Object[] logEntries = getSelectedResources(LogEntry.class); - if (logEntries.length == 1) { - LogEntry aLogEntry = (LogEntry) logEntries[0]; - ICVSRemoteFile cvsRemoteFile = aLogEntry.getRemoteFile(); - return cvsRemoteFile; - } - return null; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowCVSPerspectiveAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowCVSPerspectiveAction.java deleted file mode 100644 index 53e039ab4..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowCVSPerspectiveAction.java +++ /dev/null @@ -1,37 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.actions; - - -import org.eclipse.jface.action.Action; -import org.eclipse.ui.IPerspectiveDescriptor; -import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.ui.PlatformUI; - -public class ShowCVSPerspectiveAction extends Action { - public void run() { - IWorkbench workbench = PlatformUI.getWorkbench(); - IWorkbenchWindow activeWindow = workbench.getActiveWorkbenchWindow(); - if (activeWindow == null) { - return; - } - IWorkbenchPage activePage = activeWindow.getActivePage(); - if (activePage == null) { - return; - } - IPerspectiveDescriptor cvsPerspective = workbench.getPerspectiveRegistry().findPerspectiveWithId("org.eclipse.team.cvs.ui.cvsPerspective"); //$NON-NLS-1$ - if(cvsPerspective!=null) { - activePage.setPerspective(cvsPerspective); - } - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowEditorsAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowEditorsAction.java deleted file mode 100644 index 0d0038e12..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowEditorsAction.java +++ /dev/null @@ -1,70 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2003 CSC SoftwareConsult GmbH & Co. OHG, Germany and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * CSC - Intial implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.actions; - -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.action.IAction; -import org.eclipse.team.internal.ccvs.core.EditorsInfo; -import org.eclipse.team.internal.ccvs.ui.EditorsView; -import org.eclipse.ui.actions.WorkspaceModifyOperation; -/** - * - * - * Action for Show Editors in popup menus - * - * @author <a href="mailto:kohlwes@gmx.net">Gregor Kohlwes</a> - * - */ -public class ShowEditorsAction extends WorkspaceAction { - - protected void execute(IAction action) throws InvocationTargetException, InterruptedException { - final EditorsAction editorsAction = new EditorsAction(); - run(new WorkspaceModifyOperation() { - public void execute(IProgressMonitor monitor) - throws InvocationTargetException, InterruptedException { - executeProviderAction(editorsAction, monitor); - } - }, true /* cancelable */ , PROGRESS_DIALOG); - EditorsInfo[] infos = editorsAction.getEditorsInfo(); - EditorsView view = (EditorsView)showView(EditorsView.VIEW_ID); - if (view != null) { - view.setInput(infos); - } - - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForAddedResources() - */ - protected boolean isEnabledForAddedResources() { - return false; - } - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForNonExistantResources() - */ - protected boolean isEnabledForNonExistantResources() { - return true; - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForMultipleResources() - */ - protected boolean isEnabledForMultipleResources() { - // We support one selected Resource, - // because the editors command will - // show the editors of all children too. - return false; - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowHistoryAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowHistoryAction.java deleted file mode 100644 index 6567fd029..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowHistoryAction.java +++ /dev/null @@ -1,87 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.actions; - -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.Iterator; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFile; -import org.eclipse.team.internal.ccvs.ui.HistoryView; -import org.eclipse.team.internal.ccvs.ui.Policy; - -public class ShowHistoryAction extends CVSAction { - /** - * Returns the selected remote files - */ - protected ICVSRemoteFile[] getSelectedRemoteFiles() { - ArrayList resources = null; - if (!selection.isEmpty()) { - resources = new ArrayList(); - Iterator elements = ((IStructuredSelection) selection).iterator(); - while (elements.hasNext()) { - Object next = elements.next(); - if (next instanceof ICVSRemoteFile) { - resources.add(next); - continue; - } - if (next instanceof IAdaptable) { - IAdaptable a = (IAdaptable)next; - Object adapter = a.getAdapter(ICVSRemoteFile.class); - if (adapter instanceof ICVSRemoteFile) { - resources.add(adapter); - continue; - } - } - } - } - if (resources != null && !resources.isEmpty()) { - ICVSRemoteFile[] result = new ICVSRemoteFile[resources.size()]; - resources.toArray(result); - return result; - } - return new ICVSRemoteFile[0]; - } - /* - * @see CVSAction#executeIAction) - */ - public void execute(IAction action) throws InterruptedException, InvocationTargetException { - run(new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException { - ICVSRemoteFile[] files = getSelectedRemoteFiles(); - HistoryView view = (HistoryView)showView(HistoryView.VIEW_ID); - if (view != null) { - view.showHistory(files[0]); - } - } - }, false /* cancelable */, PROGRESS_BUSYCURSOR); - } - /* - * @see TeamAction#isEnabled() - */ - protected boolean isEnabled() throws TeamException { - ICVSRemoteFile[] resources = getSelectedRemoteFiles(); - return resources.length == 1; - } - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getErrorTitle() - */ - protected String getErrorTitle() { - return Policy.bind("ShowHistoryAction.showHistory"); //$NON-NLS-1$ - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowResourceInHistoryAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowResourceInHistoryAction.java deleted file mode 100644 index 231b5baeb..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowResourceInHistoryAction.java +++ /dev/null @@ -1,76 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.actions; - -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.internal.ccvs.ui.HistoryView; -import org.eclipse.team.internal.ccvs.ui.Policy; - -public class ShowResourceInHistoryAction extends WorkspaceAction { - /* - * @see IActionDelegate#run(IAction) - */ - public void execute(IAction action) throws InterruptedException, InvocationTargetException { - run(new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException { - IResource[] resources = getSelectedResources(); - if (resources.length != 1) return; - HistoryView view = (HistoryView)showView(HistoryView.VIEW_ID); - if (view != null) { - view.showHistory(resources[0]); - } - } - }, false /* cancelable */, PROGRESS_BUSYCURSOR); - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getErrorTitle() - */ - protected String getErrorTitle() { - return Policy.bind("ShowHistoryAction.showHistory"); //$NON-NLS-1$ - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForMultipleResources() - */ - protected boolean isEnabledForMultipleResources() { - return false; - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForAddedResources() - */ - protected boolean isEnabledForAddedResources() { - return false; - } - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForNonExistantResources() - */ - protected boolean isEnabledForNonExistantResources() { - return true; - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForCVSResource(org.eclipse.team.internal.ccvs.core.ICVSResource) - */ - protected boolean isEnabledForCVSResource(ICVSResource cvsResource) throws CVSException { - return (!cvsResource.isFolder() && super.isEnabledForCVSResource(cvsResource)); - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/SyncAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/SyncAction.java deleted file mode 100644 index c6722ce5e..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/SyncAction.java +++ /dev/null @@ -1,55 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.actions; - -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.core.resources.IResource; -import org.eclipse.jface.action.IAction; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; -import org.eclipse.team.internal.ccvs.core.CVSWorkspaceSubscriber; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.ui.TeamUI; -import org.eclipse.team.ui.sync.ISyncViewer; - -/** - * Action for catchup/release in popup menus. - */ -public class SyncAction extends WorkspaceAction { - - public void execute(IAction action) throws InvocationTargetException { - IResource[] resources = getResourcesToSync(); - if (resources == null || resources.length == 0) return; - - ISyncViewer view = TeamUI.showSyncViewInActivePage(null); - if(view != null) { - CVSWorkspaceSubscriber cvsWorkspaceSubscriber = CVSProviderPlugin.getPlugin().getCVSWorkspaceSubscriber(); - view.setSelection(cvsWorkspaceSubscriber, resources, view.getCurrentViewType()); - view.refreshWithRemote(cvsWorkspaceSubscriber, resources); - } - } - - protected IResource[] getResourcesToSync() { - return getSelectedResources(); - } - - /** - * Enable for resources that are managed (using super) or whose parent is a - * CVS folder. - * - * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForCVSResource(org.eclipse.team.internal.ccvs.core.ICVSResource) - */ - protected boolean isEnabledForCVSResource(ICVSResource cvsResource) throws CVSException { - return super.isEnabledForCVSResource(cvsResource) || cvsResource.getParent().isCVSFolder(); - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagAction.java deleted file mode 100644 index 095b16926..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagAction.java +++ /dev/null @@ -1,164 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.actions; - -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.dialogs.InputDialog; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.MessageDialogWithToggle; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ccvs.ui.TagAsVersionDialog; -import org.eclipse.team.internal.ccvs.ui.operations.ITagOperation; -import org.eclipse.team.internal.ccvs.ui.repo.RepositoryManager; - -/** - * TagAction tags the selected resources with a version tag specified by the user. - */ -public abstract class TagAction extends WorkspaceAction { - - // remember if the execute action was cancelled - private boolean wasCancelled = false; - - /** - * @see CVSAction#execute(IAction) - */ - public void execute(IAction action) throws InvocationTargetException, InterruptedException { - setWasCancelled(false); - if (!performPrompting()) { - setWasCancelled(true); - return; - } - - // Prompt for the tag name - final ITagOperation[] result = new ITagOperation[1]; - getShell().getDisplay().syncExec(new Runnable() { - public void run() { - result[0] = configureOperation(); - if (result[0] == null) { - return; - } - }}); - - if (result[0] == null) { - setWasCancelled(true); - return; - } - - try { - result[0].run(); - } catch (CVSException e1) { - throw new InvocationTargetException(e1); - } - - broadcastTagChange(result[0]); - } - - protected boolean performPrompting() { - return true; - } - - /** - * Prompts the user for a tag name. - * Note: This method is designed to be overridden by test cases. - * @return the operation, or null to cancel - */ - protected ITagOperation configureOperation() { - IPreferenceStore store = CVSUIPlugin.getPlugin().getPreferenceStore(); - ITagOperation operation = createTagOperation(); - TagAsVersionDialog dialog = new TagAsVersionDialog(getShell(), - Policy.bind("TagAction.tagResources"), //$NON-NLS-1$ - operation); - if (dialog.open() != InputDialog.OK) return null; - - // The user has indicated they want to force a move. Make sure they really do. - if (dialog.shouldMoveTag() && store.getBoolean(ICVSUIConstants.PREF_CONFIRM_MOVE_TAG)) { - MessageDialogWithToggle confirmDialog = MessageDialogWithToggle.openQuestion(getShell(), - Policy.bind("TagAction.moveTagConfirmTitle"), //$NON-NLS-1$ - Policy.bind("TagAction.moveTagConfirmMessage", dialog.getTagName()), - null, - false); - - if (confirmDialog.getReturnCode() == IDialogConstants.OK_ID) { - store.setValue(ICVSUIConstants.PREF_CONFIRM_MOVE_TAG, !confirmDialog.getToggleState()); - } else { - return null; - } - } - - // The user is a cowboy and wants to do it. - return dialog.getOperation(); - } - - protected abstract ITagOperation createTagOperation(); - - protected String getErrorTitle() { - return Policy.bind("TagAction.tagErrorTitle"); //$NON-NLS-1$ - } - - protected String getWarningTitle() { - return Policy.bind("TagAction.tagWarningTitle"); //$NON-NLS-1$ - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForAddedResources() - */ - protected boolean isEnabledForAddedResources() { - return false; - } - - public boolean wasCancelled() { - return wasCancelled; - } - - public void setWasCancelled(boolean b) { - wasCancelled = b; - } - - protected void broadcastTagChange(final ITagOperation operation) throws InvocationTargetException, InterruptedException { - final RepositoryManager manager = CVSUIPlugin.getPlugin().getRepositoryManager(); - manager.run(new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - ICVSResource[] resources = operation.getCVSResources(); - for (int i = 0; i < resources.length; i++) { - ICVSResource resource = resources[i]; - // Cache the new tag creation even if the tag may have had warnings. - try { - manager.addTags(getRootParent(resource), new CVSTag[] {operation.getTag()}); - } catch (CVSException e) { - CVSUIPlugin.log(e); - } - } - } - }, new NullProgressMonitor()); - } - - private ICVSResource getRootParent(ICVSResource resource) throws CVSException { - if (!resource.isManaged()) return resource; - ICVSFolder parent = resource.getParent(); - if (parent == null) return resource; - // Special check for a parent which is the repository itself - if (parent.getName().length() == 0) return resource; - return getRootParent(parent); - } -} - diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagInRepositoryAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagInRepositoryAction.java deleted file mode 100644 index 55323cfb4..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagInRepositoryAction.java +++ /dev/null @@ -1,50 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.actions; - -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.internal.ccvs.ui.operations.ITagOperation; -import org.eclipse.team.internal.ccvs.ui.operations.TagInRepositoryOperation; - -public class TagInRepositoryAction extends TagAction { - - /** - * @see TeamAction#isEnabled() - */ - protected boolean isEnabled() throws TeamException { - ICVSResource[] resources = getSelectedCVSResources(); - if (resources.length == 0) return false; - for (int i = 0; i < resources.length; i++) { - if (resources[i] instanceof ICVSRepositoryLocation) return false; - } - return true; - } - - /** - * @see CVSAction#needsToSaveDirtyEditors() - */ - protected boolean needsToSaveDirtyEditors() { - return false; - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#requiresLocalSyncInfo() - */ - protected boolean requiresLocalSyncInfo() { - return false; - } - - protected ITagOperation createTagOperation() { - return new TagInRepositoryOperation(getShell(), getSelectedRemoteResources()); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagLocalAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagLocalAction.java deleted file mode 100644 index eb1be075e..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagLocalAction.java +++ /dev/null @@ -1,59 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.actions; - -import org.eclipse.core.resources.IResource; -import org.eclipse.team.internal.ccvs.ui.CVSLightweightDecorator; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ccvs.ui.operations.ITagOperation; -import org.eclipse.team.internal.ccvs.ui.operations.TagOperation; -import org.eclipse.team.internal.ui.dialogs.IPromptCondition; -import org.eclipse.team.internal.ui.dialogs.PromptingDialog; - -public class TagLocalAction extends TagAction { - - IResource[] resources; - - protected boolean performPrompting() { - // Prompt for any uncommitted changes - PromptingDialog prompt = new PromptingDialog(getShell(), getSelectedResources(), - getPromptCondition(), Policy.bind("TagAction.uncommittedChangesTitle"));//$NON-NLS-1$ - try { - resources = prompt.promptForMultiple(); - } catch(InterruptedException e) { - return false; - } - if(resources.length == 0) { - // nothing to do - return false; - } - - return true; - } - - protected ITagOperation createTagOperation() { - return new TagOperation(getShell(), resources); - } - - /** - * Note: This method is designed to be overridden by test cases. - */ - protected IPromptCondition getPromptCondition() { - return new IPromptCondition() { - public boolean needsPrompt(IResource resource) { - return CVSLightweightDecorator.isDirty(resource); - } - public String promptMessage(IResource resource) { - return Policy.bind("TagAction.uncommittedChanges", resource.getName());//$NON-NLS-1$ - } - }; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UneditAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UneditAction.java deleted file mode 100644 index 26d05dfaf..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UneditAction.java +++ /dev/null @@ -1,78 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.actions; - -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.team.core.Team; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSTeamProvider; -import org.eclipse.team.internal.ccvs.core.ICVSFile; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.ui.actions.WorkspaceModifyOperation; - -public class UneditAction extends WorkspaceAction { - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#execute(org.eclipse.jface.action.IAction) - */ - protected void execute(IAction action) throws InvocationTargetException, InterruptedException { - - if(! MessageDialog.openConfirm(getShell(), Policy.bind("Uneditaction.confirmTitle"), Policy.bind("Uneditaction.confirmMessage"))) { //$NON-NLS-1$ //$NON-NLS-2$ - return; - } - - run(new WorkspaceModifyOperation() { - public void execute(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - executeProviderAction(new IProviderAction() { - public IStatus execute(CVSTeamProvider provider, IResource[] resources, IProgressMonitor monitor) throws CVSException { - provider.unedit(resources, false /* recurse */, true /* notify server */, monitor); - return Team.OK_STATUS; - } - }, monitor); - } - }, true /* cancelable */, PROGRESS_DIALOG); - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForAddedResources() - */ - protected boolean isEnabledForAddedResources() { - return false; - } - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForNonExistantResources() - */ - protected boolean isEnabledForNonExistantResources() { - return true; - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForCVSResource(org.eclipse.team.internal.ccvs.core.ICVSResource) - */ - protected boolean isEnabledForCVSResource(ICVSResource cvsResource) throws CVSException { - if (cvsResource.isFolder()) return false; - if (super.isEnabledForCVSResource(cvsResource)) { - return !((ICVSFile)cvsResource).isReadOnly() && ((ICVSFile)cvsResource).isEdited(); - } else { - return false; - } - } - - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UnmanageAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UnmanageAction.java deleted file mode 100644 index 13a8e7ecb..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UnmanageAction.java +++ /dev/null @@ -1,203 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.actions; - -import java.lang.reflect.InvocationTargetException; -import java.util.Hashtable; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.core.RepositoryProvider; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSTeamProvider; -import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.core.InfiniteSubProgressMonitor; -import org.eclipse.ui.actions.WorkspaceModifyOperation; -import org.eclipse.ui.help.WorkbenchHelp; - -/** - * Unmanage action removes the cvs feature from a project and optionally - * deletes the CVS meta information that is stored on disk. - */ -public class UnmanageAction extends WorkspaceAction { - - static class DeleteProjectDialog extends MessageDialog { - - private IProject[] projects; - private boolean deleteContent = false; - private Button radio1; - private Button radio2; - - DeleteProjectDialog(Shell parentShell, IProject[] projects) { - super( - parentShell, - getTitle(projects), - null, // accept the default window icon - getMessage(projects), - MessageDialog.QUESTION, - new String[] {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL}, - 0); // yes is the default - this.projects = projects; - } - - static String getTitle(IProject[] projects) { - if (projects.length == 1) - return Policy.bind("Unmanage.title"); //$NON-NLS-1$ - else - return Policy.bind("Unmanage.titleN"); //$NON-NLS-1$ - } - - static String getMessage(IProject[] projects) { - if (projects.length == 1) { - IProject project = projects[0]; - return Policy.bind("Unmanage.message", project.getName()); //$NON-NLS-1$ - } - else { - return Policy.bind("Unmanage.messageN", new Integer(projects.length).toString()); //$NON-NLS-1$ - } - } - - protected Control createCustomArea(Composite parent) { - Composite composite = new Composite(parent, SWT.NONE); - composite.setLayout(new GridLayout()); - radio1 = new Button(composite, SWT.RADIO); - radio1.addSelectionListener(selectionListener); - - radio1.setText(Policy.bind("Unmanage.option2")); //$NON-NLS-1$ - - radio2 = new Button(composite, SWT.RADIO); - radio2.addSelectionListener(selectionListener); - - radio2.setText(Policy.bind("Unmanage.option1")); //$NON-NLS-1$ - - // set initial state - radio1.setSelection(deleteContent); - radio2.setSelection(!deleteContent); - - WorkbenchHelp.setHelp(composite, IHelpContextIds.DISCONNECT_ACTION); - - return composite; - } - - private SelectionListener selectionListener = new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - Button button = (Button) e.widget; - if (button.getSelection()) { - deleteContent = (button == radio1); - } - } - }; - - public boolean getDeleteContent() { - return deleteContent; - } - } - - private boolean deleteContent = false; - - /* - * @see IActionDelegate#run(IAction) - */ - public void execute(IAction action) throws InterruptedException, InvocationTargetException { - if(confirmDeleteProjects()) { - run(getOperation(), true /* cancelable */, PROGRESS_DIALOG); - } - } - - private IRunnableWithProgress getOperation() { - return new WorkspaceModifyOperation() { - public void execute(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - try { - Hashtable table = getProviderMapping(); - Set keySet = table.keySet(); - monitor.beginTask("", keySet.size() * 1000); //$NON-NLS-1$ - monitor.setTaskName(Policy.bind("Unmanage.unmanaging")); //$NON-NLS-1$ - Iterator iterator = keySet.iterator(); - while (iterator.hasNext()) { - IProgressMonitor subMonitor = new InfiniteSubProgressMonitor(monitor, 1000); - subMonitor.beginTask(null, 100); - CVSTeamProvider provider = (CVSTeamProvider)iterator.next(); - List list = (List)table.get(provider); - IResource[] providerResources = (IResource[])list.toArray(new IResource[list.size()]); - for (int i = 0; i < providerResources.length; i++) { - IResource resource = providerResources[i]; - ICVSFolder folder = CVSWorkspaceRoot.getCVSFolderFor((IContainer) resource); - try { - if(deleteContent) { - folder.unmanage(Policy.subMonitorFor(subMonitor, 10)); - } - } finally { - // We want to remove the nature even if the unmanage operation fails - RepositoryProvider.unmap((IProject)resource); - } - } - } - } catch (TeamException e) { - throw new InvocationTargetException(e); - } finally { - monitor.done(); - } - } - }; - } - - boolean confirmDeleteProjects() { - final int[] result = new int[] { MessageDialog.OK }; - IProject[] projects = getSelectedProjects(); - final DeleteProjectDialog dialog = new DeleteProjectDialog(shell, projects); - shell.getDisplay().syncExec(new Runnable() { - public void run() { - result[0] = dialog.open(); - } - }); - deleteContent = dialog.getDeleteContent(); - return result[0] == 0; // YES - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getErrorTitle() - */ - protected String getErrorTitle() { - return Policy.bind("Unmanage.unmanagingError");//$NON-NLS-1$ - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForCVSResource(org.eclipse.team.internal.ccvs.core.ICVSResource) - */ - protected boolean isEnabledForCVSResource(ICVSResource cvsResource) throws CVSException { - IResource resource = cvsResource.getIResource(); - return resource != null && resource.getType() == IResource.PROJECT; - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UpdateAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UpdateAction.java deleted file mode 100644 index 8b875af3f..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UpdateAction.java +++ /dev/null @@ -1,87 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.actions; - -import java.lang.reflect.InvocationTargetException; -import java.util.Hashtable; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.SubProgressMonitor; -import org.eclipse.jface.action.IAction; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSTeamProvider; -import org.eclipse.team.internal.ccvs.core.client.Command; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.ui.actions.WorkspaceModifyOperation; - -/** - * UpdateAction performs a 'cvs update' command on the selected resources. - * If conflicts are present (file has been changed both remotely and locally), - * the changes will be merged into the local file such that the user must - * resolve the conflicts. This action is temporary code; it will be removed - * when a functional synchronize view has been implemented. - */ -public class UpdateAction extends WorkspaceAction { - /* - * @see IActionDelegate#run(IAction) - */ - public void execute(IAction action) throws InterruptedException, InvocationTargetException { - run(new WorkspaceModifyOperation() { - public void execute(IProgressMonitor monitor) throws InterruptedException, InvocationTargetException { - try { - Hashtable table = getProviderMapping(); - Set keySet = table.keySet(); - monitor.beginTask("", keySet.size() * 1000); //$NON-NLS-1$ - monitor.setTaskName(Policy.bind("UpdateAction.updating")); //$NON-NLS-1$ - Iterator iterator = keySet.iterator(); - while (iterator.hasNext()) { - IProgressMonitor subMonitor = new SubProgressMonitor(monitor, 1000); - CVSTeamProvider provider = (CVSTeamProvider)iterator.next(); - List list = (List)table.get(provider); - IResource[] providerResources = (IResource[])list.toArray(new IResource[list.size()]); - provider.update(providerResources, Command.NO_LOCAL_OPTIONS, null, true /*createBackups*/, subMonitor); - } - } catch (TeamException e) { - throw new InvocationTargetException(e); - } finally { - monitor.done(); - } - } - }, true /* cancelable */, PROGRESS_DIALOG); - - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getErrorTitle() - */ - protected String getErrorTitle() { - return Policy.bind("UpdateAction.update"); //$NON-NLS-1$ - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForAddedResources() - */ - protected boolean isEnabledForAddedResources() { - return false; - } - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForNonExistantResources() - */ - protected boolean isEnabledForNonExistantResources() { - return true; - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/WorkspaceAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/WorkspaceAction.java deleted file mode 100644 index 9196cd564..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/WorkspaceAction.java +++ /dev/null @@ -1,551 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.actions; - -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashSet; -import java.util.Hashtable; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IResourceStatus; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.SubProgressMonitor; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.core.RepositoryProvider; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.CVSTeamProvider; -import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.core.resources.EclipseSynchronizer; -import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo; -import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo; -import org.eclipse.team.internal.ccvs.core.util.Util; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ui.dialogs.IPromptCondition; -import org.eclipse.team.internal.ui.dialogs.PromptingDialog; - -/** - * This class represents an action performed on a local CVS workspace - */ -public abstract class WorkspaceAction extends CVSAction { - - public interface IProviderAction { - public IStatus execute(CVSTeamProvider provider, IResource[] resources, IProgressMonitor monitor) throws CVSException; - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#beginExecution(IAction) - */ - protected boolean beginExecution(IAction action) throws TeamException { - if (super.beginExecution(action)) { - // Ensure that the required sync info is loaded - if (requiresLocalSyncInfo()) { - // Check enablement just in case the sync info wasn't loaded - if (!isEnabled()) { - MessageDialog.openInformation(getShell(), Policy.bind("CVSAction.disabledTitle"), Policy.bind("CVSAction.disabledMessage")); //$NON-NLS-1$ //$NON-NLS-2$ - return false; - } - } - return true; - } else { - return false; - } - } - - /** - * Return true if the sync info is loaded for all selected resources. - * The purpose of this method is to allow enablement code to be as fast - * as possible. If the sync info is not loaded, the menu should be enabled - * and, if choosen, the action will verify that it is indeed enabled before - * performing the associated operation - */ - protected boolean isSyncInfoLoaded(IResource[] resources) throws CVSException { - return EclipseSynchronizer.getInstance().isSyncInfoLoaded(resources, getEnablementDepth()); - } - - /** - * Returns the resource depth of the action for use in determining if the required - * sync info is loaded. The default is IResource.DEPTH_INFINITE. Sunclasses can override - * as required. - */ - protected int getActionDepth() { - return IResource.DEPTH_INFINITE; - } - - /** - * Returns the resource depth of the action enablement for use in determining if the required - * sync info is loaded. The default is IResource.DEPTH_ZERO. Sunclasses can override - * as required. - */ - protected int getEnablementDepth() { - return IResource.DEPTH_ZERO; - } - - /** - * Ensure that the sync info for all the provided resources has been loaded. - * If an out-of-sync resource is found, prompt to refresh all the projects involved. - */ - protected boolean ensureSyncInfoLoaded(IResource[] resources) throws CVSException { - boolean keepTrying = true; - while (keepTrying) { - try { - EclipseSynchronizer.getInstance().ensureSyncInfoLoaded(resources, getActionDepth()); - keepTrying = false; - } catch (CVSException e) { - if (e.getStatus().getCode() == IResourceStatus.OUT_OF_SYNC_LOCAL) { - // determine the projects of the resources involved - Set projects = new HashSet(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; - projects.add(resource.getProject()); - } - // prompt to refresh - if (promptToRefresh(getShell(), (IResource[]) projects.toArray(new IResource[projects.size()]), e.getStatus())) { - for (Iterator iter = projects.iterator();iter.hasNext();) { - IProject project = (IProject) iter.next(); - try { - project.refreshLocal(IResource.DEPTH_INFINITE, null); - } catch (CoreException coreException) { - throw CVSException.wrapException(coreException); - } - } - } else { - return false; - } - } else { - throw e; - } - } - } - return true; - } - - /** - * Override to ensure that the sync info is available before performing the - * real <code>isEnabled()</code> test. - * - * @see org.eclipse.team.internal.ui.actions.TeamAction#setActionEnablement(IAction) - */ - protected void setActionEnablement(IAction action) { - try { - boolean requires = requiresLocalSyncInfo(); - if (!requires || (requires && isSyncInfoLoaded(getSelectedResources()))) { - super.setActionEnablement(action); - } else { - // If the sync info is not loaded, enable the menu item - // Performing the action will ensure that the action should really - // be enabled before anything else is done - action.setEnabled(true); - } - } catch (CVSException e) { - // We couldn't determine if the sync info was loaded. - // Enable the action so that performing the action will - // reveal the error to the user. - action.setEnabled(true); - } - } - - /** - * Return true if the action requires the sync info for the selected resources. - * If the sync info is required, the real enablement code will only be run if - * the sync info is loaded from disc. Otherwise, the action is enabled and - * performing the action will load the sync info and verify that the action is truely - * enabled before doing anything else. - * - * This implementation returns <code>true</code>. Subclasses must override if they do - * not require the sync info of the selected resources. - * - * @return boolean - */ - protected boolean requiresLocalSyncInfo() { - return true; - } - - protected boolean promptToRefresh(final Shell shell, final IResource[] resources, final IStatus status) { - final boolean[] result = new boolean[] { false}; - Runnable runnable = new Runnable() { - public void run() { - Shell shellToUse = shell; - if (shell == null) { - shellToUse = new Shell(Display.getCurrent()); - } - String question; - if (resources.length == 1) { - question = Policy.bind("CVSAction.refreshQuestion", status.getMessage(), resources[0].getFullPath().toString()); //$NON-NLS-1$ - } else { - question = Policy.bind("CVSAction.refreshMultipleQuestion", status.getMessage()); //$NON-NLS-1$ - } - result[0] = MessageDialog.openQuestion(shellToUse, Policy.bind("CVSAction.refreshTitle"), question); //$NON-NLS-1$ - } - }; - Display.getDefault().syncExec(runnable); - return result[0]; - } - - /** - * Most CVS workspace actions modify the workspace and thus should - * save dirty editors. - * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#needsToSaveDirtyEditors() - */ - protected boolean needsToSaveDirtyEditors() { - return true; - } - - /** - * The action is enabled for the appropriate resources. This method checks - * that: - * <ol> - * <li>there is no overlap between a selected file and folder (overlapping - * folders is allowed because of logical vs. physical mapping problem in - * views) - * <li>the state of the resources match the conditions provided by: - * <ul> - * <li>isEnabledForIgnoredResources() - * <li>isEnabledForManagedResources() - * <li>isEnabledForUnManagedResources() (i.e. not ignored and not managed) - * </ul> - * </ol> - * @see TeamAction#isEnabled() - */ - protected boolean isEnabled() throws TeamException { - - // invoke the inherited method so that overlaps are maintained - IResource[] resources = super.getSelectedResources(); - - // disable if no resources are selected - if(resources.length==0) return false; - - // disable properly for single resource enablement - if (!isEnabledForMultipleResources() && resources.length != 1) return false; - - // validate enabled for each resource in the selection - List folderPaths = new ArrayList(); - List filePaths = new ArrayList(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; - - // only enable for accessible resources - if(resource.getType() == IResource.PROJECT) { - if (! resource.isAccessible()) return false; - } - - // no CVS actions are enabled if the selection contains a linked resource - if (CVSWorkspaceRoot.isLinkedResource(resource)) return false; - - // only enable for resources in a project shared with CVS - if(RepositoryProvider.getProvider(resource.getProject(), CVSProviderPlugin.getTypeId()) == null) { - return false; - } - - // collect files and folders separately to check for overlap later - IPath resourceFullPath = resource.getFullPath(); - if(resource.getType() == IResource.FILE) { - filePaths.add(resourceFullPath); - } else { - folderPaths.add(resourceFullPath); - } - - // ensure that resource management state matches what the action requires - ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource); - if (!isEnabledForCVSResource(cvsResource)) { - return false; - } - } - // Ensure that there is no overlap between files and folders - // NOTE: folder overlap must be allowed because of logical vs. physical - if(!folderPaths.isEmpty()) { - for (Iterator fileIter = filePaths.iterator(); fileIter.hasNext();) { - IPath resourcePath = (IPath) fileIter.next(); - for (Iterator it = folderPaths.iterator(); it.hasNext();) { - IPath folderPath = (IPath) it.next(); - if (folderPath.isPrefixOf(resourcePath)) { - return false; - } - } - } - } - return true; - } - - /** - * Method isEnabledForCVSResource. - * @param cvsResource - * @return boolean - */ - protected boolean isEnabledForCVSResource(ICVSResource cvsResource) throws CVSException { - boolean managed = false; - boolean ignored = false; - boolean added = false; - if (cvsResource.isIgnored()) { - ignored = true; - } else if (cvsResource.isFolder()) { - managed = ((ICVSFolder)cvsResource).isCVSFolder(); - } else { - ResourceSyncInfo info = cvsResource.getSyncInfo(); - managed = info != null; - if (managed) added = info.isAdded(); - } - if (managed && ! isEnabledForManagedResources()) return false; - if ( ! managed && ! isEnabledForUnmanagedResources()) return false; - if ( ignored && ! isEnabledForIgnoredResources()) return false; - if (added && ! isEnabledForAddedResources()) return false; - if ( ! cvsResource.exists() && ! isEnabledForNonExistantResources()) return false; - return true; - } - - /** - * Method isEnabledForIgnoredResources. - * @return boolean - */ - protected boolean isEnabledForIgnoredResources() { - return false; - } - - /** - * Method isEnabledForUnmanagedResources. - * @return boolean - */ - protected boolean isEnabledForUnmanagedResources() { - return false; - } - - /** - * Method isEnabledForManagedResources. - * @return boolean - */ - protected boolean isEnabledForManagedResources() { - return true; - } - - /** - * Method isEnabledForAddedResources. - * @return boolean - */ - protected boolean isEnabledForAddedResources() { - return true; - } - - /** - * Method isEnabledForAddedResources. - * @return boolean - */ - protected boolean isEnabledForMultipleResources() { - return true; - } - - /** - * Method isEnabledForNonExistantResources. - * @return boolean - */ - protected boolean isEnabledForNonExistantResources() { - return false; - } - - /** - * Method getNonOverlapping ensures that a resource is not covered more than once. - * @param resources - * @return IResource[] - */ - public static IResource[] getNonOverlapping(IResource[] resources) { - // Sort the resources so the shortest paths are first - List sorted = new ArrayList(); - sorted.addAll(Arrays.asList(resources)); - Collections.sort(sorted, new Comparator() { - public int compare(Object arg0, Object arg1) { - IResource resource0 = (IResource) arg0; - IResource resource1 = (IResource) arg1; - return resource0.getFullPath().segmentCount() - resource1.getFullPath().segmentCount(); - } - public boolean equals(Object arg0) { - return false; - } - }); - // Collect all non-overlapping resources - List coveredPaths = new ArrayList(); - for (Iterator iter = sorted.iterator(); iter.hasNext();) { - IResource resource = (IResource) iter.next(); - IPath resourceFullPath = resource.getFullPath(); - boolean covered = false; - for (Iterator it = coveredPaths.iterator(); it.hasNext();) { - IPath path = (IPath) it.next(); - if(path.isPrefixOf(resourceFullPath)) { - covered = true; - } - } - if (covered) { - // if the resource is covered by a parent, remove it - iter.remove(); - } else { - // if the resource is a non-covered folder, add it to the covered paths - if (resource.getType() == IResource.FOLDER) { - coveredPaths.add(resource.getFullPath()); - } - } - } - return (IResource[]) sorted.toArray(new IResource[sorted.size()]); - } - - /** - * Override to ensure that the selected resources so not overlap. - * This method assumes that all actions are deep. - * - * @see org.eclipse.team.internal.ui.actions.TeamAction#getSelectedResources() - */ - protected IResource[] getSelectedResources() { - return getNonOverlapping(super.getSelectedResources()); - } - - protected void executeProviderAction(IProviderAction action, IResource[] resources, IProgressMonitor monitor) throws InvocationTargetException { - Hashtable table = getProviderMapping(resources); - Set keySet = table.keySet(); - monitor.beginTask(null, keySet.size() * 1000); - Iterator iterator = keySet.iterator(); - - while (iterator.hasNext()) { - IProgressMonitor subMonitor = new SubProgressMonitor(monitor, 1000); - CVSTeamProvider provider = (CVSTeamProvider)iterator.next(); - List list = (List)table.get(provider); - IResource[] providerResources = (IResource[])list.toArray(new IResource[list.size()]); - try { - addStatus(action.execute(provider, providerResources, subMonitor)); - } catch (CVSException e) { - throw new InvocationTargetException(e); - } - - } - } - - protected void executeProviderAction(IProviderAction action, IProgressMonitor monitor) throws InvocationTargetException { - executeProviderAction(action, getSelectedResources(), monitor); - } - - /** - * Given the current selection this method returns a text label that can - * be shown to the user that reflects the tags in the current selection. - * These can be used in the <b>Compare With</b> and <b>Replace With</b> actions. - */ - protected String calculateActionTagValue() { - try { - IResource[] resources = getSelectedResources(); - CVSTag commonTag = null; - boolean sameTagType = true; - boolean multipleSameNames = true; - - for (int i = 0; i < resources.length; i++) { - ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resources[i]); - CVSTag tag = null; - if(cvsResource.isFolder()) { - FolderSyncInfo info = ((ICVSFolder)cvsResource).getFolderSyncInfo(); - if(info != null) { - tag = info.getTag(); - } - if (tag != null && tag.getType() == CVSTag.BRANCH) { - tag = Util.getAccurateFolderTag(resources[i], tag); - } - } else { - tag = Util.getAccurateFileTag(cvsResource); - } - if(tag == null) { - tag = new CVSTag(); - } - if(commonTag == null) { - commonTag = tag; - } else if(!commonTag.equals(tag)) { - if(commonTag.getType() != tag.getType()) { - sameTagType = false; - } - if(!commonTag.getName().equals(tag.getName())) { - multipleSameNames = false; - } - } - } - - // set text to default - String actionText = Policy.bind("ReplaceWithLatestAction.multipleTags"); //$NON-NLS-1$ - if(commonTag != null) { - int tagType = commonTag.getType(); - String tagName = commonTag.getName(); - // multiple tag names but of the same type - if(sameTagType && !multipleSameNames) { - if(tagType == CVSTag.BRANCH) { - actionText = Policy.bind("ReplaceWithLatestAction.multipleBranches"); //$NON-NLS-1$ - } else { - actionText = Policy.bind("ReplaceWithLatestAction.multipleVersions"); //$NON-NLS-1$ - } - // same tag names and types - } else if(sameTagType && multipleSameNames) { - if(tagType == CVSTag.BRANCH) { - actionText = Policy.bind("ReplaceWithLatestAction.singleBranch", tagName); //$NON-NLS-1$ - } else if(tagType == CVSTag.VERSION){ - actionText = Policy.bind("ReplaceWithLatestAction.singleVersion", tagName); //$NON-NLS-1$ - } else if(tagType == CVSTag.HEAD) { - actionText = Policy.bind("ReplaceWithLatestAction.singleHEAD", tagName); //$NON-NLS-1$ - } - } - } - - return actionText; - } catch (CVSException e) { - // silently ignore - return Policy.bind("ReplaceWithLatestAction.multipleTags"); //$NON-NLS-1$ - } - } - - protected IResource[] checkOverwriteOfDirtyResources(IResource[] resources, IProgressMonitor monitor) throws CVSException, InterruptedException { - List dirtyResources = new ArrayList(); - IResource[] selectedResources = getSelectedResources(); - - try { - monitor = Policy.monitorFor(monitor); - monitor.beginTask(null, selectedResources.length * 100); - monitor.setTaskName(Policy.bind("ReplaceWithAction.calculatingDirtyResources")); //$NON-NLS-1$ - for (int i = 0; i < selectedResources.length; i++) { - IResource resource = selectedResources[i]; - ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource); - if(cvsResource.isModified(Policy.subMonitorFor(monitor, 100))) { - dirtyResources.add(resource); - } - } - } finally { - monitor.done(); - } - - PromptingDialog dialog = new PromptingDialog(getShell(), selectedResources, - getPromptCondition((IResource[]) dirtyResources.toArray(new IResource[dirtyResources.size()])), Policy.bind("ReplaceWithAction.confirmOverwrite"));//$NON-NLS-1$ - return dialog.promptForMultiple(); - } - - /** - * This is a helper for the CVS UI automated tests. It allows the tests to ignore prompting dialogs. - * @param resources - */ - protected IPromptCondition getPromptCondition(IResource[] resources) { - return getOverwriteLocalChangesPrompt(resources); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeEditorInput.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeEditorInput.java deleted file mode 100644 index 0e0e73135..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeEditorInput.java +++ /dev/null @@ -1,97 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.merge; - - -import org.eclipse.compare.structuremergeviewer.ICompareInput; -import org.eclipse.compare.structuremergeviewer.IDiffContainer; -import org.eclipse.compare.structuremergeviewer.IDiffElement; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.core.sync.IRemoteResource; -import org.eclipse.team.core.sync.IRemoteSyncElement; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.resources.CVSRemoteSyncElement; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.core.resources.RemoteFile; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ccvs.ui.sync.CVSSyncCompareInput; -import org.eclipse.team.internal.ui.sync.MergeResource; -import org.eclipse.team.internal.ui.sync.SyncView; -import org.eclipse.team.internal.ui.sync.TeamFile; - -public class MergeEditorInput extends CVSSyncCompareInput { - CVSTag start; - CVSTag end; - - public MergeEditorInput(IResource[] resources, CVSTag start, CVSTag end) { - // we have to perform content comparison since files in different branches - // may have different revisions but the same contents. Consider these files - // for merge purposes as equal. - super(resources, IRemoteSyncElement.GRANULARITY_CONTENTS); - this.start = start; - this.end = end; - } - public Viewer createDiffViewer(Composite parent) { - Viewer viewer = super.createDiffViewer(parent); - getViewer().syncModeChanged(SyncView.SYNC_MERGE); - return viewer; - } - protected IRemoteSyncElement[] createSyncElements(IProgressMonitor monitor) throws TeamException { - IResource[] resources = getResources(); - IRemoteSyncElement[] trees = new IRemoteSyncElement[resources.length]; - int work = 100 * resources.length; - monitor.beginTask(null, work); - try { - for (int i = 0; i < trees.length; i++) { - IResource resource = resources[i]; - IRemoteResource base = CVSWorkspaceRoot.getRemoteTree(resource, start, Policy.subMonitorFor(monitor, 50)); - IRemoteResource remote = CVSWorkspaceRoot.getRemoteTree(resource, end, Policy.subMonitorFor(monitor, 50)); - trees[i] = new CVSRemoteSyncElement(true /*three way*/, resource, base, remote); - } - } finally { - monitor.done(); - } - return trees; - } - public CVSTag getStartTag() { - return start; - } - public CVSTag getEndTag() { - return end; - } - public String getTitle() { - return Policy.bind("MergeEditorInput.title", start.getName(), end.getName()); //$NON-NLS-1$ - } - protected void contentsChanged(ICompareInput source) { - } - - /* - * Override collectResourceChanges to only determine the true sync state for incomming changes - */ - protected IDiffElement collectResourceChanges(IDiffContainer parent, IRemoteSyncElement tree, IProgressMonitor pm) throws TeamException { - if ( ! tree.isContainer()) { - CVSRemoteSyncElement cvsTree = (CVSRemoteSyncElement)tree; - RemoteFile base = (RemoteFile)cvsTree.getBase(); - RemoteFile remote = (RemoteFile)cvsTree.getRemote(); - if (base != null && remote != null && base.getRevision().equals(remote.getRevision())) { - // If the base and remote are the same, we don't have an incomming change - MergeResource mergeResource = new MergeResource(tree); - TeamFile file = new TeamFile(parent, mergeResource, IRemoteSyncElement.IN_SYNC, getShell()); - return file; - } - } - return super.collectResourceChanges(parent, tree, pm); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizard.java deleted file mode 100644 index dc5d532f7..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizard.java +++ /dev/null @@ -1,101 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.merge; - - -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.wizard.Wizard; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.core.subscribers.TeamProvider; -import org.eclipse.team.internal.ccvs.core.CVSMergeSubscriber; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.ui.TeamUI; -import org.eclipse.team.ui.sync.ISyncViewer; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.ui.PlatformUI; - -public class MergeWizard extends Wizard { - MergeWizardStartPage startPage; - MergeWizardEndPage endPage; - IResource[] resources; - - public void addPages() { - setNeedsProgressMonitor(true); - // when merging multiple resources, use the tags found on the first selected - // resource. This makes sense because you would typically merge resources that - // have a common context and are versioned and branched together. - IProject projectForTagRetrieval = resources[0].getProject(); - - setWindowTitle(Policy.bind("MergeWizard.title")); //$NON-NLS-1$ - ImageDescriptor mergeImage = CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_MERGE); - startPage = new MergeWizardStartPage("startPage", Policy.bind("MergeWizard.start"), mergeImage); //$NON-NLS-1$ //$NON-NLS-2$ - startPage.setProject(projectForTagRetrieval); - addPage(startPage); - endPage = new MergeWizardEndPage("endPage", Policy.bind("MergeWizard.end"), mergeImage, startPage); //$NON-NLS-1$ //$NON-NLS-2$ - endPage.setProject(projectForTagRetrieval); - addPage(endPage); - } - - /* - * @see IWizard#performFinish() - */ - public boolean performFinish() { - - IWorkbenchWindow wWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); - IWorkbenchPage activePage = null; - if(wWindow != null) { - activePage = wWindow.getActivePage(); - } - - CVSTag startTag = startPage.getTag(); - CVSTag endTag = endPage.getTag(); - - final CVSMergeSubscriber s = new CVSMergeSubscriber(resources, startTag, endTag); - try { - getContainer().run(false, true, new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - try { - s.refresh(resources, IResource.DEPTH_INFINITE, monitor); - } catch (TeamException e) { - s.cancel(); - throw new InvocationTargetException(e); - } - TeamProvider.registerSubscriber(s); - } - }); - ISyncViewer view = TeamUI.showSyncViewInActivePage(null /* no default page */); - view.setSelection(s, new IResource[0], view.getCurrentViewType()); - } catch (InvocationTargetException e) { - CVSUIPlugin.openError(getContainer().getShell(), null, null, e); - return false; - } catch (InterruptedException e) { - return false; - } - return true; - } - - /* - * Set the resources that should be merged. - */ - public void setResources(IResource[] resources) { - this.resources = resources; - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizardEndPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizardEndPage.java deleted file mode 100644 index e2580a745..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizardEndPage.java +++ /dev/null @@ -1,127 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.merge; - - -import org.eclipse.core.resources.IProject; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jface.viewers.ViewerSorter; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Tree; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ccvs.ui.wizards.CVSWizardPage; -import org.eclipse.ui.help.WorkbenchHelp; -import org.eclipse.ui.model.WorkbenchContentProvider; -import org.eclipse.ui.model.WorkbenchLabelProvider; - -public class MergeWizardEndPage extends CVSWizardPage { - IProject project; - TreeViewer tree; - CVSTag result; - ICVSRemoteFolder remote; - // for accessing the start tag - MergeWizardStartPage startPage; - - /** - * MergeWizardEndPage constructor. - * - * @param pageName the name of the page - * @param title the title of the page - * @param titleImage the image for the page - */ - public MergeWizardEndPage(String pageName, String title, ImageDescriptor titleImage, MergeWizardStartPage startPage) { - super(pageName, title, titleImage); - setDescription(Policy.bind("MergeWizardEndPage.description")); //$NON-NLS-1$ - this.startPage = startPage; - } - /* - * @see IDialogPage#createControl(Composite) - */ - public void createControl(Composite parent) { - Composite composite = createComposite(parent, 2); - // set F1 help - WorkbenchHelp.setHelp(composite, IHelpContextIds.MERGE_END_PAGE); - - tree = createTree(composite); - tree.setContentProvider(new WorkbenchContentProvider()); - tree.setLabelProvider(new WorkbenchLabelProvider()); - tree.setSorter(new ViewerSorter() { - public int compare(Viewer v, Object o1, Object o2) { - int result = super.compare(v, o1, o2); - if (o1 instanceof TagElement && o2 instanceof TagElement) { - return -result; - } - return result; - } - }); - tree.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - Object selected = ((IStructuredSelection)tree.getSelection()).getFirstElement(); - if (selected instanceof TagElement) { - result = ((TagElement)selected).getTag(); - if(!result.equals(startPage.getTag())) { - setPageComplete(true); - setMessage(null); - } else { - setMessage(Policy.bind("MergeWizardEndPage.duplicateTagSelected", result.getName()), WARNING); //$NON-NLS-1$ - setPageComplete(false); - } - } else { - setMessage(null); - result = null; - setPageComplete(false); - } - } - }); - setControl(composite); - tree.setInput(new ProjectElement(CVSWorkspaceRoot.getCVSFolderFor(project), ProjectElement.INCLUDE_ALL_TAGS)); - setPageComplete(false); - } - protected TreeViewer createTree(Composite parent) { - Tree tree = new Tree(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER | SWT.SINGLE); - tree.setLayoutData(new GridData(GridData.FILL_BOTH)); - return new TreeViewer(tree); - } - public void setProject(IProject project) { - this.project = project; - try { - this.remote = (ICVSRemoteFolder) CVSWorkspaceRoot.getRemoteResourceFor(project); - } catch (TeamException e) { - // To do - } - } - public CVSTag getTag() { - return result; - } - /** - * @see IDialogPage#setVisible(boolean) - */ - public void setVisible(boolean visible) { - super.setVisible(visible); - // refresh the tree because tags may have been added in the previous page - tree.refresh(); - if (visible) { - tree.getControl().setFocus(); - } - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizardStartPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizardStartPage.java deleted file mode 100644 index f2534ba10..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizardStartPage.java +++ /dev/null @@ -1,158 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.merge; - - -import org.eclipse.core.resources.IProject; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.viewers.ColumnWeightData; -import org.eclipse.jface.viewers.DoubleClickEvent; -import org.eclipse.jface.viewers.IDoubleClickListener; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.TableLayout; -import org.eclipse.jface.viewers.TableViewer; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jface.viewers.ViewerSorter; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Table; -import org.eclipse.swt.widgets.TableColumn; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ccvs.ui.TagConfigurationDialog; -import org.eclipse.team.internal.ccvs.ui.wizards.CVSWizardPage; -import org.eclipse.ui.help.WorkbenchHelp; -import org.eclipse.ui.model.WorkbenchContentProvider; -import org.eclipse.ui.model.WorkbenchLabelProvider; - -public class MergeWizardStartPage extends CVSWizardPage { - TableViewer table; - CVSTag result; - IProject project; - - private static final int TABLE_HEIGHT_HINT = 350; - private static final int TABLE_WIDTH_HINT = 100; - - /** - * MergeWizardStartPage constructor. - * - * @param pageName the name of the page - * @param title the title of the page - * @param titleImage the image for the page - */ - public MergeWizardStartPage(String pageName, String title, ImageDescriptor titleImage) { - super(pageName, title, titleImage); - setDescription(Policy.bind("MergeWizardStartPage.description")); //$NON-NLS-1$ - } - protected TableViewer createTable(Composite parent) { - Table table = new Table(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER | SWT.SINGLE | SWT.FULL_SELECTION); - GridData data = new GridData(GridData.FILL_BOTH); - data.heightHint = TABLE_HEIGHT_HINT; - data.widthHint = TABLE_WIDTH_HINT; - table.setLayoutData(data); - TableLayout layout = new TableLayout(); - layout.addColumnData(new ColumnWeightData(100, true)); - table.setLayout(layout); - TableColumn col = new TableColumn(table, SWT.NONE); - col.setResizable(true); - - return new TableViewer(table); - } - /* - * @see IDialogPage#createControl(Composite) - */ - public void createControl(Composite parent) { - Composite composite = createComposite(parent, 1); - // set F1 help - WorkbenchHelp.setHelp(composite, IHelpContextIds.MERGE_START_PAGE); - - table = createTable(composite); - table.setContentProvider(new WorkbenchContentProvider()); - table.setLabelProvider(new WorkbenchLabelProvider()); - table.setSorter(new ViewerSorter() { - public int compare(Viewer v, Object o1, Object o2) { - int result = super.compare(v, o1, o2); - if (o1 instanceof TagElement && o2 instanceof TagElement) { - return -result; - } - return result; - } - }); - table.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - IStructuredSelection selection = (IStructuredSelection)table.getSelection(); - if(!selection.isEmpty()) { - TagElement element = (TagElement)((IStructuredSelection)table.getSelection()).getFirstElement(); - if(element!=null) { - result = element.getTag(); - setPageComplete(true); - } - } - } - }); - table.addDoubleClickListener(new IDoubleClickListener() { - public void doubleClick(DoubleClickEvent event) { - getContainer().showPage(getNextPage()); - } - }); - - Runnable afterRefresh = new Runnable() { - public void run() { - getShell().getDisplay().syncExec(new Runnable() { - public void run() { - table.refresh(); - } - }); - } - }; - - Runnable afterConfigure = new Runnable() { - public void run() { - getShell().getDisplay().syncExec(new Runnable() { - public void run() { - initialize(); - } - }); - } - }; - - setControl(composite); - TagConfigurationDialog.createTagDefinitionButtons(getShell(), composite, new ICVSFolder[] {CVSWorkspaceRoot.getCVSFolderFor(project)}, - convertVerticalDLUsToPixels(IDialogConstants.BUTTON_HEIGHT), - convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH), - afterRefresh, afterConfigure); - initialize(); - setPageComplete(false); - } - private void initialize() { - ICVSFolder cvsProject = CVSWorkspaceRoot.getCVSFolderFor(project); - table.setInput(new TagRootElement(cvsProject, CVSTag.VERSION)); - } - public void setProject(IProject project) { - this.project = project; - } - public CVSTag getTag() { - return result; - } - public void setVisible(boolean visible) { - super.setVisible(visible); - if (visible) { - table.getControl().setFocus(); - } - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/OverrideUpdateMergeAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/OverrideUpdateMergeAction.java deleted file mode 100644 index 80c87f613..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/OverrideUpdateMergeAction.java +++ /dev/null @@ -1,67 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.merge; - - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.viewers.ISelectionProvider; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.resources.CVSRemoteSyncElement; -import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ccvs.ui.repo.RepositoryManager; -import org.eclipse.team.internal.ccvs.ui.sync.CVSSyncCompareInput; -import org.eclipse.team.internal.ui.sync.ITeamNode; -import org.eclipse.team.internal.ui.sync.SyncSet; - -public class OverrideUpdateMergeAction extends UpdateMergeAction { - public OverrideUpdateMergeAction(CVSSyncCompareInput model, ISelectionProvider sp, String label, Shell shell) { - super(model, sp, label, shell); - } - /* - * Override removeNonApplicableNodes because conflicting nodes should not be removed from this set. - */ - protected void removeNonApplicableNodes(SyncSet set, int syncMode) { - set.removeOutgoingNodes(); - set.removeIncomingNodes(); - } - protected boolean isEnabled(ITeamNode node) { - // The force update action is enabled only for conflicting and outgoing changes - SyncSet set = new SyncSet(new StructuredSelection(node)); - return (set.hasConflicts() && hasRealChanges(node, new int[] { ITeamNode.CONFLICTING })); - } - /** - * @see MergeAction#getHelpContextID() - */ - protected String getHelpContextID() { - return IHelpContextIds.MERGE_FORCED_UPDATE_ACTION; - } - - /** - * This method is the same as the inherited methd but it does not unmanage - * because merging should leave the files as outgoing deletions - * - * @see org.eclipse.team.internal.ccvs.ui.sync.UpdateSyncAction#runLocalDeletions(ITeamNode[], RepositoryManager, IProgressMonitor) - */ - protected void runLocalDeletions(ITeamNode[] nodes, RepositoryManager manager, IProgressMonitor monitor) throws TeamException, CoreException { - monitor.beginTask(null, nodes.length * 100); - for (int i = 0; i < nodes.length; i++) { - ITeamNode node = nodes[i]; - CVSRemoteSyncElement element = CVSSyncCompareInput.getSyncElementFrom(node); - deleteAndKeepHistory(element.getLocal(), Policy.subMonitorFor(monitor, 100)); - } - monitor.done(); - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/ProjectElement.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/ProjectElement.java deleted file mode 100644 index 7f25dbc83..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/ProjectElement.java +++ /dev/null @@ -1,114 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.merge; - - -import java.util.ArrayList; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jface.viewers.ViewerSorter; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.ui.model.IWorkbenchAdapter; - -public class ProjectElement implements IAdaptable, IWorkbenchAdapter { - ICVSFolder project; - TagRootElement branches; - TagRootElement versions; - int includeFlags; - - public static final int INCLUDE_HEAD_TAG = 1; - public static final int INCLUDE_BASE_TAG = 2; - public static final int INCLUDE_BRANCHES = 4; - public static final int INCLUDE_VERSIONS = 8; - public static final int INCLUDE_ALL_TAGS = INCLUDE_HEAD_TAG | INCLUDE_BASE_TAG | INCLUDE_BRANCHES | INCLUDE_VERSIONS; - - public static class ProjectElementSorter extends ViewerSorter { - /* - * The order in the diaog should be HEAD, Branches, Versions, BASE - */ - public int category(Object element) { - if (element instanceof TagElement) { - CVSTag tag = ((TagElement)element).getTag(); - if (tag == CVSTag.DEFAULT) return 1; - if (tag == CVSTag.BASE) return 4; - if (tag.getType() == CVSTag.BRANCH) return 2; - if (tag.getType() == CVSTag.VERSION) return 3; - } else if (element instanceof TagRootElement) { - return ((TagRootElement)element).getTypeOfTagRoot() == CVSTag.BRANCH ? 2 : 3; - } - return 0; - } - public int compare(Viewer viewer, Object e1, Object e2) { - int cat1 = category(e1); - int cat2 = category(e2); - if (cat1 != cat2) return cat1 - cat2; - // Sort version tags in reverse order - if (e1 instanceof TagElement && ((TagElement)e1).getTag().getType() == CVSTag.VERSION) { - return -1 * super.compare(viewer, e1, e2); - } - return super.compare(viewer, e1, e2); - } - } - - public ProjectElement(ICVSFolder project, int includeFlags) { - this.project = project; - this.includeFlags = includeFlags; - if (this.includeFlags == 0) this.includeFlags = INCLUDE_ALL_TAGS; - if ((includeFlags & INCLUDE_BRANCHES) > 0) { - branches = new TagRootElement(project, CVSTag.BRANCH); - } - if ((includeFlags & INCLUDE_VERSIONS) > 0) { - versions = new TagRootElement(project, CVSTag.VERSION); - } - } - - public Object[] getChildren(Object o) { - ArrayList children = new ArrayList(4); - if ((includeFlags & INCLUDE_HEAD_TAG) > 0) { - children.add(new TagElement(CVSTag.DEFAULT)); - } - if ((includeFlags & INCLUDE_BASE_TAG) > 0) { - children.add(new TagElement(CVSTag.BASE)); - } - if ((includeFlags & INCLUDE_BRANCHES) > 0) { - children.add(branches); - } - if ((includeFlags & INCLUDE_VERSIONS) > 0) { - children.add(versions); - } - return (Object[]) children.toArray(new Object[children.size()]); - } - public int getIncludeFlags() { - return includeFlags; - } - public TagRootElement getBranches() { - return branches; - } - public TagRootElement getVersions() { - return versions; - } - public Object getAdapter(Class adapter) { - if (adapter == IWorkbenchAdapter.class) return this; - return null; - } - public ImageDescriptor getImageDescriptor(Object object) { - return null; - } - public String getLabel(Object o) { - return null; - } - public Object getParent(Object o) { - return null; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/TagElement.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/TagElement.java deleted file mode 100644 index e6a652e2c..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/TagElement.java +++ /dev/null @@ -1,49 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.merge; - - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.ui.model.IWorkbenchAdapter; - -public class TagElement implements IWorkbenchAdapter, IAdaptable { - CVSTag tag; - public TagElement(CVSTag tag) { - this.tag = tag; - } - public Object[] getChildren(Object o) { - return new Object[0]; - } - public Object getAdapter(Class adapter) { - if (adapter == IWorkbenchAdapter.class) return this; - return null; - } - public ImageDescriptor getImageDescriptor(Object object) { - if (tag.getType() == CVSTag.BRANCH || tag == CVSTag.DEFAULT) { - return CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_TAG); - } else { - return CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_PROJECT_VERSION); - } - } - public String getLabel(Object o) { - return tag.getName(); - } - public Object getParent(Object o) { - return null; - } - public CVSTag getTag() { - return tag; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/TagRootElement.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/TagRootElement.java deleted file mode 100644 index 64b321c46..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/TagRootElement.java +++ /dev/null @@ -1,111 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.merge; - - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.ui.model.IWorkbenchAdapter; - -public class TagRootElement implements IWorkbenchAdapter, IAdaptable { - private ICVSFolder project; - private List cachedTags; - private int typeOfTagRoot; - - public TagRootElement(ICVSFolder project, int typeOfTagRoot) { - this.typeOfTagRoot = typeOfTagRoot; - this.project = project; - } - - public TagRootElement(ICVSFolder project, int typeOfTagRoot, CVSTag[] tags) { - this(project, typeOfTagRoot); - add(tags); - } - - public Object[] getChildren(Object o) { - CVSTag[] childTags = new CVSTag[0]; - if(cachedTags==null) { - if(typeOfTagRoot==CVSTag.BRANCH) { - childTags = CVSUIPlugin.getPlugin().getRepositoryManager().getKnownTags(project, CVSTag.BRANCH); - } else if(typeOfTagRoot==CVSTag.VERSION) { - childTags = CVSUIPlugin.getPlugin().getRepositoryManager().getKnownTags(project, CVSTag.VERSION); - } - } else { - childTags = getTags(); - } - TagElement[] result = new TagElement[childTags.length]; - for (int i = 0; i < childTags.length; i++) { - result[i] = new TagElement(childTags[i]); - } - return result; - } - public void removeAll() { - if(cachedTags!=null) { - cachedTags.clear(); - } - } - public void add(CVSTag[] tags) { - if(cachedTags==null) { - cachedTags = new ArrayList(tags.length); - } - cachedTags.addAll(Arrays.asList(tags)); - } - public void remove(CVSTag tag) { - if(cachedTags!=null) { - cachedTags.remove(tag); - } - } - public CVSTag[] getTags() { - if(cachedTags!=null) { - return (CVSTag[]) cachedTags.toArray(new CVSTag[cachedTags.size()]); - } else { - return new CVSTag[0]; - } - } - public Object getAdapter(Class adapter) { - if (adapter == IWorkbenchAdapter.class) return this; - return null; - } - public ImageDescriptor getImageDescriptor(Object object) { - if(typeOfTagRoot==CVSTag.BRANCH) { - return CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_BRANCHES_CATEGORY); - } else { - return CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_VERSIONS_CATEGORY); - } - } - public String getLabel(Object o) { - if(typeOfTagRoot==CVSTag.BRANCH) { - return Policy.bind("MergeWizardEndPage.branches"); //$NON-NLS-1$ - } else { - return Policy.bind("VersionsElement.versions"); //$NON-NLS-1$ - } - } - public Object getParent(Object o) { - return null; - } - /** - * Gets the typeOfTagRoot. - * @return Returns a int - */ - public int getTypeOfTagRoot() { - return typeOfTagRoot; - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/UpdateMergeAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/UpdateMergeAction.java deleted file mode 100644 index 80239455c..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/UpdateMergeAction.java +++ /dev/null @@ -1,157 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.merge; - - -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.SubProgressMonitor; -import org.eclipse.jface.viewers.ISelectionProvider; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.core.sync.IRemoteResource; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.client.Command; -import org.eclipse.team.internal.ccvs.core.client.Update; -import org.eclipse.team.internal.ccvs.core.resources.CVSRemoteSyncElement; -import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ccvs.ui.repo.RepositoryManager; -import org.eclipse.team.internal.ccvs.ui.sync.CVSSyncCompareInput; -import org.eclipse.team.internal.ccvs.ui.sync.UpdateSyncAction; -import org.eclipse.team.internal.ui.sync.ITeamNode; - -/* - * To be done: - * 1. add another action that allows a force merge merging since we can't tell the manual vs automatic conflicts when building the sync tree. - * 2. fix progress monitoring - */ -public class UpdateMergeAction extends UpdateSyncAction { - public UpdateMergeAction(CVSSyncCompareInput model, ISelectionProvider sp, String label, Shell shell) { - super(model, sp, label, shell); - } - - protected void runUpdateDeletions(ITeamNode[] nodes, RepositoryManager manager, IProgressMonitor monitor) throws TeamException { - runUpdateDeep(nodes, manager, monitor); - } - - /* - * @see UpdateSyncAction#runUpdateDeep(IProgressMonitor, List, RepositoryManager) - * incoming-change - * incoming-deletion - */ - protected void runUpdateDeep(ITeamNode[] nodes, RepositoryManager manager, IProgressMonitor monitor) throws TeamException { - ITeamNode[] incoming = removeOutgoing(nodes); - monitor.beginTask(null, 1000 * incoming.length); - try { - for (int i = 0; i < incoming.length; i++) { - CVSRemoteSyncElement element = CVSSyncCompareInput.getSyncElementFrom(incoming[i]); - if(element!=null) { - makeRemoteLocal(element, new SubProgressMonitor(monitor, 1000)); - } - } - } finally { - monitor.done(); - } - } - - /* - * @see UpdateSyncAction#runUpdateIgnoreLocalShallow(IProgressMonitor, List, RepositoryManager) - * incoming-addition - * incoming-conflict (no-merge) - */ - protected void runUpdateIgnoreLocalShallow(ITeamNode[] nodes, RepositoryManager manager, IProgressMonitor monitor) throws TeamException { - runUpdateDeep(nodes, manager, monitor); - } - - /* - * @see UpdateSyncAction#runUpdateShallow(ITeamNode[], RepositoryManager, IProgressMonitor) - * incoming-conflict (auto-mergeable) - */ - protected void runUpdateShallow(ITeamNode[] nodes, RepositoryManager manager, IProgressMonitor monitor) throws TeamException { - mergeWithLocal(nodes, manager, false, monitor); - } - - protected void mergeWithLocal(ITeamNode[] nodes, RepositoryManager manager, boolean createBackup, IProgressMonitor monitor) throws TeamException { - CVSTag startTag = ((MergeEditorInput)getDiffModel()).getStartTag(); - CVSTag endTag = ((MergeEditorInput)getDiffModel()).getEndTag(); - - Command.LocalOption[] options = new Command.LocalOption[] { - Command.DO_NOT_RECURSE, - Update.makeArgumentOption(Update.JOIN, startTag.getName()), - Update.makeArgumentOption(Update.JOIN, endTag.getName()) }; - - // run a join update using the start and end tags and the join points - manager.update(getIResourcesFrom(nodes), options, createBackup, monitor); - } - - private ITeamNode[] removeOutgoing(ITeamNode[] nodes) { - // no filter done yet - return nodes; - } - - /* - * If called on a new folder, the folder will become an outgoing addition. - */ - private void makeRemoteLocal(CVSRemoteSyncElement element, IProgressMonitor monitor) throws CVSException { - IRemoteResource remote = element.getRemote(); - final IResource local = element.getLocal(); - try { - if(remote==null) { - local.delete(false, monitor); - } else { - if(remote.isContainer()) { - if(!local.exists()) { - ((IFolder)local).create(false /*don't force*/, true /*local*/, monitor); - } - } else { - monitor.beginTask(null, 200); - try { - IFile localFile = (IFile)local; - if(local.exists()) { - localFile.setContents(remote.getContents(Policy.subMonitorFor(monitor, 100)), false /*don't force*/, true /*keep history*/, Policy.subMonitorFor(monitor, 100)); - } else { - if (!localFile.getParent().exists()) { - ensureParentExists(localFile); - } - localFile.create(remote.getContents(Policy.subMonitorFor(monitor, 100)), false /*don't force*/, Policy.subMonitorFor(monitor, 100)); - } - } finally { - monitor.done(); - } - } - } - } catch(CoreException e) { - throw new CVSException(Policy.bind("UpdateMergeActionProblems_merging_remote_resources_into_workspace_1"), e); //$NON-NLS-1$ - } - } - - private void ensureParentExists(IResource resource) throws CoreException { - IContainer parent = resource.getParent(); - if (!parent.exists()) { - ensureParentExists(parent); - IFolder folder = (IFolder)parent; - folder.create(false, true, null); - } - } - /** - * @see MergeAction#getHelpContextID() - */ - protected String getHelpContextID() { - return IHelpContextIds.MERGE_UPDATE_ACTION; - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/UpdateWithForcedJoinAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/UpdateWithForcedJoinAction.java deleted file mode 100644 index 3f8777a8d..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/UpdateWithForcedJoinAction.java +++ /dev/null @@ -1,96 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.merge; - - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.viewers.ISelectionProvider; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.core.sync.IRemoteSyncElement; -import org.eclipse.team.internal.ccvs.core.util.Assert; -import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.repo.RepositoryManager; -import org.eclipse.team.internal.ccvs.ui.sync.CVSSyncCompareInput; -import org.eclipse.team.internal.ui.sync.ITeamNode; -import org.eclipse.team.internal.ui.sync.SyncSet; - -/* - * Used only in the merge editor. This action allows the user to select a single conflict and use - * the cvs update -j command to merge the changes. This is required because when building the - * sync tree for a merge the cvs command 'cvs -n update -j -j' does not tell us which files - * can be auto-merged. This action then allows the user to run the merge without having to - * individually select each difference and use the 'copy right to left' buttons. - */ -public class UpdateWithForcedJoinAction extends UpdateMergeAction { - public UpdateWithForcedJoinAction(CVSSyncCompareInput model, ISelectionProvider sp, String label, Shell shell) { - super(model, sp, label, shell); - } - - /* - * @see UpdateSyncAction#runUpdateDeep(ITeamNode[], RepositoryManager, IProgressMonitor) - */ - protected void runUpdateDeep(ITeamNode[] nodes, RepositoryManager manager, IProgressMonitor monitor) throws TeamException { - // cannot be called from this action - Assert.isTrue(false); - } - - /* - * @see UpdateSyncAction#runUpdateIgnoreLocalShallow(ITeamNode[], RepositoryManager, IProgressMonitor) - */ - protected void runUpdateIgnoreLocalShallow(ITeamNode[] nodes, RepositoryManager manager, IProgressMonitor monitor) throws TeamException { - // force an update -j -j to be called on the conflict - mergeWithLocal(nodes, manager, true, monitor); - } - - /* - * @see UpdateSyncAction#runUpdateShallow(ITeamNode[], RepositoryManager, IProgressMonitor) - */ - protected void runUpdateShallow(ITeamNode[] nodes, RepositoryManager manager, IProgressMonitor monitor) throws TeamException { - // cannot be called from this action - Assert.isTrue(false); - } - - /* - * @see MergeAction#isEnabled(ITeamNode) - */ - protected boolean isEnabled(ITeamNode node) { - int kind = node.getKind(); - if ((node.getChangeDirection() == IRemoteSyncElement.CONFLICTING) && - (kind & IRemoteSyncElement.AUTOMERGE_CONFLICT) == 0) { - return true; - } else { - return false; - } - } - /* - * @see UpdateSyncAction#promptForConflicts() - */ - protected boolean promptForConflicts() { - // don't prompt for overriding conflicts, because this action is simply merging and creating a backup copy of the original file. - return true; - } - - /* - * Override removeNonApplicableNodes because conflicting nodes should not be removed from this set. - */ - protected void removeNonApplicableNodes(SyncSet set, int syncMode) { - set.removeOutgoingNodes(); - set.removeIncomingNodes(); - } - /** - * @see MergeAction#getHelpContextID() - */ - protected String getHelpContextID() { - return IHelpContextIds.MERGE_UPDATE_WITH_JOIN_ACTION; - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties deleted file mode 100644 index 0baccc250..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties +++ /dev/null @@ -1,1009 +0,0 @@ -############################################################################### -# Copyright (c) 2000, 2003 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Common Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/cpl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -details=Press the details button for more information. -simpleInternal=Internal error -internal=An internal error has occurred, consult the error log for details. -yes=Yes -no=No -information=Server Information -exception=Server Exception -confirmOverwriteTitle=Confirm Overwrite Project -confirmOverwrite=The project already exists in the workspace. Its contents will be overwritten. -question=Question -localChanges=You have local changes which you are about to overwrite. Do you wish to continue? -error=Error -cvs=CVS -notAvailable=Not Available -buildError=A build error occurred after the CVS operation completed. -ok=OK -separator=/ - -nameAndRevision={0} {1} -currentRevision=*{0} - -AddAction.addFailed=Error occurred during Add -AddAction.adding=Adding... -AddAction.addIgnoredTitle=Add Ignored Resource? -AddAction.addIgnoredQuestion=You have explicitly asked to version control one or more resources that otherwise would have been ignored. Continue? - -AddToVersionControlDialog.title=Add to CVS Version Control -AddToVersionControlDialog.thereIsAnUnaddedResource=There is {0} resource that is not under CVS version control. Do you want to add it? -AddToVersionControlDialog.thereAreUnaddedResources=There are {0} resources that are not under CVS version control. Do you want to add them? - -AddToWorkspaceAction.checkoutFailed=Problems encountered performing checkout -AddToWorkspaceAction.thisResourceExists=The resource ''{0}'' already exists in the workspace and will be deleted. Proceed? -AddToWorkspaceAction.thisExternalFileExists=The folder ''{0}'' exists in the local file system and will be deleted. Proceed? -AddToWorkspaceAction.confirmOverwrite=Confirm Overwrite -CheckoutAction.overlappingModuleExpansions=You have attempted to check out multiple remote modules that expand to the same local resource ''{0}''. - -AutoDefineTagsAction.defineTags = Auto-discover tags - -AvoidableMessageDialog.dontShowAgain=Don't show this again - -BranchWizard.title=Create a new CVS Branch -BranchWizard.errorBranching=Error Branching Resources -BranchWizardPage.pageDescription=Creates a new branch and a starting point version. -BranchWizardPage.pageDescriptionVersion=Creates a new branch based on the version in the workspace. -BranchWizardPage.specifyVersion=The version will provide a starting point for merging the branch back to the source branch. -BranchWizardPage.branchName=Branch Name: -BranchWizardPage.versionName=Version Name: -BranchWizardPage.startWorking=Start working in the branch -BranchWizardPage.versionPrefix=Root_ -BranchWizard.versionNameWarning=Version name: {0} -BranchWizard.branchNameWarning=Branch name: {0} -BranchWizard.branchAndVersionMustBeDifferent=The branch name and version name must be different. -BranchWizard.branchNameAlreadyExists=Branch name already exists. -BranchWizard.versionNameAlreadyExists=Version name already exists. -BranchWizardPage.existingVersionsAndBranches=Existing Versions and Branches: - -ConsolePreferencePage.consoleColorSettings=Console text color settings. -ConsolePreferencePage.commandColor=Command &Line: -ConsolePreferencePage.messageColor=&Message: -ConsolePreferencePage.errorColor=E&rror: -ConsolePreferencePage.font=Console font setting: - -CVSAction.errorTitle=Errors occurred -CVSAction.warningTitle=Warnings occurred -CVSAction.multipleProblemsMessage=Multiple problems occurred: -CVSAction.mixingTagsTitle=Confirm Mixing Tags -CVSAction.mixingTags=You are mixing tags within a project. Beware that synchronization uses the tag information associated with each resource to determine the remote resource with which the local resource is compared. \n\nThis means that the part(s) of your project that you are replacing with another tag will be synchronized with the tag ''{0}'' while other resources in the project will be synchronized with another tag. \n\nDo you wish to continue? - -CVSAnnotateView.showFileAnnotation=CVS Annotate {0} -CVSAnnotateView.viewInstructions=This view shows annotations for a file in CVS. Select a file and then choose \"Team->Show Annotation\" from the context menu. - -CVSCatchupReleaseViewer.commit=&Commit... -CVSCatchupReleaseViewer.update=&Update from Repository -CVSCatchupReleaseViewer.forceCommit=Override and Co&mmit... -CVSCatchupReleaseViewer.forceUpdate=Override and U&pdate -CVSCatchupReleaseViewer.ignore=A&dd to .cvsignore -CVSCatchupReleaseViewer.mergeUpdate=&Merge Changes into Local Copy -CVSCatchupReleaseViewer.commonFile=Common file: {0} -CVSCatchupReleaseViewer.commonFileRevision=Common file: {0} {1} -CVSCatchupReleaseViewer.noCommonFile=No common file -CVSCatchupReleaseViewer.noRepositoryFile=No repository file -CVSCatchupReleaseViewer.repositoryFile=Repository file: {0} -CVSCatchupReleaseViewer.repositoryFileRevision=Repository file: {0} {1} [{2}] -CVSCatchupReleaseViewer.workspaceFile=Workspace file: {0} -CVSCatchupReleaseViewer.showInHistory=Show in &Resource History -CVSCatchupReleaseViewer.fileDecoration={0} ({1}) -CVSCatchupReleaseViewer.folderDecoration={0} {1} -CVSCatchupReleaseViewer.confirmMerge=Mark as Mer&ged -CVSCatchupReleaseViewer.addAction=&Add to Version Control -CVSCatchupReleaseViewer.labelWithSyncKind={0} {1} - -CVSCompareEditorInput.branchLabel=<branch-{0}> -CVSCompareEditorInput.headLabel=<HEAD> -CVSCompareEditorInput.comparing=Comparing... -CVSCompareEditorInput.different=Cannot compare resources of different kind. -CVSCompareEditorInput.inBranch={0} in {1} -CVSCompareEditorInput.inHead={0} in HEAD -CVSCompareEditorInput.repository=Repository: {0} {1} -CVSCompareEditorInput.titleAncestor=Compare {0} {1}-{2} and {3} -CVSCompareEditorInput.titleNoAncestor=Compare {0} {1} and {2} -CVSCompareEditorInput.titleNoAncestorDifferent=Compare {0} {1} and {2} {3} -CVSCompareEditorInput.workspace=Workspace: {0} -CVSCompareEditorInput.workspaceLabel=<workspace> -CVSCompareEditorInput.noWorkspaceFile=No workspace file -CVSCompareEditorInput.noRepositoryFile=No repository file - -CVSCompareRevisionsInput.addToWorkspace=Get -CVSCompareRevisionsInput.compareResourceAndVersions=Compare {0} <workspace> and versions -CVSCompareRevisionsInput.errorReplacingTitle=Unable to Replace -CVSCompareRevisionsInput.errorReplacingMessage=Resource(s) could not be loaded. A communication error may have occurred, or \ - the resource(s) may not exist on the server, or you may \ - not have permission to access them. -CVSCompareRevisionsInput.repository=Repository file: {0} -CVSCompareRevisionsInput.structureCompare=Structure Compare -CVSCompareRevisionsInput.workspace=Workspace file: {0} -CVSCompareRevisionsInput.truncate={0}[...] - -CVSDecorator.projectDecoration={0} [{1}] -CVSDecorator.projectDecorationWithTag={0} [{1} {2}] -CVSDecorator.fileDecorationWithTag={0} [{1}:{2}] -CVSDecorator.fileDecorationNoTag={0} [{1}] -CVSDecorator.folderDecoration={0} [{1}] - -CVSDecoratorPreferencesPage.description=CVS Decorator settings: -CVSDecoratorPreferencesPage.iconDescription=Choose which CVS resource states should be indicated using an icon decorator: -CVSDecoratorPreferencesPage.generalDescription=Set general properties of CVS decorators: -CVSDecoratorPreferencesPage.generalTabFolder=&General -CVSDecoratorPreferencesPage.newResources=Indicate is &new resource -CVSDecoratorPreferencesPage.synchronizeTabFolder=S&ynchronize View -CVSDecoratorPreferencesPage.synchronizeDescription=Set the properties of CVS decorators for the Synchronize view: -CVSDecoratorPreferencesPage.showSyncInfoInLabel=Show all synchronization information in a resource's text label - -CVSFilePropertiesPage.ignored=The file is ignored by CVS. -CVSFilePropertiesPage.notManaged=The file is not managed by CVS. -CVSFilePropertiesPage.isAdded=This file has been added to CVS control but has not been committed -CVSFilePropertiesPage.baseRevision=Base revision: -CVSFilePropertiesPage.baseTimestamp=Base timestamp: -CVSFilePropertiesPage.dirty=Dirty: -CVSFilePropertiesPage.modified=Modified: -CVSFilePropertiesPage.keywordMode=Keyword mode: -CVSFilePropertiesPage.tag=Tag: -CVSFilePropertiesPage.none=HEAD -CVSFilePropertiesPage.version={0} (Version) -CVSFilePropertiesPage.branch={0} (Branch) -CVSFilePropertiesPage.date={0} (Date) -CVSFilePropertiesPage.error=An error occurred while creating this page. -CVSFilePropertiesPage.permissions=Permissions: -CVSFilePropertiesPage.notAvailable=Not Available - -CVSFolderPropertiesPage.ignored=The folder is ignored by CVS. -CVSFolderPropertiesPage.notManaged=The folder is not managed by CVS. -CVSFolderPropertiesPage.notCVSFolder=This folder has lost its CVS sharing information. -CVSFolderPropertiesPage.root=Repository root: -CVSFolderPropertiesPage.repository=Repository path: -CVSFolderPropertiesPage.static=Static: -CVSFolderPropertiesPage.disconnect=&Disconnect... -CVSFolderPropertiesPage.disconnectTitle=Disconnect folder? -CVSFolderPropertiesPage.disconnectQuestion=Disconnecting the folder from CVS control will delete the CVS synchronization information for the folder. Are you sure you want to disconnect? - -CVSLocalCompareEditorInput.title=CVS Compare [{0}] - -CVSOperationCancelledException.operationCancelled=Operation Cancelled - -CVSPropertiesPage.connectionType=&Connection type: -CVSPropertiesPage.user=&User: -CVSPropertiesPage.password=&Password: -CVSPropertiesPage.host=Host: -CVSPropertiesPage.port=Port: -CVSPropertiesPage.path=Repository path: -CVSPropertiesPage.module=Module: -CVSPropertiesPage.defaultPort=Default -CVSPropertiesPage.tag=Tag: -CVSPropertiesPage.update=Change &Tag... -CVSPropertiesPage.virtualModule=<no corresponding remote folder> - -CVSPreferencePage.description=General CVS settings: -CVSPreferencePage.pruneEmptyDirectories=&Prune empty directories -CVSPreferencePage.timeoutValue=&Communication timeout (in seconds): -CVSPreferencePage.quietness=&Quietness level: -CVSPreferencePage.notquiet=Verbose -CVSPreferencePage.somewhatquiet=Somewhat quiet -CVSPreferencePage.reallyquiet=Very quiet -CVSPreferencePage.silentWarningTitle="Very Quiet" mode is dangerous -CVSPreferencePage.silentWarningMessage= In "Very Quiet" mode, some cvs servers may not communicate important information about errors that have occurred. You may want to consider using "Somewhat quiet" mode instead. -CVSPreferencePage.considerContentsInCompare=Con&sider file contents in comparisons -CVSPreferencePage.showAddRemoveMarkers=Show deleted file &markers -CVSPreferencePage.replaceUnmanaged=&Delete unmanaged resources on replace -CVSPreferencePage.defaultTextKSubst=Default &keyword substitution: -CVSPreferencePage.compressionLevel=Compression &level: -CVSPreferencePage.level0=0 (disabled) -CVSPreferencePage.level1=1 (lowest compression) -CVSPreferencePage.level2=2 -CVSPreferencePage.level3=3 -CVSPreferencePage.level4=4 -CVSPreferencePage.level5=5 -CVSPreferencePage.level6=6 -CVSPreferencePage.level7=7 -CVSPreferencePage.level8=8 -CVSPreferencePage.level9=9 (highest compression) -CVSPreferencePage.Save_dirty_editors_before_CVS_operations_1=Save dirty editors before CVS operations -CVSPreferencePage.&Never_2=&Never -CVSPreferencePage.&Prompt_3=P&rompt -CVSPreferencePage.Auto-&save_4=&Auto-save -CVSPreferencePage.repositoriesAreBinary=&Treat all new files as binary -CVSPreferencePage.determineVersionEnabled=&Validate server version compatibility on first connection -CVSPreferencePage.confirmMoveTag=Confirm &move tag on tag operation - -CVSRemoteFilePropertySource.name=Name -CVSRemoteFilePropertySource.revision=Revision -CVSRemoteFilePropertySource.date=Date -CVSRemoteFilePropertySource.author=Author -CVSRemoteFilePropertySource.comment=Comment -CVSRemoteFilePropertySource.tag=Tag - -CVSRemoteFolderPropertySource.name=Name -CVSRemoteFolderPropertySource.tag=Tag -CVSRemoteFolderPropertySource.none=(none) - -CVSRepositoryLocationPropertySource.default=Default -CVSRepositoryLocationPropertySource.host=Host -CVSRepositoryLocationPropertySource.user=User -CVSRepositoryLocationPropertySource.port=Port -CVSRepositoryLocationPropertySource.root=Root -CVSRepositoryLocationPropertySource.method=Connection Method - -CVSSyncCompareInput.confirmMergeMessageTitle=Information -CVSSyncCompareInput.confirmMergeMessage=Your changes have been saved. When you are finished, \ - select 'Mark as Merged' to make this file an outgoing change. -CVSSyncCompareInput.projectDeleted=Project ''{0}'' has been deleted locally and cannot be synchronized. -CVSSyncCompareInput.filteringOutgoingChanges=Accumulating resources with outgoing changes - -CVSSyncSet.conflicts={0} conflicts, -CVSSyncSet.incomings={0} incoming change(s), -CVSSyncSet.noConflicts=No conflicts, -CVSSyncSet.noIncomings=no incoming changes, -CVSSyncSet.noOutgoings=no outgoing changes, -CVSSyncSet.outgoings={0} outgoing change(s), -CVSSyncSet.noNew=no new resources. -CVSSyncSet.new={0} new resource(s). - -CVSUIPlugin.refreshTitle=Refresh Resource? -CVSUIPlugin.refreshQuestion={0} Would you like to refresh resource ''{1}''? -CVSUIPlugin.refreshMultipleQuestion={0} Would you like to refresh the selected resources? - -CVSAction.disabledTitle=Information -CVSAction.disabledMessage=The chosen operation is not enabled. -CVSAction.refreshTitle=Refresh Project? -CVSAction.refreshQuestion={0} Would you like to refresh project ''{1}''? -CVSAction.refreshMultipleQuestion={0} Would you like to refresh the projects of the selected resources? - -CommitAction.commitFailed=Problems encountered performing commit - -CommitSyncAction.questionRelease=You have changes that conflict with the server. Release those changes? -CommitSyncAction.titleRelease=Release Conflicts? -CommitSyncAction.releaseAll=Release all changes, overriding any conflicting changes on the server. -CommitSyncAction.releasePart=Only release the changes that don't conflict with changes on the server. -CommitSyncAction.cancelRelease=Cancel the release operation. -CommitSyncAction.errorCommitting=An error occurred while committing changes. - -CompareWithRemoteAction.compare=Error Comparing with Latest -CompareWithRemoteAction.noRemote=No Remote Resource -CompareWithRemoteAction.noRemoteLong=The selected resource has no remote resource to compare with. -CompareWithRemoteAction.fetching=Comparing with latest from repository... - -CompareWithRevisionAction.compare=Error Comparing with Revision -CompareWithRevisionAction.noRevisions=No Revisions -CompareWithRevisionAction.noRevisionsLong=The selected resource has no revisions to compare with. -CompareWithRevisionAction.fetching=Fetching revisions from repository... - -CompareWithTagAction.message=Compare with Branch or Version -CompareWithTagAction.replace=Error Comparing With Branch or Version -CompareWithTagAction.noRemote=No Remote Resource -CompareWithTagAction.noRemoteLong=The selected tag has no remote resource to compare with. -CompareWithTagAction.fetching=Fetching resources with tag {0}... - -CompareEditorInput.fileProgress=Comparing CVS file: {0} - -ConfigurationWizardAutoconnectPage.description=Your project already has CVS/ directories. It was probably previously shared, or checked out using another tool. It will be automatically shared using the following information. -ConfigurationWizardAutoconnectPage.user=User: -ConfigurationWizardAutoconnectPage.host=Host: -ConfigurationWizardAutoconnectPage.port=Port: -ConfigurationWizardAutoconnectPage.default=Default -ConfigurationWizardAutoconnectPage.connectionType=Connection type: -ConfigurationWizardAutoconnectPage.repositoryPath=Repository path: -ConfigurationWizardAutoconnectPage.module=Module: -ConfigurationWizardAutoconnectPage.validate=&Validate Connection on Finish -ConfigurationWizardAutoconnectPage.noSyncInfo=Could not get folder information -ConfigurationWizardAutoconnectPage.noCVSDirectory=Could not find CVS/ directory - -RepositorySelectionPage.description=This wizard will help you to share your files with the CVS repository for the first time. Your project will automatically be imported into the CVS repository, and the Synchronize view will open to allow you to commit your resources. -RepositorySelectionPage.useExisting=&Use existing repository location: -RepositorySelectionPage.useNew=&Create a new repository location - -ConfigurationWizardMainPage.connection=&Connection type: -ConfigurationWizardMainPage.userName=&User: -ConfigurationWizardMainPage.password=&Password: -ConfigurationWizardMainPage.host=&Host: -ConfigurationWizardMainPage.useDefaultPort=Use &Default Port -ConfigurationWizardMainPage.usePort=Use Por&t: -ConfigurationWizardMainPage.repositoryPath=&Repository path: -ConfigurationWizardMainPage.invalidUserName=Invalid User Name -ConfigurationWizardMainPage.invalidHostName=Invalid Host Name -ConfigurationWizardMainPage.invalidPort=Invalid Port -ConfigurationWizardMainPage.invalidPathWithSpaces=The repository path cannot have segments with leading or trailing spaces -ConfigurationWizardMainPage.invalidPathWithSlashes=The repository path cannot contain a double slash (//) -ConfigurationWizardMainPage.useNTFormat=Use NT path names for specifying CVSNT repository paths (e.g. C:\\cvs\\root) - -Console.copy=Copy -Console.selectAll=Select All -Console.clearOutput=Clear Output -Console.resultServerError={0} {1} -Console.resultWarnings={0} {1} -Console.resultException=failed due to an internal error {0} -Console.resultAborted=operation canceled {0} -Console.resultOk=ok {0} -Console.resultTimeFormat='(took 'm:ss.SSS')' -Console.couldNotFormatTime=An error occurred formatting the output time for the CVS console. -Console.preExecutionDelimiter=*** -Console.postExecutionDelimiter=*** -Console.info=Info: {0} -Console.warning=Warning: {0} -Console.error=Error: {0} - -AddToBranchAction.enterTag=Enter Branch Tag -AddToBranchAction.enterTagLong=Enter the name of the branch: - -DiffAction.diff=Diff - -FixTypeAction.fix=Fix Types - -GenerateCVSDiff.title=Create Patch -GenerateCVSDiff.pageTitle=Run and save CVS diff results in a file -GenerateCVSDiff.pageDescription=The results of the CVS diff command can be used as an input file for the Apply Patch wizard. -GenerateCVSDiff.overwriteTitle=Confirm Overwrite -GenerateCVSDiff.overwriteMsg=A file with that name already exists. Overwrite? -GenerateCVSDiff.error=Error running the CVS diff command -GenerateCVSDiff.working=Running CVS diff... -GenerateCVSDiff.noDiffsFoundMsg=No differences found. -GenerateCVSDiff.noDiffsFoundTitle=CVS diff - -GetSyncAction.questionCatchup=You have local changes which you are about to overwrite. Should the conflicting changes be added? -GetSyncAction.titleCatchup=Catch up Over Conflicts? -GetSyncAction.catchupAll=Catch up to all incoming changes, overriding any conflicting local changes. -GetSyncAction.catchupPart=Only catch up to the changes that don't conflict with local changes. -GetSyncAction.cancelCatchup=Cancel the catch up operation. -UpdateSyncAction.errorUpdating=An error occurred while updating changes. - -HistoryFilterDialog.title = Filter Resource History -HistoryFilterDialog.showMatching = Show entries matching: -HistoryFilterDialog.matchingAny = a&ny of the provided criteria -HistoryFilterDialog.matchingAll = a&ll of the provided criteria -HistoryFilterDialog.author = &Author: -HistoryFilterDialog.comment = &Comment containing: -HistoryFilterDialog.fromDate = &From date (M/D/Y) : -HistoryFilterDialog.toDate = &To date (M/D/Y) : - -HistoryView.getAnnotateAction=Show &Annotation -HistoryView.getContentsAction=&Get Contents -HistoryView.getRevisionAction=Get Sticky &Revision -HistoryView.tagWithExistingAction=&Tag with Existing... -HistoryView.copy=&Copy -HistoryView.revision=Revision -HistoryView.tags=Tags -HistoryView.date=Date -HistoryView.author=Author -HistoryView.comment=Comment -HistoryView.refreshLabel=&Refresh View -HistoryView.refresh=Refresh View -HistoryView.selectAll=Select &All -HistoryView.showComment=Show Comment Viewer -HistoryView.showTags=Show Tag Viewer -HistoryView.title=CVS Resource History -HistoryView.titleWithArgument=CVS Resource History - {0} -HistoryView.overwriteTitle=Overwrite local changes? -HistoryView.overwriteMsg=You have local changes. Do you want to overwrite them? - -IgnoreAction.ignore=Error Ignoring Resource - -MergeAction.saveChangesTitle=Save Changes -MergeAction.saveChanges=You have unsaved changes that will be saved before the action is performed. - -MergeEditorInput.title=Merge {0} with {1} - -MergeWizardEndPage.branches=Branches -MergeWizardEndPage.description=This is the version or branch that contains the work you would like to merge. -MergeWizardEndPage.duplicateTagSelected=Cannot select {0} because it has already been selected as the start tag. - -MergeWizardStartPage.description=This is the version you created when you branched. - -MergeWizard.title=Merge -MergeWizard.start=Select the merge start point -MergeWizard.end=Select where you want to merge the changes from -MergeWizard.preparing=Preparing merge wizard -MergeWizard.preparingStart=Fetching tags for start page -MergeWizard.preparingEnd=Fetching tags for end page - -ModuleSelectionPage.moduleIsProject=Use project name as module name -ModuleSelectionPage.specifyModule=Use specified module name: - -MoveTagAction.errorMessage=Error Tagging -MoveTagAction.title=Tag with Existing Tag -MoveTagAction.message=&Select the tag to be moved: - -NewLocationWizard.title=Add CVS Repository -NewLocationWizard.heading=Add a new CVS Repository -NewLocationWizard.description=Add a new CVS Repository to the CVS Repositories view -NewLocationWizard.validationFailedText=Error validating location: "{0}"\n\nKeep location anyway? -NewLocationWizard.validationFailedTitle=Unable to Validate -NewLocationWizard.exception=Unable to create repository location - -OpenLogEntryAction.deletedTitle=Resource is Deleted -OpenLogEntryAction.deleted=The selected revision represents a deletion. It cannot be opened. - -ReleaseCommentDialog.title=Commit -ReleaseCommentDialog.choosePrevious=Choose a &previously entered comment: -ReleaseCommentDialog.enterComment=Edit the commit &comment: -ReleaseCommentDialog.unaddedResources=Checked resources will be &added to CVS version control. -ReleaseCommentDialog.selectAll=&Select All -ReleaseCommentDialog.deselectAll=D&eselect All -ReleaseCommentDialog.clearTextArea=&Reset Comment - -RemoteFolderElement.nameAndTag={0} {1} -RemoteFolderElement.fetchingRemoteChildren=Fetching remote CVS children for ''{0}''... - -RemoveRootAction.removeRoot=Error Discarding Location - -ReplaceWithTagAction.message=Replace with Branch or Version -ReplaceWithTagAction.replace=Error Replacing With Tag -ReplaceWithTagAction.replacing=Replacing with tag {0} -ReplaceWithTagAction.mixingTags=You are mixing tags within a project. This may cause confusion \ - when synchronizing with the repository. Synchronize uses the tag information associated with \ - each resource to determine the remote resource with which the local resource is compared. \ - For example, with version tags, the state of the tagged resources never change so you will \ - not see changes made to the resources in HEAD (or other branches). Do you wish to continue? - -ReplaceWithRemoteAction.replacing=Replacing -ReplaceWithRemoteAction.problemMessage=Error Replacing With Latest From Repository - -ReplaceWithAction.confirmOverwrite=Confirm Overwrite -ReplaceWithAction.localChanges={0} has local changes which you are about to overwrite. Do you wish to overwrite? -ReplaceWithAction.calculatingDirtyResources=Finding outgoing changes... - -ReplaceWithLatestAction.multipleTags=&Latest from Repository -ReplaceWithLatestAction.multipleVersions=&Versions from Repository -ReplaceWithLatestAction.multipleBranches=&Latest from Branches -ReplaceWithLatestAction.singleVersion=&Version {0} -ReplaceWithLatestAction.singleBranch=&Latest from Branch {0} -ReplaceWithLatestAction.singleHEAD=&Latest from {0} - -RepositoryDialog.getRepository=Select a repository -RepositoryDialog.description=Select a repository to connect your project to - -RepositoryManager.getting=Getting -RepositoryManager.committing=Committing -RepositoryManager.updating=Updating -RepositoryManager.deleting=Deleting -RepositoryManager.adding=Adding -RepositoryManager.rename=An IO Exception occurred while renaming the state file -RepositoryManager.save=An IO Exception occurred while saving the state file -RepositoryManager.ioException=An IO Exception occurred while reading the state file -RepositoryManager.parsingProblem=An error occurred parsing file ''{0}''. -RepositoryManager.fetchingRemoteFolders=Fetching remote CVS folders for ''{0}''... - -RepositoriesView.refresh=&Refresh View -RepositoriesView.refreshTooltip=Refresh View -RepositoriesView.new=&Repository Location... -RepositoriesView.newSubmenu=&New -RepositoriesView.newAnonCVS=&Anonymous Repository Location to dev.eclipse.org... -RepositoriesView.newWorkingSet=Select Working Set... -RepositoriesView.deselectWorkingSet=Deselect Working Set -RepositoriesView.editWorkingSet=Edit Active Working Set... -RepositoriesView.workingSetMenuItem={0} {1} -RepositoriesView.collapseAll=Collapse All -RepositoriesView.collapseAllTooltip=Collapse All -RepositoriesView.NItemsSelected={0} items selected -RepositoriesView.OneItemSelected=1 item selected -RepositoriesView.ResourceInRepository={0} in {1} -RepositoriesView.CannotGetRevision=Cannot get revision -RemoteViewPart.workingSetToolTip=Working Set: {0} - -ResourcePropertiesPage.status=Status -ResourcePropertiesPage.notManaged=Not managed by CVS -ResourcePropertiesPage.versioned=versioned -ResourcePropertiesPage.notVersioned=not versioned -ResourcePropertiesPage.state=State -ResourcePropertiesPage.checkedOut=Checked Out -ResourcePropertiesPage.checkedIn=Checked In -#ResourcePropertiesPage.baseRevision=Base Revision -#ResourcePropertiesPage.none=none -ResourcePropertiesPage.error=Error - -KSubstWizard.title=Set Keyword Substitution -KSubstWizard.working=Setting keyword substitution mode... -KSubstWizard.problemsMessage=Problems encountered setting keyword substitution -KSubstWizard.errorTitle=Errors Occurred -KSubstWizard.warningTitle=Warnings occurred - -KSubstWizardSharedFilesPage.pageTitle=Include versioned files -KSubstWizardSharedFilesPage.pageDescription=\ - Choose to include or exclude files that are already in the repository -KSubstWizardSharedFilesPage.contents=\ - Since the keyword substitution mode attribute is not version controlled, the \ - change will be reflected immediately on all branches and in all revisions of \ - any affected files that are already shared in the repository. You should inform \ - all developers that they must delete and check out fresh copies of the affected \ - files before committing new changes to the repository. You may also experience \ - side-effects working with earlier revisions of these files. -KSubstWizardSharedFilesPage.includeSharedFiles=&Include files that are already shared in the repository. -KSubstWizardSharedFilesPage.sharedFilesViewer.title=&The following files were selected and are already shared in the repository: - -KSubstWizardDirtyFilesPage.pageTitle=Include files with outgoing changes -KSubstWizardDirtyFilesPage.pageDescription=\ - Choose to include or exclude files with outgoing changes -KSubstWizardDirtyFilesPage.contents=\ - This operation may commit changes to files without first providing a chance to resolve \ - conflicts. -KSubstWizardDirtyFilesPage.includeDirtyFiles=&Include files that have outgoing changes. -KSubstWizardDirtyFilesPage.dirtyFilesViewer.title=&The following files were selected and have outgoing changes. - -KSubstWizardSelectionPage.pageTitle=Select Keyword Substitution Mode -KSubstWizardSelectionPage.pageDescription=\ - Choose the desired keyword substitution mode for the selected files. -KSubstWizardSelectionPage.automaticButton=&Automatic -KSubstWizardSelectionPage.automaticLabel=\ - Automatically chooses ''{0}'' or ''{1}'' \ - for each file according to the Team file extension preferences. -KSubstWizardSelectionPage.binaryButton=&Binary (-kb) -KSubstWizardSelectionPage.binaryLabel=\ - Binary files are stored in the repository without alteration.\n\ - CVS does not directly support conflict resolution for binary files. -KSubstWizardSelectionPage.textButton=A&SCII without keyword substitution (-ko) -KSubstWizardSelectionPage.textLabel=\ - End of lines are replaced with the appropriate convention for the client system.\n\ - CVS supports conflict resolution and differencing of ASCII files with single line granularity. -KSubstWizardSelectionPage.textWithSubstitutionsButton=ASCII with &keyword substitution -KSubstWizardSelectionPage.textWithSubstitutionsLabel=\ - End of lines are replaced with the appropriate convention for the client system.\n\ - ASCII files may contain keywords that are expanded by the CVS server during file transfers.\n\ - Please consult the CVS documentation for a description of the various supported keywords and modes. - -KSubstWizardCommitCommentPage.pageTitle=Enter Commit Comment -KSubstWizardCommitCommentPage.pageDescription=\ - Enter the commit comment to be used for the selected files when they are committed. - -KSubstWizardSummaryPage.pageTitle=Summary -KSubstWizardSummaryPage.pageDescription=\ - Summary of keyword substitution changes to be performed. -KSubstWizardSummaryPage.contents=\ - Click on \'Finish\' to change the keyword substitution mode of the checked files indicated below.\n\ - You can change the mode on a per file basis by clicking in the corresponding cell.\n\ - Note: Files that are not checked, or that already have the indicated mode will not be affected in any way. -KSubstWizardSummaryPage.showUnaffectedFiles=&Show files that already have the requested keyword substitution mode. -KSubstWizardSummaryPage.summaryViewer.title=&The following checked files will have their keyword substitution mode changed to the indicated value. -KSubstWizardSummaryPage.summaryViewer.fileHeader=File Location -KSubstWizardSummaryPage.summaryViewer.ksubstHeader=Keyword Substitution Mode - -SharingWizard.autoConnectTitle=Connect Project to Repository -SharingWizard.autoConnectOneOTitle=Connect Project from Eclipse 1.0 to Repository -SharingWizard.autoConnectTitleDescription=Project is already configured with CVS repository information. -SharingWizard.couldNotImport=Remote Project Exists -SharingWizard.couldNotImportLong=Module ''{0}'' already exists remotely. Would you like to synchronize your local project with the existing remote module? -SharingWizard.selectTagTitle=Select Tag -SharingWizard.selectTag=&Select the tag to synchronize with: -SharingWizard.description=Configure a Project to Use CVS -SharingWizard.importTitle=Share Project with CVS Repository -SharingWizard.importTitleDescription=Select an existing repository location or create a new location. -SharingWizard.title=Share Project -SharingWizard.heading=Configure a Project to Use CVS -SharingWizard.enterInformation=Enter Repository Location Information -SharingWizard.enterInformationDescription=Define the location and protocol required to connect with an existing CVS repository. -SharingWizard.enterModuleName=Enter Module Name -SharingWizard.enterModuleNameDescription=Select the name of the module in the CVS repository. -SharingWizard.readyToFinish=Ready to Share Project -SharingWizard.readyToFinishDescription=Select Finish to import the project into the CVS repository. -SharingWizard.validationFailedText={0}. Set project sharing anyway? -SharingWizard.validationFailedTitle=Unable to Validate - -SharingWizardFinishPage.message=The wizard has all the information necessary to share your project with the CVS repository. When you click \"Finish\", the wizard will import your project into the repository and open the Synchronize view to allow you to commit your resources. - -ShowHistoryAction.showHistory=Error occurred performing Show History -ShowHistoryAction.noHistory=No History Available -ShowHistoryAction.noHistoryLong=No resource history available for selected resources. - -SyncAction.sync=Synchronize - -TagAction.tagErrorTitle=Tagging Error -TagAction.tagWarningTitle=Tagging Warning -TagAction.tagProblemsMessage=Problems reported tagging the resource. -TagAction.tagProblemsMessageMultiple=Problems tagging the resources. {0} project(s) successfully tagged and {1} project(s) with errors. -TagAction.tagResources=Tag Resources -TagAction.enterTag=Please enter a version tag: -TagAction.moveTag=&Move tag if it already exists -TagAction.moveTagConfirmTitle=Confirm Move Existing Tag -TagAction.moveTagConfirmMessage=If the tag {0} is already used in this project, it will be moved to the selected revisions. Are you sure you want to perform the tag operation? -TagAction.uncommittedChangesTitle=Confirm Uncommitted Changes -TagAction.uncommittedChanges=You are tagging ''{0}'' that has uncommitted changes. These changes are not in the repository and will not be included in the version you are creating. Do you still want to tag this resource? -TagAction.tagAlreadyExists=Version tag already exists. -TagAction.existingVersions=Existing Versions: - -TagInRepositoryAction.tagProblemsMessage=Problems reported tagging the resource. -TagInRepositoryAction.tagProblemsMessageMultiple=Problems tagging the resources. {0} resource(s) successfully tagged and {1} resource(s) with errors. - -UpdateAction.update=Problems encountered performing update -UpdateAction.updating=Updating... - -UpdateWizard.title=Update -UpdateWizard.updatePage=Update - -UpdateWizardPage.description=&Select a tag to update the project sharing to: -UpdateWizardPage.overwrite=&Overwrite local changes - -UserValidationDialog.required=Password Required -UserValidationDialog.labelUser=Enter a user name and password for the following repository: {0} -UserValidationDialog.labelPassword=Enter a password for {0} in the following repository: {1} -UserValidationDialog.password=Password: -UserValidationDialog.user=User name: - -VersionsElement.versions=Versions - -WorkbenchUserAuthenticator.cancelled=Operation cancelled because login cancelled -WorkbenchUserAuthenticator.errorFlushing=Error occurred while flushing password for {0} -WorkbenchUserAuthenticator.errorSaving=Error occurred while saving password for {0} - -Unmanage.unmanaging=Disconnecting from CVS... -Unmanage.unmanage=Disconnect from CVS -Unmanage.title=Confirm Disconnect from CVS -Unmanage.titleN=Confirm Multiple Project Disconnect from CVS -Unmanage.message=Are you sure you want to disconnect CVS from ''{0}''? -Unmanage.messageN=Are you sure you want to disconnect CVS from these {0} projects? -Unmanage.option1=Do not delete the CVS meta information (e.g. CVS sub-directories). -Unmanage.option2=Also delete the CVS meta information from the file system. -Unmanage.unmanagingError=Errors occurred while disconnecting - -Unmanage.message=Are you sure you want to disconnect CVS from ''{0}''? -Unmanage.messageN=Are you sure you want to disconnect CVS from these {0} projects? - -Enter_a_valid_file_name_or_select_the_clipboard_option_1=Enter a valid file name or select the clipboard option -Save_To_Clipboard_2=&Save To Clipboard -Save_In_File_System_3=Sa&ve In File System -Browse..._4=Br&owse... -Save_Patch_As_5=Save Patch As -patch.txt_6=patch.txt -Save_In_Workspace_7=Save In &Workspace -Select_a_folder_then_type_in_the_file_name__8=Select a fol&der then type in the file name: -Fi&le_name__9=Fi&le name: -Do_not_recurse_into_sub-folders_10=&Recurse into sub-folders -Do_not_include_new_files_in_patch_11=&Include new files in patch -Diff_output_format_12=Diff output format -Unified_(format_required_by_Compare_With_Patch_feature)_13=&Unified (format required by the Apply Patch wizard) -Context_14=&Context -Standard_15=&Standard -Advanced_options_19=Advanced options -Configure_the_options_used_for_the_CVS_diff_command_20=Configure the options used for the CVS diff command - -After_configuring_the_project__1=After configuring the project: -Open_the_Synchronize_view_on_the_project_2=Open the Synchronize view on the project -Automatically_import_the_local_resources_into_the_repository_3=Automatically import the local resources into the repository -Run_update_4=Run update -Do_nothing_5=Do nothing -Validate_Connection_on_Finish_7=Validate Location on Finish - -TagSelectionDialog.Select_a_Tag_1=&Select a branch or version: -TagSelectionDialog.recurseOption=Recurse into sub-&folders - -UpdateSyncAction.Conflicting_changes_found_1=Conflicting changes found -UpdateSyncAction.You_have_local_changes_you_are_about_to_overwrite_2=You have local changes you are about to overwrite -UpdateSyncAction.Only_update_resources_that_can_be_automatically_merged_3=Only update resources that can be automatically merged -UpdateSyncAction.Update_all_resources,_overwriting_local_changes_with_remote_contents_4=Update all resources, overwriting local changes with remote contents -UpdateSyncAction.Overwrite_local_changes__5=Overwrite local changes? -UpdateSyncAction.You_have_local_changes_you_are_about_to_overwrite._Do_you_wish_to_continue__6=You have local changes you are about to overwrite. Do you wish to continue? - -Example__1=Example: -Text_Labels_12=T&ext -Select_the_format_for_file,_folders,_and_project_text_labels__13=Select the format for file, folders, and project text labels: -&File_Format__14=&File Format: -Add_&Variables_15=Add &Variables... -F&older_Format__16=F&older Format: -Add_Varia&bles_17=Add Varia&bles... -&Project_Format__18=&Project Format: -Add_Variable&s_19=Add Variable&s... -&Label_decoration_for_outgoing__20=Di&rty flag: -Label_decorat&ion_for_added__22=Added f&lag: -Icon_Overlays_24=&Icons -Sho&w_outgoing_25=Indicate is out&going -Show_has_&remote_26=Indicate &has remote -S&how_is_added_27=Indi&cate is added -&Compute_deep_outgoing_state_for_folders_(disabling_this_will_improve_decorator_performance)_28=&Compute deep outgoing state for folders (disabling this will improve decorator performance) -Select_the_&variables_to_add_to_the_decoration_format__30=Select the &variables to add to the decoration format: -Add_Variables_31=Add Variables -name_of_the_resource_being_decorated_34=name of the resource being decorated -the_tag_applied_to_the_resource_(version,_branch,_or_date)_35=the tag applied to the resource (version, branch, or date) -the_repository_location__s_hostname_36=the repository location\'s hostname -the_connection_method_(e.g._pserver,_ssh)_37=the connection method (e.g. pserver, ssh) -user_name_for_the_connection_38=user name for the connection -repository_home_directory_on_server_39=repository home directory on server -root_relative_directory_40=root relative directory -flag_indicating_that_the_folder_has_a_child_resource_with_outgoing_changes_41=flag indicating that the folder has a child resource with outgoing changes -name_of_the_resource_being_decorated_42=name of the resource being decorated -the_tag_applied_to_the_resource_43=the tag applied to the resource -keyword_substitution_rule_for_the_resource_44=keyword subsitution rule for the resource -last_revision_loaded_into_workspace_45=last revision loaded into workspace -flag_indicating_that_the_file_has_outgoing_changes_46=flag indicating that the file has outgoing changes -flag_indicating_that_the_file_has_been_added_to_the_server_47=flag indicating that the file has been added to the server - -ExtMethodPreferencePage_message=These variables define the external connection program to use with the \'ext\' connection method. These values should be the same as the \'ext\' CVS command-line environment variable settings. -ExtMethodPreferencePage_CVS_RSH=CVS_&RSH: -ExtMethodPreferencePage_Browse=&Browse... -ExtMethodPreferencePage_Details=Select a program or script -ExtMethodPreferencePage_CVS_RSH_Parameters=&Parameters: -ExtMethodPreferencePage_Add_Variable=&Add Variable... -ExtMethodPreferencePage_CVS_SERVER__7=CVS_&SERVER: -UpdateMergeActionProblems_merging_remote_resources_into_workspace_1=Problems merging remote resources into workspace -UpdateMergeActionProblems_merging_remote_resources_into_workspace_2=Problems merging remote resources into workspace -CVSAddResolutionGenerator.Add_Resource_to_CVS_1=Add Resource to CVS -CVSAddResolutionGenerator.Add_Resource_and_Children_to_CVS_2=Add Resource and Children to CVS -CVSAddResolutionGenerator.Add_to_.cvsignore_3=Add to .cvsignore -CVSRemoveResolutionGenerator.Commit_Deletion_to_CVS_1=Commit Deletion to CVS -CVSRemoveResolutionGenerator.Undo_Deletion_from_Local_History_2=Undo Deletion from Local History -CVSRemoveResolutionGenerator.No_local_history_available._Try_undoing_from_the_server_3=No local history available. Try undoing from the server -CVSRemoveResolutionGenerator.Undo_Deletion_from_CVS_Server_4=Undo Deletion from CVS Server -CVSRemoveResloutionGenerator.Commit_Deletion_to_CVS_1=Commit Deletion to CVS -CVSRemoveResloutionGenerator.Undo_Deletion_from_Local_History_2=Undo Deletion from Local History -CVSRemoveResloutionGenerator.No_local_history_available._Try_undoing_from_the_server_3=No local history available. Try undoing from the server -CVSRemoveResloutionGenerator.Undo_Deletion_from_CVS_Server_4=Undo Deletion from CVS Server - -TagConfigurationDialog.1=Configure Branches and Versions for {0} -TagConfigurationDialog.2=Configure Branches and Versions for {0} projects -TagConfigurationDialog.4=Configure tags you will see in the workbench. -TagConfigurationDialog.5=&Browse files for tags: -TagConfigurationDialog.6=&New tags found in the selected files: -TagConfigurationDialog.7=Remembered &tags for these projects: -TagConfigurationDialog.8=&Add Checked Tags -TagConfigurationDialog.9=&Remove -TagConfigurationDialog.10=Re&move All -TagConfigurationDialog.11=&List of files to be automatically examined when refreshing tags: -TagConfigurationDialog.12=A&dd Selected Files -TagConfigurationDialog.13=Rem&ove -TagConfigurationDialog.14=Error fetching tags from remote CVS files -TagConfigurationDialog.20=&Refresh from Repository -TagConfigurationDialog.21=&Configure Tags -TagConfigurationDialog.22=Updating Tags - -ChangeListener.Deleting_CVS_folders_1=Deleting CVS folders -ChangeListener.Folders_cannot_be_deleted_from_a_CVS_server_from_the_client._To_delete_the_folder_2=Folders cannot be deleted from a CVS server from the client. To delete the folder -ChangeListener.Do_not_ask_me_about_this_again_3=Do not ask me about this again -ConfigureTagsFromRepoViewConfigure_Tag_Error_1=Configure Tag Error -RemoteRootAction.label=Discard location -RemoteRootAction.Unable_to_Discard_Location_1=Unable to Discard Location -RemoteRootAction.Projects_in_the_local_workspace_are_shared_with__2=Projects in the local workspace are shared with {0}. This location cannot be discarded until all local projects are disconnected from it. -RemoveRootAction.removeRoot_3=RemoveRootAction.removeRoot -RemoteRootAction.The_projects_that_are_shared_with_the_above_repository_are__4=The projects that are shared with the above repository are: - -BranchCategory.Branches_1=Branches -GroupedByVersionCategory.Versions_1=Versions -VersionCategory.Versions_1=Versions -ModulesCategory.label=Modules -HistoryView.[...]_4=[...] - -CVSProjectPropertiesPage.connectionType=Connection type: -CVSProjectPropertiesPage.user=User: -CVSProjectPropertiesPage.Select_a_Repository_1=Select a Repository -CVSProjectPropertiesPage.Select_a_CVS_repository_location_to_share_the_project_with__2=Select a compatible CVS repository location to share the project with: -CVSProjectPropertiesPage.Change_Sharing_5=&Change Sharing... -CVSProjectPropertiesPage.fetchAbsentDirectoriesOnUpdate=&Fetch absent or new directories when updating -CVSProjectPropertiesPage.configureForWatchEdit=Enable watch/edit for this project -CVSProjectPropertiesPage.progressTaskName=Updating project's CVS properties -CVSProjectPropertiesPage.setReadOnly=Setting all files read-only -CVSProjectPropertiesPage.clearReadOnly=Setting all files writable -CVSRepositoryPropertiesPage.Confirm_Project_Sharing_Changes_1=Confirm Project Sharing Changes -CVSRepositoryPropertiesPage.There_are_projects_in_the_workspace_shared_with_this_repository_2=There are projects in the workspace shared with this repository. The projects will be updated with the new information that you have entered -CVSRepositoryPropertiesPage.sharedProject=The projects that are shared with {0} are: -CVSRepositoryPropertiesPage.useDefaultProgramName=Expect the &default program name "cvs" in text message prefixes from this server -CVSRepositoryPropertiesPage.useProgramName=Expect a custom &program name: -CVSRepositoryPropertiesPage.useLocationAsLabel=Use the &repository identification string as the label -CVSRepositoryPropertiesPage.useCustomLabel=Use a custom &label: - -CVSProjectSetSerializer.Confirm_Overwrite_Project_8=Confirm Overwrite Project -CVSProjectSetSerializer.The_project_{0}_already_exists._Do_you_wish_to_overwrite_it__9=The project {0} already exists. Do you wish to overwrite it? - -IgnoreResourcesDialog.titleSingle=Add {0} to .cvsignore -IgnoreResourcesDialog.titleMany=Add {0} resources to .cvsignore -IgnoreResourcesDialog.prompt=Select what to add to the .cvsignore file(s): -IgnoreResourcesDialog.addNameEntryButton=Resource(s) by name -IgnoreResourcesDialog.addNameEntryExample=Examples: file1.so, file2.so, .rcfile, bin -IgnoreResourcesDialog.addExtensionEntryButton=Wildcard extension -IgnoreResourcesDialog.addExtensionEntryExample=Examples: *.so, *.rcfile, bin -IgnoreResourcesDialog.addCustomEntryButton=Custom pattern -IgnoreResourcesDialog.addCustomEntryExample=The wildcard characters ''*'' and ''?'' are permitted. -IgnoreResourcesDialog.patternMustNotBeEmpty=Pattern must not be empty. -IgnoreResourcesDialog.patternDoesNotMatchFile=Pattern does not match all selected resources: e.g. {0} - -ContentAction.Confirm_Long_Operation_1=Confirm Long Operation -ContentAction.Changing_this_setting_will_involve_contacting_the_server_and_may_be_long-running_2=Changing this setting will involve contacting the server and may be long-running - -CVSProjectPropertiesPage.You_can_change_the_sharing_of_this_project_to_another_repository_location._However,_this_is_only_possible_if_the_new_location_is___compatible___(on_the_same_host_with_the_same_repository_path)._1=You can change the sharing of this project to another repository location. However, this is only possible if the new location is \"compatible\" (on the same host with the same repository path). - -ConfigurationWizardMainPage.Location_1=Location -ConfigurationWizardMainPage.Authentication_2=Authentication -ConfigurationWizardMainPage.Connection_3=Connection -AlternateUserValidationDialog.Enter_Password_2=Enter Password -AlternateUserValidationDialog.OK_6=OK -AlternateUserValidationDialog.Cancel_7=Cancel -AlternateUserValidationDialog.message=Enter the password for {0}: -WorkbenchUserAuthenticator.The_operation_was_canceled_by_the_user_1=The operation was canceled by the user -CVSCatchupReleaseViewer.No_workspace_file_1=No workspace file -CVSPreferencesPage.Timeout_must_not_be_negative_1=Timeout must not be negative -CVSPreferencesPage.Timeout_must_be_a_number_2=Timeout must be a number -CVSCatchupReleaseViewer.Select_&Outgoing_Additions_1=Select New Reso&urces -ForceCommitSyncAction.Outgoing_Changes_Not_Added_1=Outgoing Changes Not Added -ForceCommitSyncAction.You_have_chosen_to_commit_new_resources_which_have_not_been_added_to_version_control._Do_you_wish_to_add_them_to_version_control_now__2=You have chosen to commit new resources which have not been added to version control. Do you wish to add them to version control now? - -WorkingSetSelectionArea.workingSetOther=&Other... -ListSelectionArea.selectAll=&Select All -ListSelectionArea.deselectAll=&Deselect All - -RestoreFromRepositoryWizard.fileSelectionPageTitle=Restore from Repository -RestoreFromRepositoryWizard.fileSelectionPageDescription=Select the revision of each file that should be restored. -RestoreFromRepositoryFileSelectionPage.fileSelectionPaneTitle={0} - Select file to be restored: -RestoreFromRepositoryFileSelectionPage.revisionSelectionPaneTitle={0} - Check revision to be restored: -RestoreFromRepositoryFileSelectionPage.fileToRestore={0} ({1} to be restored) -RestoreFromRepositoryFileSelectionPage.fileContentPaneTitle={0} {1} in ''{2}'' -RestoreFromRepositoryFileSelectionPage.emptyRevisionPane=Remote revisions of selected file: -RestoreFromRepositoryFileSelectionPage.fileExists=File ''{0}'' already exists locally. -RestoreFromRepositoryFileSelectionPage.revisionIsDeletion=Revision {0} of {1} is the deletion and can not be restored. Select another revision of this file. -RestoreFromRepositoryAction.noFilesTitle=No Deleted Files Found -RestoreFromRepositoryAction.noFilesMessage=There were no deleted files found on the repository in folder ''{0}''. - -RepositoryRoot.folderInfoMissing=Local folder ''{0}'' is not properly mapped to a remote folder. - -RepositoriesViewContentHandler.unmatchedTag=No matching end tag found for tag ''{0}'' while reading repositories View configuration file. -RepositoriesViewContentHandler.missingAttribute=Required attribute ''{1}'' missing from tag ''{0}'' while reading repositories View configuration file. -RepositoriesViewContentHandler.errorCreatingRoot=An error occurred trying to create repository ''{0}''. - -CVSWorkingSetFolderSelectionPage.projectSelectionPageTitle=CVS Working Set -CVSWorkingSetFolderSelectionPage.projectSelectionPageDescription=Enter a working set name and select the working set folders. -CVSWorkingSetFolderSelectionPage.name=&Working set name: -CVSWorkingSetFolderSelectionPage.treeLabel=Working &set contents: -CVSWorkingSetFolderSelectionPage.refresh=&Refresh Contents -CVSWorkingSetFolderSelectionPage.invalidWorkingSetName=The name must contain only letters and digits. -CVSWorkingSetFolderSelectionPage.duplicateWorkingSetName=A working set of the specific name already exists. -CVSWorkingSetFolderSelectionPage.mustSelectFolder=At least one folder must be checked. - -WorkingSetSelectionDialog.title= Select CVS Working Set -WorkingSetSelectionDialog.title.multiSelect= Select CVS Working Sets -WorkingSetSelectionDialog.message= &Select a CVS working set: -WorkingSetSelectionDialog.message.multiSelect= &Select CVS working sets: -WorkingSetSelectionDialog.detailsButton.label= &Edit... -WorkingSetSelectionDialog.newButton.label= &New... -WorkingSetSelectionDialog.removeButton.label= &Remove - -RefreshTagsAction.title=Refresh Branch and Version Tags? -RefreshTagsAction.message=Repository ''{0}'' has {1} projects to refresh. Continue? - -WatchEditPreferencePage.description=Settings for CVS Watch/Edit. -WatchEditPreferencePage.checkoutReadOnly=&Configure projects to use Watch/Edit on checkout -WatchEditPreferencePage.validateEditSaveAction=When read-only files are modified in an editor -WatchEditPreferencePage.edit=Send a cvs &edit notification to the server -WatchEditPreferencePage.highjack=Edit the file &without informing the server - -Uneditaction.confirmMessage=Overwrite local changes to edited files? -Uneditaction.confirmTitle=Confirm Unedit - -FileModificationValidator.promptTitle=CVS Edit Files? -FileModificationValidator.promptMessage=There are read-only files being modified. Should a 'cvs edit' be performed? -FileModificationValidator.vetoMessage=User vetoed file modification - -RefreshRemoteProjectWizard.title=Refresh Branches -RefreshRemoteProjectSelectionPage.pageTitle=Select Projects -RefreshRemoteProjectSelectionPage.pageDescription=Select the remote projects whose tags should be refreshed. -RefreshRemoteProjectSelectionPage.selectRemoteProjects=This wizard helps discover the tags associated with one or more remote projects. &Check the projects whose tags you wish to refresh. -RefreshRemoteProjectSelectionPage.noWorkingSet=Do not &use a working set -RefreshRemoteProjectSelectionPage.workingSet=Select a &working set (matching projects will be checked): - -EditorsView.file=File name -EditorsView.user=User name -EditorsView.date=Date -EditorsView.computer=Computer name - -EditorsDialog.title=Editors -EditorsDialog.question=The resource already has editors. Do you still want to edit the resource? -EditorsAction.classNotInitialized={0} not initialized - -TargetLocationSelectionDialog.projectNameLabel=&Project Name: -TargetLocationSelectionDialog.useDefaultLabel=Use default &workspace location -TargetLocationSelectionDialog.locationLabel=&Location: -TargetLocationSelectionDialog.parentDirectoryLabel=&Directory: -TargetLocationSelectionDialog.browseLabel=&Browse... -TargetLocationSelectionDialog.messageForSingle=Select the parent directory for project {0}. -TargetLocationSelectionDialog.messageForMulti=Select the parent directory for the {0} projects. -TagetLocationSelectionDialog.locationEmpty=Project contents directory must be specified. -TagetLocationSelectionDialog.invalidLocation=Invalid location path. -TagetLocationSelectionDialog.alreadyExists=Project {0} already exists. - -SynchronizeProjectsDialog.title=Synchronize CVS Projects -SynchronizeProjectsDialog.selectProjects=Projects to be synchronized -SynchronizeProjectsDialog.syncOutgoingChanges=Only synchronize projects with outgoing &changes -SynchronizeProjectsDialog.allSharedProjects=Include &all projects shared with CVS -SynchronizeProjectsDialog.sharedWorkingSetProjects=Include &working set resources shared with CVS: - -RemoteFileEditorInput.fullPathAndRevision={0} {1} - -CheckoutOperation.thisResourceExists=The resource ''{0}'' already exists in the workspace and will be deleted. Proceed with the check out of ''{1}''? -CheckoutOperation.thisExternalFileExists=The folder ''{0}'' exists in the local file system and will be deleted. Proceed with the check out of ''{1}''? -CheckoutOperation.confirmOverwrite=Confirm Overwrite -CheckoutOperation.scrubbingProject=Scrubbing project ''{0}''. -CheckoutOperation.refreshingProject=Configuring project ''{0}''. - -CheckoutSingleProjectOperation.taskname=Checking out "{0}" from CVS as "{1}" -CheckoutMultipleProjectsOperation.taskName=Checking out {0} folders from CVS - -CheckoutIntoOperation.taskname=Checking out {0} folders from CVS into ''{1}'' -CheckoutIntoOperation.targetIsFile=Folder ''{0}'' cannot be checked out because file ''{1}'' is in the way. -CheckoutIntoOperation.targetIsFolder=Folder ''{0}'' cannot be checked out because folder ''{1}'' is in the way. -CheckoutIntoOperation.targetIsPrunedFolder=Folder ''{0}'' cannot be checked out because it conflicts with the pruned folder ''{1}''. -CheckoutIntoOperation.mappingAlreadyExists=Cannot checkout remote folder ''{0}'' into ''{1}'' because local folder ''{2}'' is already mapped to remote folder ''{0}''. -CheckoutIntoOperation.cancelled=Checkout of ''{1}'' cancelled by user. -CheckoutIntoOperation.overwriteMessage=Folder ''{0}'' already exists and will be deleted. Continue? - -AddToWorkspace.taskName1=Checking out ''{0}'' from CVS -AddToWorkspace.taskNameN=Checking out {0} folders from CVS - -CheckoutAsAction.checkoutFailed=Problems encountered performing checkout - -CheckoutAsAction.enterProjectTitle=Check Out {0} As... -CheckoutAsAction.enterLocationTitle=Check Out {0} Projects As... -CheckoutAsAction.taskname=Checking out "{0}" from CVS as "{1}" -CheckoutAsAction.multiCheckout=Checking out {0} projects from CVS - -CheckoutAsWizard.title=Check Out As -CheckoutAsWizard.error=Problems encountered performing checkout -CheckoutAsMainPage.title=Check Out As -CheckoutAsMainPage.description=Select the method of check out -CheckoutAsMainPage.singleFolder=Choose how to check out folder ''{0}'' -CheckoutAsMainPage.asConfiguredProject=Check out as a project &configured using the New Project Wizard -CheckoutAsMainPage.asSimpleProject=Check out as a &project in the &workspace -CheckoutAsMainPage.projectNameLabel=&Project Name: -CheckoutAsMainPage.multipleFolders=Choose how to check out the {0} folders -CheckoutAsMainPage.asProjects=Check out into the &workspace as projects -CheckoutAsMainPage.intoProject=Check out &into an existing project - -CheckoutAsLocationSelectionPage.title=Check Out As -CheckoutAsLocationSelectionPage.description=Select the project location -CheckoutAsLocationSelectionPage.useDefaultLabel=Use default &workspace location -CheckoutAsLocationSelectionPage.locationLabel=&Location: -CheckoutAsLocationSelectionPage.parentDirectoryLabel=&Directory: -CheckoutAsLocationSelectionPage.browseLabel=&Browse... -CheckoutAsLocationSelectionPage.locationEmpty=Project contents directory must be specified. -CheckoutAsLocationSelectionPage.invalidLocation=Invalid location path. -CheckoutAsLocationSelectionPage.messageForSingle=Select the parent directory for project {0}. -CheckoutAsLocationSelectionPage.messageForMulti=Select the parent directory for the {0} projects. - -CheckoutAsProjectSelectionPage.title=Check Out Into -CheckoutAsProjectSelectionPage.description=Select the local folder that is the target of the checkout operation. -CheckoutAsProjectSelectionPage.name=Target folder &name: -CheckoutAsProjectSelectionPage.treeLabel=&Parent of target folder: -CheckoutAsProjectSelectionPage.showLabel=&Filter project list: -CheckoutAsProjectSelectionPage.recurse=&Checkout subfolders -CheckoutAsProjectSelectionPage.showAll=Show all valid target projects -CheckoutAsProjectSelectionPage.showUnshared=Show unshared projects -CheckoutAsProjectSelectionPage.showSameRepo=Show projects shared with the same repository -CheckoutAsProjectSelectionPage.invalidFolderName=''{0}'' is not a valid folder name - -TargetLocationSelectionDialog.projectNameLabel=&Project Name: -TargetLocationSelectionDialog.useDefaultLabel=Use default &workspace location -TargetLocationSelectionDialog.locationLabel=&Location: -TargetLocationSelectionDialog.parentDirectoryLabel=&Directory: -TargetLocationSelectionDialog.browseLabel=&Browse... -TargetLocationSelectionDialog.messageForSingle=Select the parent directory for project {0}. -TargetLocationSelectionDialog.messageForMulti=Select the parent directory for the {0} projects. -TagetLocationSelectionDialog.locationEmpty=Project contents directory must be specified. -TagetLocationSelectionDialog.invalidLocation=Invalid location path. -TagetLocationSelectionDialog.alreadyExists=Project {0} already exists. -CheckoutIntoWizard.title=Checkout Into -CheckoutIntoWizard.projectSelectionPageTitle=Select local folder -CheckoutIntoWizard.projectSelectionPageDescription=Select the local folder that is the target of the checkout operation. -CheckoutIntoWizard.error=Checkout Error -CheckoutIntoWizard.thisResourceExists=The resource ''{0}'' already exists in the workspace. Overwrite? -CheckoutIntoWizard.confirmOverwrite=Confirm Overwrite -CheckoutIntoWizard.mappingAlreadyExists=Cannot add remote folder ''{0}'' to project ''{1}'' as ''{2}'' because local folder ''{3}'' is already mapped to that folder. -CheckoutIntoProjectSelectionPage.description=Choose the name and parent folder where ''{0}'' should be checked out to. -CheckoutIntoProjectSelectionPage.name=Target folder &name: -CheckoutIntoProjectSelectionPage.treeLabel=&Parent of target folder: -CheckoutIntoProjectSelectionPage.showLabel=&Filter project list: -CheckoutIntoProjectSelectionPage.showAll=Show all valid target projects -CheckoutIntoProjectSelectionPage.showUnshared=Show unshared projects -CheckoutIntoProjectSelectionPage.showSameRepo=Show projects shared with the same repository -CheckoutIntoProjectSelectionPage.recurse=&Checkout subfolders -CheckoutIntoProjectSelectionPage.invalidFolderName=''{0}'' is not a valid folder name - -CVSOperation.workspaceOperationJobName=CVS workspace modify operation: {0} -CVSOperation.operationJobName=CVS operation: {0} - -HasProjectMetaFile.taskName=Looking for a remote meta file -TagFromWorkspace.taskName=Tagging from workspace -TagFromRepository.taskName=Tagging from repository -UpdateOnlyMergeable.taskName=Updating mergeable changes -UpdateDialog.overwriteTitle=Overwrite Unmergable Resources? -UpdateDialog.overwriteMessage=All mergable resources have been updated. However, some non-mergable resources remain. Should these resources be updated, overwriting any local changes? -ReplaceOperation.taskName=Replacing... diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/AllRootsElement.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/AllRootsElement.java deleted file mode 100644 index 20226e3de..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/AllRootsElement.java +++ /dev/null @@ -1,42 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.model; - - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.ui.model.IWorkbenchAdapter; - -/** - * AllRootsElement is the model element for the repositories view. - * Its children are the array of all known repository roots. - */ -public class AllRootsElement extends CVSModelElement implements IAdaptable { - public ImageDescriptor getImageDescriptor(Object object) { - return null; - } - public Object[] fetchChildren(Object o, IProgressMonitor monitor) { - return CVSUIPlugin.getPlugin().getRepositoryManager().getKnownRepositoryRoots(); - } - public String getLabel(Object o) { - return null; - } - public Object getAdapter(Class adapter) { - if (adapter == IWorkbenchAdapter.class) return this; - return null; - } - public Object getParent(Object o) { - return null; - } -} - diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/BatchSimilarSchedulingRule.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/BatchSimilarSchedulingRule.java deleted file mode 100644 index 4840f451c..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/BatchSimilarSchedulingRule.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.model; - -import org.eclipse.core.runtime.jobs.ISchedulingRule; - -/** - * A simple job scheduling rule for serializing jobs that shouldn't be run - * concurrently. - */ -public class BatchSimilarSchedulingRule implements ISchedulingRule { - public String id; - public BatchSimilarSchedulingRule(String id) { - this.id = id; - } - public boolean isConflicting(ISchedulingRule rule) { - if(rule instanceof BatchSimilarSchedulingRule) { - return ((BatchSimilarSchedulingRule)rule).id.equals(id); - } - return false; - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/BranchCategory.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/BranchCategory.java deleted file mode 100644 index b954d75d4..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/BranchCategory.java +++ /dev/null @@ -1,105 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.model; - - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.ui.model.IWorkbenchAdapter; -/** - * BranchCategory is the model element for the branches category - * for a particular repsitory in the repositories view. Its children - * are the array of all known branch tags, other than HEAD, for the - * given repository. - */ -public class BranchCategory extends CVSModelElement implements IAdaptable { - private ICVSRepositoryLocation repository; - - /** - * TeamStreamsCategory constructor. - */ - public BranchCategory(ICVSRepositoryLocation repository) { - super(); - this.repository = repository; - } - - /** - * Returns an object which is an instance of the given class - * associated with this object. Returns <code>null</code> if - * no such object can be found. - */ - public Object getAdapter(Class adapter) { - if (adapter == IWorkbenchAdapter.class) return this; - return null; - } - - /** - * Returns the children of this object. When this object - * is displayed in a tree, the returned objects will be this - * element's children. Returns an empty enumeration if this - * object has no children. - */ - public Object[] fetchChildren(Object o, IProgressMonitor monitor) throws CVSException { - CVSTag[] tags = CVSUIPlugin.getPlugin().getRepositoryManager().getKnownTags(repository, getWorkingSet(), CVSTag.BRANCH, monitor); - CVSTagElement[] branchElements = new CVSTagElement[tags.length]; - for (int i = 0; i < tags.length; i++) { - branchElements[i] = new CVSTagElement(tags[i], repository); - } - return branchElements; - } - - /** - * Returns an image descriptor to be used for displaying an object in the workbench. - * Returns null if there is no appropriate image. - * - * @param object The object to get an image descriptor for. - */ - public ImageDescriptor getImageDescriptor(Object object) { - return CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_BRANCHES_CATEGORY); - } - - /** - * Returns the name of this element. This will typically - * be used to assign a label to this object when displayed - * in the UI. Returns an empty string if there is no appropriate - * name for this object. - * - * @param object The object to get a label for. - */ - public String getLabel(Object o) { - return Policy.bind("BranchCategory.Branches_1"); //$NON-NLS-1$ - } - - /** - * Returns the logical parent of the given object in its tree. - * Returns null if there is no parent, or if this object doesn't - * belong to a tree. - * - * @param object The object to get the parent for. - */ - public Object getParent(Object o) { - return repository; - } - - /** - * Return the repository the given element belongs to. - */ - public ICVSRepositoryLocation getRepository(Object o) { - return repository; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSAdapterFactory.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSAdapterFactory.java deleted file mode 100644 index 03745ed11..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSAdapterFactory.java +++ /dev/null @@ -1,96 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.model; - - -import org.eclipse.core.runtime.IAdapterFactory; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFile; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.ui.repo.RepositoryRoot; -import org.eclipse.ui.model.IWorkbenchAdapter; -import org.eclipse.ui.progress.IDeferredWorkbenchAdapter; -import org.eclipse.ui.views.properties.IPropertySource; - -public class CVSAdapterFactory implements IAdapterFactory { - private Object fileAdapter = new RemoteFileElement(); - private Object folderAdapter = new RemoteFolderElement(); - private Object rootAdapter = new CVSRepositoryRootElement(); - - // Property cache - private Object cachedPropertyObject = null; - private Object cachedPropertyValue = null; - - /** (Non-javadoc) - * Method declared on IAdapterFactory. - */ - public Object getAdapter(Object adaptableObject, Class adapterType) { - if (IWorkbenchAdapter.class == adapterType) { - return getWorkbenchAdapter(adaptableObject); - } - - if(IDeferredWorkbenchAdapter.class == adapterType) { - Object o = getWorkbenchAdapter(adaptableObject); - if(o != null && o instanceof IDeferredWorkbenchAdapter) { - return o; - } - return null; - } - - if (IPropertySource.class == adapterType) { - return getPropertySource(adaptableObject); - } - return null; - } - - protected Object getWorkbenchAdapter(Object o) { - if (o instanceof ICVSRemoteFile) { - return fileAdapter; - } else if (o instanceof ICVSRepositoryLocation) { - return rootAdapter; - } else if (o instanceof RepositoryRoot) { - return rootAdapter; - } else if (o instanceof ICVSRemoteFolder) { - return folderAdapter; - } - return null; - } - - /** (Non-javadoc) - * Method declared on IAdapterFactory. - */ - public Class[] getAdapterList() { - return new Class[] {IWorkbenchAdapter.class, IPropertySource.class, IDeferredWorkbenchAdapter.class}; - } - /** - * Returns the property source for the given object. Caches - * the result because the property sheet is extremely inefficient, - * it asks for the source seven times in a row. - */ - public Object getPropertySource(Object adaptableObject) { - if (adaptableObject == cachedPropertyObject) { - return cachedPropertyValue; - } - cachedPropertyObject = adaptableObject; - if (adaptableObject instanceof ICVSRemoteFile) { - cachedPropertyValue = new CVSRemoteFilePropertySource((ICVSRemoteFile)adaptableObject); - } else if (adaptableObject instanceof ICVSRemoteFolder) { - cachedPropertyValue = new CVSRemoteFolderPropertySource((ICVSRemoteFolder)adaptableObject); - } else if (adaptableObject instanceof ICVSRepositoryLocation) { - cachedPropertyValue = new CVSRepositoryLocationPropertySource((ICVSRepositoryLocation)adaptableObject); - } else if (adaptableObject instanceof RepositoryRoot) { - cachedPropertyValue = new CVSRepositoryLocationPropertySource(((RepositoryRoot)adaptableObject).getRoot()); - } else { - cachedPropertyValue = null; - } - return cachedPropertyValue; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSFileElement.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSFileElement.java deleted file mode 100644 index 76a80ad47..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSFileElement.java +++ /dev/null @@ -1,74 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.model; - - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.ICVSFile; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo; -import org.eclipse.ui.PlatformUI; - -public class CVSFileElement extends CVSResourceElement { - - private ICVSFile file; - - public CVSFileElement(ICVSFile file) { - this.file = file; - } - - /** - * Initial implementation: return null; - */ - public Object[] fetchChildren(Object o, IProgressMonitor monitor) { - return new Object[0]; - } - /** - * Initial implementation: return null. - */ - public ImageDescriptor getImageDescriptor(Object object) { - return PlatformUI.getWorkbench().getEditorRegistry().getImageDescriptor(file.getName()); - } - /** - * Initial implementation: return the file's name and version - */ - public String getLabel(Object o) { - try { - ResourceSyncInfo info = file.getSyncInfo(); - if(info!=null) { - return file.getName() + " " + info.getRevision(); //$NON-NLS-1$ - } else { - return file.getName(); - } - } catch (TeamException e) { - handle(e); - return null; - } - } - /** - * @see IWorkbenchAdapter#getParent(Object) - */ - public Object getParent(Object o) { - return null; - } - - public ICVSFile getCVSFile() { - return file; - } - /** - * @see CVSResourceElement#getCVSResource() - */ - public ICVSResource getCVSResource() { - return file; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSFolderElement.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSFolderElement.java deleted file mode 100644 index cd530db47..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSFolderElement.java +++ /dev/null @@ -1,82 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.model; - - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.ICVSFile; -import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.ui.ISharedImages; -import org.eclipse.ui.PlatformUI; - -public class CVSFolderElement extends CVSResourceElement { - - private ICVSFolder folder; - private boolean includeUnmanaged; - - public CVSFolderElement(ICVSFolder folder, boolean includeUnmanaged) { - this.folder = folder; - this.includeUnmanaged = includeUnmanaged; - } - - /** - * Returns CVSResourceElement instances - */ - public Object[] fetchChildren(Object o, IProgressMonitor monitor) throws TeamException { - ICVSResource[] children = folder.fetchChildren(monitor); - CVSResourceElement[] elements = new CVSResourceElement[children.length]; - for (int i = 0; i < children.length; i++) { - ICVSResource resource = children[i]; - if(resource.isFolder()) { - elements[i] = new CVSFolderElement((ICVSFolder)resource, includeUnmanaged); - } else { - elements[i] = new CVSFileElement((ICVSFile)resource); - } - } - return elements; - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.model.CVSModelElement#isRemoteElement() - */ - public boolean isRemoteElement() { - return true; - } - - /** - * Overridden to append the version name to remote folders which - * have version tags and are top-level folders. - */ - public String getLabel(Object o) { - return folder.getName(); - } - - public ImageDescriptor getImageDescriptor(Object object) { - return PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_OBJ_FOLDER); - } - - /** - * @see IWorkbenchAdapter#getParent(Object) - */ - public Object getParent(Object o) { - return new CVSFolderElement(folder.getParent(), includeUnmanaged); - } - - /** - * @see CVSResourceElement#getCVSResource() - */ - public ICVSResource getCVSResource() { - return folder ; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSModelElement.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSModelElement.java deleted file mode 100644 index 5fb8cfb18..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSModelElement.java +++ /dev/null @@ -1,109 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.model; - -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.operation.IRunnableContext; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.ui.IWorkingSet; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.model.IWorkbenchAdapter; -import org.eclipse.ui.progress.IDeferredWorkbenchAdapter; - -public abstract class CVSModelElement implements IWorkbenchAdapter, IAdaptable { - - private IRunnableContext runnableContext; - private IWorkingSet workingSet; - - public IWorkingSet getWorkingSet() { - return workingSet; - } - - public void setWorkingSet(IWorkingSet workingSet) { - this.workingSet = workingSet; - } - - public Object getAdapter(Class adapter) { - if (adapter == IWorkbenchAdapter.class) - return this; - if ((adapter == IDeferredWorkbenchAdapter.class) && this instanceof IDeferredWorkbenchAdapter) - return this; - return null; - } - - /** - * Returns the runnableContext. - * @return IRunnableContext - */ - public IRunnableContext getRunnableContext() { - if (runnableContext == null) { - return PlatformUI.getWorkbench().getActiveWorkbenchWindow(); - } - return runnableContext; - } - - /** - * Sets the runnableContext. - * @param runnableContext The runnableContext to set - */ - public void setRunnableContext(IRunnableContext runnableContext) { - this.runnableContext = runnableContext; - } - - public Object[] getChildren(Object o) { - return getChildren(o, true); - } - - /** - * Gets the children of the receiver by invoking the <code>internalGetChildren</code>. - * A appropriate progress indicator will be used if requested. - */ - protected Object[] getChildren(final Object o, boolean needsProgress) { - try { - if (needsProgress) { - final Object[][] result = new Object[1][]; - IRunnableWithProgress runnable = new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - try { - result[0] = CVSModelElement.this.fetchChildren(o, monitor); - } catch (TeamException e) { - throw new InvocationTargetException(e); - } - } - }; - getRunnableContext().run(true /*fork*/, true /*cancelable*/, runnable); - return result[0]; - } else { - return fetchChildren(o, null); - } - } catch (InterruptedException e) { - } catch (InvocationTargetException e) { - handle(e); - } catch (TeamException e) { - handle(e); - } - return new Object[0]; - } - - abstract protected Object[] fetchChildren(Object o, IProgressMonitor monitor) throws TeamException; - - /** - * Handles exceptions that occur in CVS model elements. - */ - protected void handle(Throwable t) { - CVSUIPlugin.openError(null, null, null, t, CVSUIPlugin.LOG_NONTEAM_EXCEPTIONS); - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRemoteFilePropertySource.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRemoteFilePropertySource.java deleted file mode 100644 index 4067cea15..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRemoteFilePropertySource.java +++ /dev/null @@ -1,159 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.model; - - -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFile; -import org.eclipse.team.internal.ccvs.core.ILogEntry; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.ui.views.properties.IPropertyDescriptor; -import org.eclipse.ui.views.properties.IPropertySource; -import org.eclipse.ui.views.properties.PropertyDescriptor; - -public class CVSRemoteFilePropertySource implements IPropertySource { - ICVSRemoteFile file; - ILogEntry entry; - boolean initialized; - - // Property Descriptors - static protected IPropertyDescriptor[] propertyDescriptors = new IPropertyDescriptor[5]; - { - PropertyDescriptor descriptor; - String category = Policy.bind("cvs"); //$NON-NLS-1$ - - // resource name - descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_NAME, Policy.bind("CVSRemoteFilePropertySource.name")); //$NON-NLS-1$ - descriptor.setAlwaysIncompatible(true); - descriptor.setCategory(category); - propertyDescriptors[0] = descriptor; - // revision - descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_REVISION, Policy.bind("CVSRemoteFilePropertySource.revision")); //$NON-NLS-1$ - descriptor.setAlwaysIncompatible(true); - descriptor.setCategory(category); - propertyDescriptors[1] = descriptor; - // date - descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_DATE, Policy.bind("CVSRemoteFilePropertySource.date")); //$NON-NLS-1$ - descriptor.setAlwaysIncompatible(true); - descriptor.setCategory(category); - propertyDescriptors[2] = descriptor; - // author - descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_AUTHOR, Policy.bind("CVSRemoteFilePropertySource.author")); //$NON-NLS-1$ - descriptor.setAlwaysIncompatible(true); - descriptor.setCategory(category); - propertyDescriptors[3] = descriptor; - // comment - descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_COMMENT, Policy.bind("CVSRemoteFilePropertySource.comment")); //$NON-NLS-1$ - descriptor.setAlwaysIncompatible(true); - descriptor.setCategory(category); - propertyDescriptors[4] = descriptor; - } - - /** - * Create a PropertySource and store its file - */ - public CVSRemoteFilePropertySource(ICVSRemoteFile file) { - this.file = file; - } - - /** - * Do nothing because properties are read only. - */ - public Object getEditableValue() { - return this; - } - - /** - * Return the Property Descriptors for the receiver. - */ - public IPropertyDescriptor[] getPropertyDescriptors() { - return propertyDescriptors; - } - - /* - * @see IPropertySource#getPropertyValue(Object) - */ - public Object getPropertyValue(Object id) { - if (!initialized) { - initialize(); - initialized = true; - } - if (id.equals(ICVSUIConstants.PROP_NAME)) { - return file.getName(); - } - if (entry != null) { - if (id.equals(ICVSUIConstants.PROP_REVISION)) { - return entry.getRevision(); - } - if (id.equals(ICVSUIConstants.PROP_DATE)) { - return entry.getDate(); - } - if (id.equals(ICVSUIConstants.PROP_AUTHOR)) { - return entry.getAuthor(); - } - if (id.equals(ICVSUIConstants.PROP_COMMENT)) { - return entry.getComment(); - } - } - return ""; //$NON-NLS-1$ - } - - /** - * Answer true if the value of the specified property - * for this object has been changed from the default. - */ - public boolean isPropertySet(Object property) { - return false; - } - /** - * Reset the specified property's value to its default value. - * Do nothing because properties are read only. - * - * @param property The property to reset. - */ - public void resetPropertyValue(Object property) { - } - /** - * Do nothing because properties are read only. - */ - public void setPropertyValue(Object name, Object value) { - } - - private void initialize() { - try { - CVSUIPlugin.runWithProgress(null, true /*cancelable*/, new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - try { - ILogEntry[] entries = file.getLogEntries(monitor); - String revision = file.getRevision(); - for (int i = 0; i < entries.length; i++) { - if (entries[i].getRevision().equals(revision)) { - entry = entries[i]; - return; - } - } - } catch (TeamException e) { - throw new InvocationTargetException(e); - } - } - }); - } catch (InterruptedException e) { // ignore cancellation - } catch (InvocationTargetException e) { - CVSUIPlugin.openError(null, null, null, e); - } - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRemoteFolderPropertySource.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRemoteFolderPropertySource.java deleted file mode 100644 index 618d69ec3..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRemoteFolderPropertySource.java +++ /dev/null @@ -1,101 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.model; - - -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder; -import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.ui.views.properties.IPropertyDescriptor; -import org.eclipse.ui.views.properties.IPropertySource; -import org.eclipse.ui.views.properties.PropertyDescriptor; - -public class CVSRemoteFolderPropertySource implements IPropertySource { - ICVSRemoteFolder folder; - - // Property Descriptors - static protected IPropertyDescriptor[] propertyDescriptors = new IPropertyDescriptor[2]; - { - PropertyDescriptor descriptor; - String category = Policy.bind("cvs"); //$NON-NLS-1$ - - // resource name - descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_NAME, Policy.bind("CVSRemoteFolderPropertySource.name")); //$NON-NLS-1$ - descriptor.setAlwaysIncompatible(true); - descriptor.setCategory(category); - propertyDescriptors[0] = descriptor; - // tag - descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_TAG, Policy.bind("CVSRemoteFolderPropertySource.tag")); //$NON-NLS-1$ - descriptor.setAlwaysIncompatible(true); - descriptor.setCategory(category); - propertyDescriptors[1] = descriptor; - } - - /** - * Create a PropertySource and store its file - */ - public CVSRemoteFolderPropertySource(ICVSRemoteFolder folder) { - this.folder = folder; - } - - /** - * Do nothing because properties are read only. - */ - public Object getEditableValue() { - return this; - } - - /** - * Return the Property Descriptors for the receiver. - */ - public IPropertyDescriptor[] getPropertyDescriptors() { - return propertyDescriptors; - } - - /* - * @see IPropertySource#getPropertyValue(Object) - */ - public Object getPropertyValue(Object id) { - if (id.equals(ICVSUIConstants.PROP_NAME)) { - return folder.getName(); - } - if (id.equals(ICVSUIConstants.PROP_TAG)) { - CVSTag tag = folder.getTag(); - if (tag == null) { - return Policy.bind("CVSRemoteFolderPropertySource.none"); //$NON-NLS-1$ - } - return tag.getName(); - } - return ""; //$NON-NLS-1$ - } - - /** - * Answer true if the value of the specified property - * for this object has been changed from the default. - */ - public boolean isPropertySet(Object property) { - return false; - } - /** - * Reset the specified property's value to its default value. - * Do nothing because properties are read only. - * - * @param property The property to reset. - */ - public void resetPropertyValue(Object property) { - } - /** - * Do nothing because properties are read only. - */ - public void setPropertyValue(Object name, Object value) { - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRepositoryLocationPropertySource.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRepositoryLocationPropertySource.java deleted file mode 100644 index e4c45de8a..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRepositoryLocationPropertySource.java +++ /dev/null @@ -1,124 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.model; - - -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.ui.views.properties.IPropertyDescriptor; -import org.eclipse.ui.views.properties.IPropertySource; -import org.eclipse.ui.views.properties.PropertyDescriptor; - -public class CVSRepositoryLocationPropertySource implements IPropertySource { - ICVSRepositoryLocation location; - - // Property Descriptors - static protected IPropertyDescriptor[] propertyDescriptors = new IPropertyDescriptor[5]; - { - PropertyDescriptor descriptor; - String category = Policy.bind("cvs"); //$NON-NLS-1$ - - // host - descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_HOST, Policy.bind("CVSRepositoryLocationPropertySource.host")); //$NON-NLS-1$ - descriptor.setAlwaysIncompatible(true); - descriptor.setCategory(category); - propertyDescriptors[0] = descriptor; - // user - descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_USER, Policy.bind("CVSRepositoryLocationPropertySource.user")); //$NON-NLS-1$ - descriptor.setAlwaysIncompatible(true); - descriptor.setCategory(category); - propertyDescriptors[1] = descriptor; - // port - descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_PORT, Policy.bind("CVSRepositoryLocationPropertySource.port")); //$NON-NLS-1$ - descriptor.setAlwaysIncompatible(true); - descriptor.setCategory(category); - propertyDescriptors[2] = descriptor; - // root - descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_ROOT, Policy.bind("CVSRepositoryLocationPropertySource.root")); //$NON-NLS-1$ - descriptor.setAlwaysIncompatible(true); - descriptor.setCategory(category); - propertyDescriptors[3] = descriptor; - // method - descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_METHOD, Policy.bind("CVSRepositoryLocationPropertySource.method")); //$NON-NLS-1$ - descriptor.setAlwaysIncompatible(true); - descriptor.setCategory(category); - propertyDescriptors[4] = descriptor; - } - - /** - * Create a PropertySource and store its file - */ - public CVSRepositoryLocationPropertySource(ICVSRepositoryLocation location) { - this.location = location; - } - - /** - * Do nothing because properties are read only. - */ - public Object getEditableValue() { - return this; - } - - /** - * Return the Property Descriptors for the receiver. - */ - public IPropertyDescriptor[] getPropertyDescriptors() { - return propertyDescriptors; - } - - /* - * @see IPropertySource#getPropertyValue(Object) - */ - public Object getPropertyValue(Object id) { - if (id.equals(ICVSUIConstants.PROP_HOST)) { - return location.getHost(); - } - if (id.equals(ICVSUIConstants.PROP_USER)) { - return location.getUsername(); - } - if (id.equals(ICVSUIConstants.PROP_METHOD)) { - return location.getMethod().getName(); - } - if (id.equals(ICVSUIConstants.PROP_ROOT)) { - return location.getRootDirectory(); - } - if (id.equals(ICVSUIConstants.PROP_PORT)) { - int port = location.getPort(); - if (port == ICVSRepositoryLocation.USE_DEFAULT_PORT) { - return Policy.bind("CVSRepositoryLocationPropertySource.default"); //$NON-NLS-1$ - } - return "" + port; //$NON-NLS-1$ - } - return ""; //$NON-NLS-1$ - } - - /** - * Answer true if the value of the specified property - * for this object has been changed from the default. - */ - public boolean isPropertySet(Object property) { - return false; - } - /** - * Reset the specified property's value to its default value. - * Do nothing because properties are read only. - * - * @param property The property to reset. - */ - public void resetPropertyValue(Object property) { - } - /** - * Do nothing because properties are read only. - */ - public void setPropertyValue(Object name, Object value) { - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRepositoryRootElement.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRepositoryRootElement.java deleted file mode 100644 index 79b839fc4..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRepositoryRootElement.java +++ /dev/null @@ -1,73 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.model; - - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.repo.RepositoryRoot; - -/** - * RemoteRootElement is the model element for a repository that - * appears in the repositories view. Its children are: - * a) HEAD - * b) Branch tags category - * c) Version tags category - */ -public class CVSRepositoryRootElement extends CVSModelElement { - public ImageDescriptor getImageDescriptor(Object object) { - if (object instanceof ICVSRepositoryLocation || object instanceof RepositoryRoot) { - return CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_REPOSITORY); - } - return null; - } - public String getLabel(Object o) { - if (o instanceof ICVSRepositoryLocation) { - ICVSRepositoryLocation root = (ICVSRepositoryLocation)o; - o = CVSUIPlugin.getPlugin().getRepositoryManager().getRepositoryRootFor(root); - if (o == null) { - return root.getLocation(); - } - } - if (o instanceof RepositoryRoot) { - RepositoryRoot root = (RepositoryRoot)o; - String name = root.getName(); - if (name == null) - return root.getRoot().getLocation(); - else - return name; - } - return null; - } - public Object getParent(Object o) { - return null; - } - public Object[] fetchChildren(Object o, IProgressMonitor monitor) { - ICVSRepositoryLocation location = null; - if (o instanceof ICVSRepositoryLocation) { - location = (ICVSRepositoryLocation)o; - } - if (o instanceof RepositoryRoot) { - RepositoryRoot root = (RepositoryRoot)o; - location = root.getRoot(); - } - if (location == null) return null; - return new Object[] { - new CVSTagElement(CVSTag.DEFAULT, location), - new BranchCategory(location), - new VersionCategory(location) - }; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSResourceElement.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSResourceElement.java deleted file mode 100644 index 6bf857197..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSResourceElement.java +++ /dev/null @@ -1,39 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.model; - - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.ui.model.IWorkbenchAdapter; - -public abstract class CVSResourceElement extends CVSModelElement implements IAdaptable { - public Object getAdapter(Class adapter) { - if (adapter == IWorkbenchAdapter.class) return this; - return null; - } - /** - * Initial implementation: return the resource's name - */ - public String getLabel(Object o) { - if (!(o instanceof ICVSResource)) return null; - return ((ICVSResource)o).getName(); - } - /** - * Return null. - */ - public Object getParent(Object o) { - if (!(o instanceof ICVSResource)) return null; - return null; - } - - abstract public ICVSResource getCVSResource(); -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRootFolderElement.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRootFolderElement.java deleted file mode 100644 index 285823da8..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRootFolderElement.java +++ /dev/null @@ -1,66 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.model; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.team.internal.ccvs.core.ICVSResource; - -public class CVSRootFolderElement extends CVSResourceElement { - - ICVSFolder[] roots; - - public CVSRootFolderElement(ICVSFolder[] roots) { - this.roots = roots; - } - - /** - * @see IWorkbenchAdapter#getChildren(Object) - */ - public Object[] fetchChildren(Object o, IProgressMonitor monitor) { - CVSFolderElement[] folders = new CVSFolderElement[roots.length]; - for (int i = 0; i < roots.length; i++) { - folders[i] = new CVSFolderElement(roots[i], false); - } - return folders; - } - - /** - * @see IWorkbenchAdapter#getImageDescriptor(Object) - */ - public ImageDescriptor getImageDescriptor(Object object) { - return null; - } - - /** - * @see CVSResourceElement#getCVSResource() - */ - public ICVSResource getCVSResource() { - return null; - } - /** - * Returns the roots. - * @return ICVSFolder[] - */ - public ICVSFolder[] getRoots() { - return roots; - } - - /** - * Sets the roots. - * @param roots The roots to set - */ - public void setRoots(ICVSFolder[] roots) { - this.roots = roots; - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSTagElement.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSTagElement.java deleted file mode 100644 index f1e2cc3fb..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSTagElement.java +++ /dev/null @@ -1,107 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.model; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.jobs.ISchedulingRule; -import org.eclipse.jface.progress.IElementCollector; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteResource; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.ui.progress.IDeferredWorkbenchAdapter; - -public class CVSTagElement extends CVSModelElement implements IDeferredWorkbenchAdapter { - CVSTag tag; - ICVSRepositoryLocation root; - - public CVSTagElement(CVSTag tag, ICVSRepositoryLocation root) { - this.tag = tag; - this.root = root; - } - - public ICVSRepositoryLocation getRoot() { - return root; - } - - public CVSTag getTag() { - return tag; - } - - public boolean equals(Object o) { - if (!(o instanceof CVSTagElement)) - return false; - CVSTagElement t = (CVSTagElement) o; - if (!tag.equals(t.tag)) - return false; - return root.equals(t.root); - } - - public int hashCode() { - return root.hashCode() ^ tag.hashCode(); - } - - public ImageDescriptor getImageDescriptor(Object object) { - if (!(object instanceof CVSTagElement)) - return null; - if (tag.getType() == CVSTag.BRANCH || tag.getType() == CVSTag.HEAD) { - return CVSUIPlugin.getPlugin().getImageDescriptor( - ICVSUIConstants.IMG_TAG); - } else if (tag.getType() == CVSTag.VERSION) { - return CVSUIPlugin.getPlugin().getImageDescriptor( - ICVSUIConstants.IMG_PROJECT_VERSION); - } else { - // This could be a Date tag - return null; - } - } - public String getLabel(Object o) { - if (!(o instanceof CVSTagElement)) - return null; - return ((CVSTagElement) o).tag.getName(); - } - - public String toString() { - return tag.getName(); - } - - public Object getParent(Object o) { - if (!(o instanceof CVSTagElement)) - return null; - return ((CVSTagElement) o).root; - } - - protected Object[] fetchChildren(Object o, IProgressMonitor monitor) throws TeamException { - ICVSRemoteResource[] children = CVSUIPlugin.getPlugin().getRepositoryManager().getFoldersForTag(root, tag, monitor); - if (getWorkingSet() != null) - children = CVSUIPlugin.getPlugin().getRepositoryManager().filterResources(getWorkingSet(), children); - return children; - } - - public void fetchDeferredChildren(Object o, IElementCollector collector, IProgressMonitor monitor) { - try { - collector.add(fetchChildren(o, monitor), monitor); - } catch (TeamException e) { - CVSUIPlugin.log(e); - } - } - - public ISchedulingRule getRule() { - return new BatchSimilarSchedulingRule("org.eclipse.team.cvs.ui.model.tagelement"); //$NON-NLS-1$ - } - - public boolean isContainer() { - return true; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/GroupedByVersionCategory.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/GroupedByVersionCategory.java deleted file mode 100644 index b44805524..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/GroupedByVersionCategory.java +++ /dev/null @@ -1,118 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.model; - - -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Map; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.core.resources.RemoteFolder; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.ui.model.IWorkbenchAdapter; - -public class GroupedByVersionCategory extends CVSModelElement implements IAdaptable { - private ICVSRepositoryLocation repository; - - /** - * ProjectVersionsCategory constructor. - */ - public GroupedByVersionCategory(ICVSRepositoryLocation repo) { - super(); - this.repository = repo; - } - - /** - * Returns an object which is an instance of the given class - * associated with this object. Returns <code>null</code> if - * no such object can be found. - */ - public Object getAdapter(Class adapter) { - if (adapter == IWorkbenchAdapter.class) return this; - return null; - } - - /** - * Returns the children of this object. When this object - * is displayed in a tree, the returned objects will be this - * element's children. Returns an empty enumeration if this - * object has no children. - * - * XXX This method looks wrong to me somehow - */ - public Object[] fetchChildren(Object o, IProgressMonitor monitor) { - //String -> CTags[] - Map mappings = CVSUIPlugin.getPlugin().getRepositoryManager().getKnownProjectsAndVersions(repository); - Map remoteVersionModules = new HashMap(); - for (Iterator it = mappings.keySet().iterator(); it.hasNext();) { - String project = (String) it.next(); - CVSTag[] versions = (CVSTag[])((HashSet)mappings.get(project)).toArray(new CVSTag[0]); - for (int i = 0; i < versions.length; i++) { - CVSTag tag = versions[i]; - RemoteVersionModule module = (RemoteVersionModule)remoteVersionModules.get(tag); - if(module==null) { - module = new RemoteVersionModule(tag, this); - remoteVersionModules.put(tag, module); - } - module.addProject(new RemoteFolder(null, repository, project, tag)); - } - } - return (RemoteVersionModule[])remoteVersionModules.values().toArray(new RemoteVersionModule[0]); - } - - /** - * Returns an image descriptor to be used for displaying an object in the workbench. - * Returns null if there is no appropriate image. - * - * @param object The object to get an image descriptor for. - */ - public ImageDescriptor getImageDescriptor(Object object) { - return CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_VERSIONS_CATEGORY); - } - - /** - * Returns the name of this element. This will typically - * be used to assign a label to this object when displayed - * in the UI. Returns an empty string if there is no appropriate - * name for this object. - * - * @param object The object to get a label for. - */ - public String getLabel(Object o) { - return Policy.bind("GroupedByVersionCategory.Versions_1"); //$NON-NLS-1$ - } - - /** - * Returns the logical parent of the given object in its tree. - * Returns null if there is no parent, or if this object doesn't - * belong to a tree. - * - * @param object The object to get the parent for. - */ - public Object getParent(Object o) { - return repository; - } - - /** - * Return the repository the given element belongs to. - */ - public ICVSRepositoryLocation getRepository(Object o) { - return repository; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/ModulesCategory.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/ModulesCategory.java deleted file mode 100644 index b50274e0b..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/ModulesCategory.java +++ /dev/null @@ -1,93 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.model; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.ui.model.IWorkbenchAdapter; - -/** - * ModulesCategory is the model element for the mdoules category - * for a particular repository. Its children are the array of all - * modules defined in the CVSROOT/Modules file - */ -public class ModulesCategory extends CVSModelElement implements IAdaptable { - private ICVSRepositoryLocation repository; - - public ModulesCategory(ICVSRepositoryLocation repository) { - super(); - this.repository = repository; - } - - /** - * Returns an object which is an instance of the given class - * associated with this object. Returns <code>null</code> if - * no such object can be found. - */ - public Object getAdapter(Class adapter) { - if (adapter == IWorkbenchAdapter.class) return this; - return null; - } - - /** - * @see org.eclipse.ui.model.IWorkbenchAdapter#getChildren(java.lang.Object) - */ - public Object[] fetchChildren(Object o, IProgressMonitor monitor) throws TeamException { - return repository.members(CVSTag.DEFAULT, true /* module definitions */, monitor); - } - - /** - * @see org.eclipse.ui.model.IWorkbenchAdapter#getImageDescriptor(java.lang.Object) - */ - public ImageDescriptor getImageDescriptor(Object object) { - return CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_PROJECT_VERSION); - } - - /** - * @see org.eclipse.ui.model.IWorkbenchAdapter#getLabel(java.lang.Object) - */ - public String getLabel(Object o) { - return Policy.bind("ModulesCategory.label"); //$NON-NLS-1$ - } - - /** - * @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object) - */ - public Object getParent(Object o) { - return repository; - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.model.CVSModelElement#isRemoteElement() - */ - public boolean isRemoteElement() { - return true; - } - - /** - * Returns the repository. - * @return ICVSRepositoryLocation - */ - public ICVSRepositoryLocation getRepository() { - return repository; - } - - public String toString() { - return getRepository().toString() + " (modules)"; //$NON-NLS-1$ - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteContentProvider.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteContentProvider.java deleted file mode 100644 index 1cbeb0d3d..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteContentProvider.java +++ /dev/null @@ -1,107 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.model; - -import org.eclipse.jface.viewers.AbstractTreeViewer; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteResource; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.internal.ccvs.core.resources.RemoteResource; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.ui.IWorkingSet; -import org.eclipse.ui.model.WorkbenchContentProvider; -import org.eclipse.ui.progress.DeferredTreeContentManager; - -/** - * Extension to the generic workbench content provider mechanism - * to lazily determine whether an element has children. That is, - * children for an element aren't fetched until the user clicks - * on the tree expansion box. - */ -public class RemoteContentProvider extends WorkbenchContentProvider { - - IWorkingSet workingSet; - DeferredTreeContentManager manager; - - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) - */ - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - if (viewer instanceof AbstractTreeViewer) { - if(CVSUIPlugin.getPlugin().getPreferenceStore().getBoolean(ICVSUIConstants.BACKGROUND_REPOVIEW)) { - manager = new DeferredTreeContentManager(this, (AbstractTreeViewer) viewer); - } - } - super.inputChanged(viewer, oldInput, newInput); - } - - public boolean hasChildren(Object element) { - // the + box will always appear, but then disappear - // if not needed after you first click on it. - if (element instanceof ICVSRemoteResource) { - if (element instanceof ICVSRemoteFolder) { - return ((ICVSRemoteFolder) element).isExpandable(); - } - return ((ICVSRemoteResource) element).isContainer(); - } else if (element instanceof CVSResourceElement) { - ICVSResource r = ((CVSResourceElement) element).getCVSResource(); - if (r instanceof RemoteResource) { - return r.isFolder(); - } - } else if (element instanceof VersionCategory) { - return true; - } else if (element instanceof BranchCategory) { - return true; - } else if (element instanceof ModulesCategory) { - return true; - } else if (element instanceof CVSTagElement) { - return true; - } else if (element instanceof RemoteModule) { - return true; - } - if (manager != null) { - if (manager.isDeferredAdapter(element)) - return manager.mayHaveChildren(element); - } - - return super.hasChildren(element); - } - - /** - * Sets the workingSet. - * @param workingSet The workingSet to set - */ - public void setWorkingSet(IWorkingSet workingSet) { - this.workingSet = workingSet; - } - - /** - * Returns the workingSet. - * @return IWorkingSet - */ - public IWorkingSet getWorkingSet() { - return workingSet; - } - - /* (non-Javadoc) - * @see org.eclipse.ui.model.WorkbenchContentProvider#getChildren(java.lang.Object) - */ - public Object[] getChildren(Object element) { - if (manager != null) { - Object[] children = manager.getChildren(element); - if (children != null) - return children; - } - return super.getChildren(element); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteFileElement.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteFileElement.java deleted file mode 100644 index 1d77094f5..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteFileElement.java +++ /dev/null @@ -1,48 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.model; - - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFile; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.ui.PlatformUI; - -public class RemoteFileElement extends RemoteResourceElement { - /** - * Initial implementation: return null; - */ - public Object[] fetchChildren(Object o, IProgressMonitor monitor) { - return new Object[0]; - } - /** - * Initial implementation: return null. - */ - public ImageDescriptor getImageDescriptor(Object object) { - if (!(object instanceof ICVSRemoteFile)) return null; - return PlatformUI.getWorkbench().getEditorRegistry().getImageDescriptor(((ICVSRemoteFile)object).getName()); - } - /** - * Initial implementation: return the file's name and version - */ - public String getLabel(Object o) { - if (!(o instanceof ICVSRemoteFile)) return null; - ICVSRemoteFile file = (ICVSRemoteFile)o; - try { - return Policy.bind("nameAndRevision", file.getName(), file.getRevision()); //$NON-NLS-1$ - } catch (TeamException e) { - handle(e); - return null; - } - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteFolderElement.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteFolderElement.java deleted file mode 100644 index 17b95abce..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteFolderElement.java +++ /dev/null @@ -1,82 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.team.internal.ccvs.ui.model; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.jobs.ISchedulingRule; -import org.eclipse.jface.progress.IElementCollector; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.ui.ISharedImages; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.progress.IDeferredWorkbenchAdapter; - -public class RemoteFolderElement extends RemoteResourceElement implements IDeferredWorkbenchAdapter{ - - - /** - * Overridden to append the version name to remote folders which - * have version tags and are top-level folders. - */ - public String getLabel(Object o) { - if (!(o instanceof ICVSRemoteFolder)) - return null; - ICVSRemoteFolder folder = (ICVSRemoteFolder) o; - CVSTag tag = folder.getTag(); - if (tag != null && tag.getType() != CVSTag.HEAD) { - if (folder.getRemoteParent() == null) { - return Policy.bind("RemoteFolderElement.nameAndTag", folder.getName(), tag.getName()); //$NON-NLS-1$ - } - } - return folder.getName(); - } - - public ImageDescriptor getImageDescriptor(Object object) { - if (!(object instanceof ICVSRemoteFolder)) - return null; - ICVSRemoteFolder folder = (ICVSRemoteFolder) object; - if (folder.isDefinedModule()) { - return CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_MODULE); - } - return PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_OBJ_FOLDER); - } - - public Object[] fetchChildren(Object o, IProgressMonitor monitor) throws TeamException { - if (!(o instanceof ICVSRemoteFolder)) - return new Object[0]; - return ((ICVSRemoteFolder) o).members(monitor); - } - - public void fetchDeferredChildren(Object o, IElementCollector collector, IProgressMonitor monitor) { - try { - monitor = Policy.monitorFor(monitor); - monitor.beginTask(Policy.bind("RemoteFolderElement.fetchingRemoteChildren", getLabel(o)), 100); //$NON-NLS-1$ - collector.add(fetchChildren(o, Policy.subMonitorFor(monitor, 90)), Policy.subMonitorFor(monitor, 10)); - } catch (TeamException e) { - CVSUIPlugin.log(e); - } finally { - monitor.done(); - } - } - - public ISchedulingRule getRule() { - return new BatchSimilarSchedulingRule("org.eclipse.team.ui.cvs.remotefolderelement"); //$NON-NLS-1$ - } - - public boolean isContainer() { - return true; - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteModule.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteModule.java deleted file mode 100644 index e381d2cf1..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteModule.java +++ /dev/null @@ -1,152 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.model; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.jobs.ISchedulingRule; -import org.eclipse.jface.progress.IElementCollector; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.*; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.repo.RepositoryManager; -import org.eclipse.ui.model.IWorkbenchAdapter; -import org.eclipse.ui.progress.IDeferredWorkbenchAdapter; - -/** - * This class represents an IProject resource in a repository. The - * children of a RemoteModule are its versions. A RemoteModule is - * a child of the VersionsCategory. - */ -public class RemoteModule - extends CVSModelElement - implements IAdaptable, IDeferredWorkbenchAdapter { - ICVSRemoteFolder folder; - VersionCategory parent; - - /** - * RemoteProject constructor. - */ - public RemoteModule(ICVSRemoteFolder folder, VersionCategory parent) { - this.folder = folder; - this.parent = parent; - } - - /** - * Returns an object which is an instance of the given class - * associated with this object. Returns <code>null</code> if - * no such object can be found. - */ - public Object getAdapter(Class adapter) { - if (adapter == IWorkbenchAdapter.class) - return this; - if (adapter == IDeferredWorkbenchAdapter.class) - return this; - return null; - } - - /** - * Returns an image to be used for displaying an object in the desktop. - * @param object The object to get an image for. - * @param owner The viewer that the image will be used in. The image will - * be disposed when this viewer is closed. If the owner is null, a new - * image is returned, and the caller is responsible for disposing it. - */ - public ImageDescriptor getImageDescriptor(Object object) { - return CVSUIPlugin.getPlugin().getImageDescriptor( - ICVSUIConstants.IMG_PROJECT_VERSION); - } - - /** - * Returns the name of this element. This will typically - * be used to assign a label to this object when displayed - * in the UI. - */ - public String getLabel(Object o) { - return folder.getName(); - } - - /** - * Returns the logical parent of the given object in its tree. - */ - public Object getParent(Object o) { - return parent; - } - - /** - * Return the repository the given element belongs to. - */ - public ICVSRepositoryLocation getRepository(Object o) { - return folder.getRepository(); - } - - /** (Non-javadoc) - * For debugging purposes only. - */ - public String toString() { - return "RemoteModule(" + folder.getName() + ")"; //$NON-NLS-1$ //$NON-NLS-2$ - } - - public ICVSRemoteResource getCVSResource() { - return folder; - } - - /** - * Returns the children of this object. When this object - * is displayed in a tree, the returned objects will be this - * element's children. Returns an empty enumeration if this - * object has no children. The children of the RemoteModule - * are the versions for that module. - * - * @see org.eclipse.team.internal.ccvs.ui.model.CVSModelElement#internalGetChildren(java.lang.Object, org.eclipse.core.runtime.IProgressMonitor) - */ - public Object[] fetchChildren(Object o, IProgressMonitor monitor) - throws TeamException { - RepositoryManager manager = - CVSUIPlugin.getPlugin().getRepositoryManager(); - try { - manager.refreshDefinedTags(folder, false /* replace */ - , false, monitor); - } catch (TeamException e) { - // continue - } - CVSTag[] tags = - CVSUIPlugin.getPlugin().getRepositoryManager().getKnownTags( - folder, - CVSTag.VERSION); - Object[] versions = new Object[tags.length]; - for (int i = 0; i < versions.length; i++) { - versions[i] = folder.forTag(tags[i]); - } - return versions; - } - - public void fetchDeferredChildren( - Object o, - IElementCollector collector, - IProgressMonitor monitor) { - try { - collector.add(fetchChildren(o, monitor), monitor); - } catch (TeamException e) { - CVSUIPlugin.log(e); - } - } - - public boolean isContainer() { - return true; - } - - public ISchedulingRule getRule() { - return new BatchSimilarSchedulingRule("org.eclipse.team.ui.cvs.remotemodule"); //$NON-NLS-1$ - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteProjectsElement.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteProjectsElement.java deleted file mode 100644 index 3f75d89c0..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteProjectsElement.java +++ /dev/null @@ -1,87 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.model; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; - -/** - * This model element provides the remote projects for a given repository and - * tag. - */ -public class RemoteProjectsElement extends CVSTagElement { - - /** - * Constructor for RemoteProjectsElement. - */ - public RemoteProjectsElement() { - super(CVSTag.DEFAULT, null); - } - - /** - * Constructor for RemoteProjectsElement. - */ - public RemoteProjectsElement(ICVSRepositoryLocation root) { - super(CVSTag.DEFAULT, root); - } - - /** - * Sets the root. - * @param root The root to set - */ - public void setRoot(ICVSRepositoryLocation root) { - this.root = root; - } - - /** - * Sets the tag. - * @param tag The tag to set - */ - public void setTag(CVSTag tag) { - this.tag = tag; - } - /** - * @see java.lang.Object#equals(java.lang.Object) - */ - public boolean equals(Object o) { - if (!(o instanceof RemoteProjectsElement)) return false; - RemoteProjectsElement element = (RemoteProjectsElement)o; - if (root == null) { - return element.root == null && tag.equals(element.tag); - } - return super.equals(o); - } - - /** - * @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object) - */ - public Object getParent(Object o) { - return null; - } - - /** - * @see java.lang.Object#hashCode() - */ - public int hashCode() { - if (root == null) return tag.hashCode(); - return super.hashCode(); - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.model.CVSModelElement#internalGetChildren(java.lang.Object, org.eclipse.core.runtime.IProgressMonitor) - */ - public Object[] fetchChildren(Object o, IProgressMonitor monitor) throws TeamException { - if (root == null) return new Object[0]; - return super.fetchChildren(o, monitor); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteResourceElement.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteResourceElement.java deleted file mode 100644 index c70214163..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteResourceElement.java +++ /dev/null @@ -1,32 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.model; - - -import org.eclipse.team.internal.ccvs.core.ICVSRemoteResource; - -public abstract class RemoteResourceElement extends CVSModelElement { - /** - * Initial implementation: return the resource's name - */ - public String getLabel(Object o) { - if (!(o instanceof ICVSRemoteResource)) return null; - return ((ICVSRemoteResource)o).getName(); - } - /** - * Return null. - */ - public Object getParent(Object o) { - if (!(o instanceof ICVSRemoteResource)) return null; - ICVSRemoteResource rr = (ICVSRemoteResource)o; - return rr.getParent(); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteVersionModule.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteVersionModule.java deleted file mode 100644 index d81650861..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteVersionModule.java +++ /dev/null @@ -1,103 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.model; - - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.ui.model.IWorkbenchAdapter; - -/** - * This class represents an IProject resource in a repository. The - * children of a RemoteModule are its versions. A RemoteModule is - * a child of the VersionsCategory. - */ -public class RemoteVersionModule extends CVSModelElement implements IAdaptable { - CVSTag tag; - List projects = new ArrayList(); - GroupedByVersionCategory parent; - - /** - * RemoteProject constructor. - */ - public RemoteVersionModule(CVSTag tag, GroupedByVersionCategory parent) { - this.tag = tag; - this.parent = parent; - } - - /** - * Returns an object which is an instance of the given class - * associated with this object. Returns <code>null</code> if - * no such object can be found. - */ - public Object getAdapter(Class adapter) { - if (adapter == IWorkbenchAdapter.class) return this; - return null; - } - - public void addProject(ICVSRemoteFolder project) { - projects.add(project); - } - - /** - * Returns the children of this object. When this object - * is displayed in a tree, the returned objects will be this - * element's children. Returns an empty enumeration if this - * object has no children. The children of the RemoteModule - * are the versions for that module. - */ - public Object[] fetchChildren(Object o, IProgressMonitor monitor) { - return (ICVSRemoteFolder[]) projects.toArray(new ICVSRemoteFolder[projects.size()]); - } - - /** - * Returns an image to be used for displaying an object in the desktop. - * @param object The object to get an image for. - * @param owner The viewer that the image will be used in. The image will - * be disposed when this viewer is closed. If the owner is null, a new - * image is returned, and the caller is responsible for disposing it. - */ - public ImageDescriptor getImageDescriptor(Object object) { - return CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_PROJECT_VERSION); - } - - /** - * Returns the name of this element. This will typically - * be used to assign a label to this object when displayed - * in the UI. - */ - public String getLabel(Object o) { - return tag.getName(); - } - - /** - * Returns the logical parent of the given object in its tree. - */ - public Object getParent(Object o) { - return parent; - } - - - /** (Non-javadoc) - * For debugging purposes only. - */ - public String toString() { - return "RemoteVersionModule(" + tag.getName() + ")"; //$NON-NLS-1$ //$NON-NLS-2$ - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/VersionCategory.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/VersionCategory.java deleted file mode 100644 index 5a947514f..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/VersionCategory.java +++ /dev/null @@ -1,175 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.model; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.jobs.ISchedulingRule; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.progress.IElementCollector; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.*; -import org.eclipse.team.internal.ccvs.ui.*; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.ui.model.IWorkbenchAdapter; -import org.eclipse.ui.progress.IDeferredWorkbenchAdapter; - -public class VersionCategory - extends CVSModelElement - implements IAdaptable, IDeferredWorkbenchAdapter { - private ICVSRepositoryLocation repository; - - /** - * ProjectVersionsCategory constructor. - */ - public VersionCategory(ICVSRepositoryLocation repo) { - super(); - this.repository = repo; - } - - /** - * Returns an object which is an instance of the given class - * associated with this object. Returns <code>null</code> if - * no such object can be found. - */ - public Object getAdapter(Class adapter) { - if (adapter == IWorkbenchAdapter.class) - return this; - if (adapter == IDeferredWorkbenchAdapter.class) - return this; - return null; - } - - /** - * Returns the children of this object. When this object - * is displayed in a tree, the returned objects will be this - * element's children. Returns an empty enumeration if this - * object has no children. - */ - public Object[] fetchChildren(Object o, IProgressMonitor monitor) - throws TeamException { - if (CVSUIPlugin - .getPlugin() - .getRepositoryManager() - .isDisplayingProjectVersions(repository)) { - return getProjectVersionChildren(o, monitor); - } else { - return getVersionTagChildren(o, monitor); - } - } - - /* - * Return the children as a list of versions whose children are projects - */ - private Object[] getVersionTagChildren(Object o, IProgressMonitor monitor) - throws CVSException { - CVSTag[] tags = - CVSUIPlugin.getPlugin().getRepositoryManager().getKnownTags( - repository, - getWorkingSet(), - CVSTag.VERSION, - monitor); - CVSTagElement[] versionElements = new CVSTagElement[tags.length]; - for (int i = 0; i < tags.length; i++) { - versionElements[i] = new CVSTagElement(tags[i], repository); - } - return versionElements; - } - - /* - * Return the children as a list of projects whose children ar project versions - */ - private Object[] getProjectVersionChildren( - Object o, - IProgressMonitor monitor) - throws TeamException { - IPreferenceStore store = CVSUIPlugin.getPlugin().getPreferenceStore(); - ICVSRemoteResource[] resources = - CVSUIPlugin.getPlugin().getRepositoryManager().getFoldersForTag( - repository, - CVSTag.DEFAULT, - monitor); - if (getWorkingSet() != null) - resources = - CVSUIPlugin.getPlugin().getRepositoryManager().filterResources( - getWorkingSet(), - resources); - Object[] modules = new Object[resources.length]; - for (int i = 0; i < resources.length; i++) { - modules[i] = - new RemoteModule( - (ICVSRemoteFolder) resources[i], - VersionCategory.this); - } - return modules; - } - - /** - * Returns an image descriptor to be used for displaying an object in the workbench. - * Returns null if there is no appropriate image. - * - * @param object The object to get an image descriptor for. - */ - public ImageDescriptor getImageDescriptor(Object object) { - return CVSUIPlugin.getPlugin().getImageDescriptor( - ICVSUIConstants.IMG_VERSIONS_CATEGORY); - } - - /** - * Returns the name of this element. This will typically - * be used to assign a label to this object when displayed - * in the UI. Returns an empty string if there is no appropriate - * name for this object. - * - * @param object The object to get a label for. - */ - public String getLabel(Object o) { - return Policy.bind("VersionCategory.Versions_1"); //$NON-NLS-1$ - } - - /** - * Returns the logical parent of the given object in its tree. - * Returns null if there is no parent, or if this object doesn't - * belong to a tree. - * - * @param object The object to get the parent for. - */ - public Object getParent(Object o) { - return repository; - } - - /** - * Return the repository the given element belongs to. - */ - public ICVSRepositoryLocation getRepository(Object o) { - return repository; - } - - public void fetchDeferredChildren( - Object o, - IElementCollector collector, - IProgressMonitor monitor) { - try { - collector.add(fetchChildren(o, monitor), monitor); - } catch (TeamException e) { - CVSUIPlugin.log(e); - } - } - - public boolean isContainer() { - return true; - } - - public ISchedulingRule getRule() { - return new BatchSimilarSchedulingRule("org.eclipse.team.cvs.ui.versioncategory"); //$NON-NLS-1$ - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CVSOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CVSOperation.java deleted file mode 100644 index 27cd58399..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CVSOperation.java +++ /dev/null @@ -1,357 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.operations; - -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.MultiStatus; -import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.dialogs.ProgressMonitorDialog; -import org.eclipse.jface.operation.IRunnableContext; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSStatus; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.ui.PlatformUI; - - -/** - * This class is the abstract superclass for CVS operations. It provides - * error handling, prompting and other UI. - */ -public abstract class CVSOperation implements IRunnableWithProgress { - - private int statusCount; - - private boolean involvesMultipleResources = false; - - private List errors = new ArrayList(); // of IStatus - - protected static final IStatus OK = new CVSStatus(IStatus.OK, Policy.bind("ok")); // $NON-NLS-1$ - - private IRunnableContext runnableContext; - private Shell shell; - private boolean interruptable = true; - private boolean modifiesWorkspace = true; - - // instance variable used to indicate behavior while prompting for overwrite - private boolean confirmOverwrite = true; - - public static void run(Shell shell, CVSOperation operation) throws CVSException, InterruptedException { - operation.setShell(shell); - operation.setRunnableContext(new ProgressMonitorDialog(shell)); - operation.run(); - } - - /** - * @param shell - */ - public CVSOperation(Shell shell) { - this.shell = shell; - } - - /** - * Execute the operation in the given runnable context. If null is passed, - * the runnable context assigned to the operation is used. - * - * @throws InterruptedException - * @throws CVSException - */ - public void runInContext(IRunnableContext aRunnableContext) throws InterruptedException, CVSException { - if (aRunnableContext == null) { - aRunnableContext = getRunnableContext(); - } - try { - aRunnableContext.run(isInterruptable(), isInterruptable(), this); - } catch (InvocationTargetException e) { - throw CVSException.wrapException(e); - } catch (OperationCanceledException e) { - throw new InterruptedException(); - } - } - - protected void runAsJob() { - Job job = new Job(Policy.bind("CVSOperation.operationJobName", getTaskName())) { - public IStatus run(IProgressMonitor monitor) { - try { - CVSOperation.this.run(monitor); - return Status.OK_STATUS; - } catch (InvocationTargetException e) { - return CVSException.wrapException(e).getStatus(); - } catch (InterruptedException e) { - return Status.CANCEL_STATUS; - } - } - }; - job.schedule(); - } - - /** - * Run the operation. Progress feedback will be provided by one of the following mechanisms - * (in priotiry order): - * <ol> - * <li>the runnable context assigned to the operation - * <li>a background job (if supported by the operation and enabled through the preferences) - * <li>the workbench active page - * </ol> - * @throws CVSException - * @throws InterruptedException - */ - public synchronized void run() throws CVSException, InterruptedException { - if(canRunAsJob() && !hasRunnableContext() && areJobsEnabled()) { - runAsJob(); - } else { - runInContext(getRunnableContext()); - } - } - - protected boolean areJobsEnabled() { - return CVSUIPlugin.getPlugin().getPreferenceStore().getBoolean(ICVSUIConstants.BACKGROUND_OPERATIONS); - } - - /** - * Returns true if the operation can be run as a background job - * @return whether operation can be run as a job - */ - public boolean canRunAsJob() { - return false; - } - - /* (non-Javadoc) - * @see org.eclipse.jface.operation.IRunnableWithProgress#run(org.eclipse.core.runtime.IProgressMonitor) - */ - public final void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - startOperation(); - try { - if (isModifiesWorkspace()) { - new CVSWorkspaceModifyOperation(this).run(monitor); - } else { - execute(monitor); - } - endOperation(); - } catch (CVSException e) { - // TODO: errors may not be empty - throw new InvocationTargetException(e); - } - } - - protected void startOperation() { - statusCount = 0; - resetErrors(); - confirmOverwrite = true; - } - - protected void endOperation() throws CVSException { - handleErrors((IStatus[]) errors.toArray(new IStatus[errors.size()])); - } - - /** - * Subclasses must override to perform the operation - * @param monitor - * @throws CVSException - * @throws InterruptedException - */ - public abstract void execute(IProgressMonitor monitor) throws CVSException, InterruptedException; - - /** - * @return - */ - private IRunnableContext getRunnableContext() { - if (runnableContext == null) { - return PlatformUI.getWorkbench().getActiveWorkbenchWindow(); - } - return runnableContext; - } - - /** - * @param context - */ - public void setRunnableContext(IRunnableContext context) { - this.runnableContext = context; - } - - public boolean hasRunnableContext() { - return runnableContext != null; - } - - /** - * @return - */ - public Shell getShell() { - return shell; - } - - /** - * @param shell - */ - public void setShell(Shell shell) { - this.shell = shell; - } - - /** - * @return - */ - public boolean isInterruptable() { - return interruptable; - } - - /** - * @param b - */ - public void setInterruptable(boolean b) { - interruptable = b; - } - - /** - * @return - */ - public boolean isModifiesWorkspace() { - return modifiesWorkspace; - } - - /** - * @param b - */ - public void setModifiesWorkspace(boolean b) { - modifiesWorkspace = b; - } - - /** - * @param status - */ - protected void addError(IStatus status) { - if (status.isOK()) return; - errors.add(status); - } - - protected void collectStatus(IStatus status) { - statusCount++; - if (!status.isOK()) addError(status); - } - - /** - * - */ - protected void resetErrors() { - errors.clear(); - } - - /** - * @param statuses - */ - protected void handleErrors(IStatus[] errors) throws CVSException { - if (errors.length == 0) return; - if (errors.length == 1 && statusCount == 1) { - throw new CVSException(errors[0]); - } - MultiStatus result = new MultiStatus(CVSUIPlugin.ID, 0, getErrorMessage(errors, statusCount), null); - for (int i = 0; i < errors.length; i++) { - IStatus s = errors[i]; - if (s.isMultiStatus()) { - result.add(new CVSStatus(s.getSeverity(), s.getMessage(), s.getException())); - result.addAll(s); - } else { - result.add(s); - } - } - throw new CVSException(result); - } - - protected String getErrorMessage(IStatus[] failures, int totalOperations) { - return "Errors occured in " + failures.length + " of " + totalOperations + " operations."; - } - - /** - * This method prompts the user to overwrite an existing resource. It uses the - * <code>involvesMultipleResources</code> to determine what buttons to show. - * @param project - * @return - */ - protected boolean promptToOverwrite(String title, String msg) { - if (!confirmOverwrite) { - return true; - } - String buttons[]; - if (involvesMultipleResources()) { - buttons = new String[] { - IDialogConstants.YES_LABEL, - IDialogConstants.YES_TO_ALL_LABEL, - IDialogConstants.NO_LABEL, - IDialogConstants.CANCEL_LABEL}; - } else { - buttons = new String[] {IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL}; - } - Shell displayShell = getShell(); - final MessageDialog dialog = - new MessageDialog(displayShell, title, null, msg, MessageDialog.QUESTION, buttons, 0); - - // run in syncExec because callback is from an operation, - // which is probably not running in the UI thread. - displayShell.getDisplay().syncExec( - new Runnable() { - public void run() { - dialog.open(); - } - }); - if (involvesMultipleResources()) { - switch (dialog.getReturnCode()) { - case 0://Yes - return true; - case 1://Yes to all - confirmOverwrite = false; - return true; - case 2://No - return false; - case 3://Cancel - default: - throw new OperationCanceledException(); - } - } else { - return dialog.getReturnCode() == 0; - } - } - - /** - * This method is used by <code>promptToOverwrite</code> to determine which - * buttons to show in the prompter. - * - * @return - */ - protected boolean involvesMultipleResources() { - return involvesMultipleResources; - } - - /** - * @param b - */ - public void setInvolvesMultipleResources(boolean b) { - involvesMultipleResources = b; - } - - /** - * Return the string that is to be used as the task name for the operation - * - * @param remoteFolders - * @return - */ - protected abstract String getTaskName(); -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CVSWorkspaceModifyOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CVSWorkspaceModifyOperation.java deleted file mode 100644 index df4b79483..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CVSWorkspaceModifyOperation.java +++ /dev/null @@ -1,43 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.operations; - -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.ui.actions.WorkspaceModifyOperation; - -/** - * This class wraps a CVSOperation in a workspace modify operation. - * - */ -public class CVSWorkspaceModifyOperation extends WorkspaceModifyOperation { - - private CVSOperation operation; - - public CVSWorkspaceModifyOperation(CVSOperation operation) { - super(); - this.operation = operation; - } - - /* (non-Javadoc) - * @see org.eclipse.ui.actions.WorkspaceModifyOperation#execute(org.eclipse.core.runtime.IProgressMonitor) - */ - synchronized protected void execute(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException { - try { - operation.execute(monitor); - } catch (CVSException e) { - throw new InvocationTargetException(e); - } - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutMultipleProjectsOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutMultipleProjectsOperation.java deleted file mode 100644 index 3cab1de2f..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutMultipleProjectsOperation.java +++ /dev/null @@ -1,58 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.operations; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IPath; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder; -import org.eclipse.team.internal.ccvs.ui.Policy; - -/** - * This operation checks out a multiple remote folders into the workspace. - * Each one will become a new project (overwritting any exsiting projects - * with the same name). - */ -public class CheckoutMultipleProjectsOperation extends CheckoutProjectOperation { - - boolean hasTargetLocation; - - public CheckoutMultipleProjectsOperation(Shell shell, ICVSRemoteFolder[] remoteFolders, String targetLocation) { - super(shell, remoteFolders, targetLocation); - hasTargetLocation = targetLocation != null; - setInvolvesMultipleResources(remoteFolders.length > 1); - } - - /** - * Return the target location where the given project should be located or - * null if the default location should be used. - * - * @param project - */ - protected IPath getTargetLocationFor(IProject project) { - IPath targetLocation = super.getTargetLocationFor(project); - if (targetLocation == null) return null; - return targetLocation.append(project.getName()); - } - - protected String getTaskName() { - ICVSRemoteFolder[] remoteFolders = getRemoteFolders(); - return Policy.bind("CheckoutMultipleProjectsOperation.taskName", new Integer(remoteFolders.length).toString()); //$NON-NLS-1$ - } - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.operations.CheckoutProjectOperation#getTargetProjects(org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder[]) - */ - protected IProject[] getTargetProjects(ICVSRemoteFolder[] folders) { - return null; - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutSingleProjectOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutSingleProjectOperation.java deleted file mode 100644 index bbef990ce..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutSingleProjectOperation.java +++ /dev/null @@ -1,71 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.operations; - -import org.eclipse.core.resources.IProject; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder; -import org.eclipse.team.internal.ccvs.ui.Policy; - -/** - * This operation checks out a single remote folder into the workspace as - * a project. - */ -public class CheckoutSingleProjectOperation extends CheckoutProjectOperation { - - private boolean preconfigured; - private ICVSRemoteFolder remoteFolder; - private IProject targetProject; - - public CheckoutSingleProjectOperation(Shell shell, ICVSRemoteFolder remoteFolder, IProject targetProject, String targetLocation, boolean preconfigured) { - super(shell, new ICVSRemoteFolder[] { remoteFolder }, targetLocation); - this.targetProject = targetProject; - this.preconfigured = preconfigured; - } - - /** - * @return - */ - private String getRemoteFolderName() { - return getRemoteFolders()[0].getName(); - } - - /** - * @return - */ - private boolean isPreconfigured() { - return preconfigured; - } - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.operations.CheckoutOperation#needsPromptForOverwrite(org.eclipse.core.resources.IProject) - */ - public boolean needsPromptForOverwrite(IProject project) { - // No need to prompt if the project was preconfigured - if (isPreconfigured()) return false; - return super.needsPromptForOverwrite(project); - } - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getTaskName() - */ - protected String getTaskName() { - return Policy.bind("CheckoutSingleProjectOperation.taskname", getRemoteFolderName(), targetProject.getName()); //$NON-NLS-1$ - } - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.operations.CheckoutOperation#getTargetProjects(org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder[]) - */ - protected IProject[] getTargetProjects(ICVSRemoteFolder[] remoteFolders) { - return new IProject[] { targetProject }; - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/HasProjectMetaFileOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/HasProjectMetaFileOperation.java deleted file mode 100644 index 962696441..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/HasProjectMetaFileOperation.java +++ /dev/null @@ -1,96 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.operations; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.operation.IRunnableContext; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder; -import org.eclipse.team.internal.ccvs.ui.Policy; - -/** - * Operation which checks for the existance of the .project file (or .vcm_meta file) - * in a remote folder. The operation can be run using the <code>hasMetaFile</code> - * static method of by executing the operation and then checking <code>metaFileExists</code> - */ -public class HasProjectMetaFileOperation extends CVSOperation { - - private ICVSRemoteFolder remoteFolder; - private boolean metaFileExists; - - public static boolean hasMetaFile(Shell shell, ICVSRemoteFolder remoteFolder, IRunnableContext runnableContext) throws CVSException, InterruptedException { - HasProjectMetaFileOperation op = new HasProjectMetaFileOperation(shell, remoteFolder); - if (runnableContext != null) { - op.setRunnableContext(runnableContext); - } - op.run(); - return op.metaFileExists(); - } - - public HasProjectMetaFileOperation(Shell shell, ICVSRemoteFolder remoteFolder) { - super(shell); - this.remoteFolder = remoteFolder; - } - - /* - * Return true if the provided remote folder contains a valid meta-file - * (i.e. .project or the older .vcm_meta file). - */ - private boolean hasMetaFile(ICVSRemoteFolder folder, IProgressMonitor monitor) throws CVSException { - - // make a copy of the folder so that we will not effect the original folder when we refetch the members - // TODO: this is a strang thing to need to do. We shold fix this. - folder = (ICVSRemoteFolder)folder.forTag(remoteFolder.getTag()); - - try { - folder.members(monitor); - } catch (TeamException e) { - throw CVSException.wrapException(e); - } - // Check for the existance of the .project file - try { - folder.getFile(".project"); //$NON-NLS-1$ - return true; - } catch (TeamException e) { - // We couldn't retrieve the meta file so assume it doesn't exist - } - // If the above failed, look for the old .vcm_meta file - try { - folder.getFile(".vcm_meta"); //$NON-NLS-1$ - return true; - } catch (TeamException e) { - // We couldn't retrieve the meta file so assume it doesn't exist - } - return false; - } - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#execute(org.eclipse.core.runtime.IProgressMonitor) - */ - public void execute(IProgressMonitor monitor) throws CVSException, InterruptedException { - metaFileExists = hasMetaFile(remoteFolder, monitor); - } - - /** - * Return true if the meta file exists remotely. This method should only be invoked - * after the operation has been executed; - * @return - */ - public boolean metaFileExists() { - return metaFileExists; - } - - protected String getTaskName() { - return Policy.bind("HasProjectMetaFile.taskName"); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ITagOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ITagOperation.java deleted file mode 100644 index 2e1bd46df..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ITagOperation.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.operations; - -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSResource; - -public interface ITagOperation { - public abstract CVSTag getTag(); - public abstract void setTag(CVSTag tag); - public abstract void run() throws CVSException, InterruptedException; - public abstract ICVSResource[] getCVSResources(); - public abstract void moveTag(); - public abstract void recurse(); -}
\ No newline at end of file diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteOperation.java deleted file mode 100644 index ad3659440..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteOperation.java +++ /dev/null @@ -1,38 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.operations; - -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteResource; -import org.eclipse.team.internal.ccvs.core.ICVSResource; - -public abstract class RemoteOperation extends CVSOperation { - - private ICVSRemoteResource[] remoteResources; - - protected RemoteOperation(Shell shell, ICVSRemoteResource[] remoteResources) { - super(shell); - this.remoteResources =remoteResources; - } - - protected ICVSRemoteResource[] getRemoteResources() { - return remoteResources; - } - - public ICVSResource[] getCVSResources() { - ICVSResource[] cvsResources = new ICVSResource[remoteResources.length]; - for (int i = 0; i < remoteResources.length; i++) { - cvsResources[i] = remoteResources[i]; - } - return cvsResources; - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ReplaceOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ReplaceOperation.java deleted file mode 100644 index cb05dc3c1..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ReplaceOperation.java +++ /dev/null @@ -1,146 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.operations; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSStatus; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.CVSTeamProvider; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.internal.ccvs.core.ICVSRunnable; -import org.eclipse.team.internal.ccvs.core.client.Command; -import org.eclipse.team.internal.ccvs.core.client.Session; -import org.eclipse.team.internal.ccvs.core.client.Update; -import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption; -import org.eclipse.team.internal.ccvs.core.connection.CVSServerException; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.core.util.PrepareForReplaceVisitor; -import org.eclipse.team.internal.ccvs.core.util.ReplaceWithBaseVisitor; -import org.eclipse.team.internal.ccvs.ui.Policy; - -/** - * Thsi operation replaces the local resources with their remote contents - */ -public class ReplaceOperation extends RepositoryProviderOperation { - - boolean recurse = true; - - public ReplaceOperation(Shell shell, IResource[] resources, boolean recurse) { - super(shell, resources); - this.recurse = recurse; - } - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getTaskName() - */ - protected String getTaskName() { - return Policy.bind("ReplaceOperation.taskName"); //$NON-NLS-1$ - } - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#execute(org.eclipse.team.internal.ccvs.core.CVSTeamProvider, org.eclipse.core.resources.IResource[], org.eclipse.core.runtime.IProgressMonitor) - */ - protected void execute(CVSTeamProvider provider, IResource[] resources, IProgressMonitor monitor) throws CVSException, InterruptedException { - get(provider, resources, null, monitor); - } - - public void get(final CVSTeamProvider provider, final IResource[] resources, final CVSTag tag, IProgressMonitor progress) throws CVSException { - - // Handle the retrival of the base in a special way - if (tag != null && tag.equals(CVSTag.BASE)) { - new ReplaceWithBaseVisitor().replaceWithBase( - provider.getProject(), - resources, - recurse ? IResource.DEPTH_INFINITE : IResource.DEPTH_ZERO, - progress); - return; - } - - // Make a connection before preparing for the replace to avoid deletion of resources before a failed connection - CVSWorkspaceRoot workspaceRoot = provider.getCVSWorkspaceRoot(); - Session.run(workspaceRoot.getRemoteLocation(), workspaceRoot.getLocalRoot(), true /* output to console */, - new ICVSRunnable() { - public void run(IProgressMonitor progress) throws CVSException { - // Prepare for the replace (special handling for "cvs added" and "cvs removed" resources - progress.beginTask(null, 100); - try { - new PrepareForReplaceVisitor().visitResources( - provider.getProject(), - resources, - "CVSTeamProvider.scrubbingResource", // TODO: This is a key in CVS core! //$NON-NLS-1$ - recurse ? IResource.DEPTH_INFINITE : IResource.DEPTH_ZERO, - Policy.subMonitorFor(progress, 30)); //$NON-NLS-1$ - - // Perform an update, ignoring any local file modifications - List options = new ArrayList(); - options.add(Update.IGNORE_LOCAL_CHANGES); - if(!recurse) { - options.add(Command.DO_NOT_RECURSE); - } - LocalOption[] commandOptions = (LocalOption[]) options.toArray(new LocalOption[options.size()]); - try { - update(provider, resources, commandOptions, tag, true /*createBackups*/, Policy.subMonitorFor(progress, 70)); - } catch (TeamException e) { - throw CVSException.wrapException(e); - } - } finally { - progress.done(); - } - } - }, progress); - } - - /** - * Generally useful update. - * - * The tag parameter determines any stickyness after the update is run. If tag is null, any tagging on the - * resources being updated remain the same. If the tag is a branch, version or date tag, then the resources - * will be appropriatly tagged. If the tag is HEAD, then there will be no tag on the resources (same as -A - * clear sticky option). - * - * @param createBackups if true, creates .# files for updated files - */ - public void update(final CVSTeamProvider provider, IResource[] resources, LocalOption[] options, CVSTag tag, final boolean createBackups, IProgressMonitor progress) throws CVSException { - // Build the local options - List localOptions = new ArrayList(); - - // Use the appropriate tag options - if (tag != null) { - localOptions.add(Update.makeTagOption(tag)); - } - - // Build the arguments list - localOptions.addAll(Arrays.asList(options)); - final LocalOption[] commandOptions = (LocalOption[])localOptions.toArray(new LocalOption[localOptions.size()]); - final ICVSResource[] arguments = getCVSArguments(resources); - - CVSWorkspaceRoot workspaceRoot = provider.getCVSWorkspaceRoot(); - Session.run(workspaceRoot.getRemoteLocation(), workspaceRoot.getLocalRoot(), true /* output to console */, - new ICVSRunnable() { - public void run(IProgressMonitor monitor) throws CVSException { - IStatus status = Command.UPDATE.execute(Command.NO_GLOBAL_OPTIONS, commandOptions, arguments, - null, monitor); - if (status.getCode() == CVSStatus.SERVER_ERROR) { - throw new CVSServerException(status); - } - } - }, progress); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RepositoryProviderOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RepositoryProviderOperation.java deleted file mode 100644 index e337197e7..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RepositoryProviderOperation.java +++ /dev/null @@ -1,149 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.operations; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.SubProgressMonitor; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.core.RepositoryProvider; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; -import org.eclipse.team.internal.ccvs.core.CVSTeamProvider; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.internal.ccvs.core.client.Session; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; - -/** - * Performs a cvs operation on multiple repository providers - */ -public abstract class RepositoryProviderOperation extends CVSOperation { - - private IResource[] resources; - - /** - * @param shell - */ - public RepositoryProviderOperation(Shell shell, IResource[] resources) { - super(shell); - this.resources = resources; - } - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#execute(org.eclipse.core.runtime.IProgressMonitor) - */ - public void execute(IProgressMonitor monitor) throws CVSException, InterruptedException { - Map table = getProviderMapping(getResources()); - Set keySet = table.keySet(); - monitor.beginTask("", keySet.size() * 1000); - monitor.setTaskName(getTaskName()); - Iterator iterator = keySet.iterator(); - while (iterator.hasNext()) { - IProgressMonitor subMonitor = new SubProgressMonitor(monitor, 1000); - CVSTeamProvider provider = (CVSTeamProvider)iterator.next(); - List list = (List)table.get(provider); - IResource[] providerResources = (IResource[])list.toArray(new IResource[list.size()]); - execute(provider, providerResources, subMonitor); - } - - } - - /* - * Helper method. Return a Map mapping provider to a list of resources - * shared with that provider. - */ - private Map getProviderMapping(IResource[] resources) { - Map result = new HashMap(); - for (int i = 0; i < resources.length; i++) { - RepositoryProvider provider = RepositoryProvider.getProvider(resources[i].getProject(), CVSProviderPlugin.getTypeId()); - List list = (List)result.get(provider); - if (list == null) { - list = new ArrayList(); - result.put(provider, list); - } - list.add(resources[i]); - } - return result; - } - - /** - * Return the resources that the operation is being performed on - * @return - */ - protected IResource[] getResources() { - return resources; - } - - /** - * Set the resources that the operation is to be performed on - * @param resources - */ - protected void setResources(IResource[] resources) { - this.resources = resources; - } - - /** - * Return the task name associated with the operation. This task name - * will appear in progress feedback presented to the user. - * @return - */ - protected abstract String getTaskName(); - - /** - * Execute the operation on the resources for the given provider. - * @param provider - * @param providerResources - * @param subMonitor - * @throws CVSException - * @throws InterruptedException - */ - protected abstract void execute(CVSTeamProvider provider, IResource[] resources, IProgressMonitor monitor) throws CVSException, InterruptedException; - - protected ICVSResource[] getCVSArguments(IResource[] resources) { - ICVSResource[] cvsResources = new ICVSResource[resources.length]; - for (int i = 0; i < cvsResources.length; i++) { - cvsResources[i] = CVSWorkspaceRoot.getCVSResourceFor(resources[i]); - } - return cvsResources; - } - - /* - * Get the arguments to be passed to a commit or update - */ - protected String[] getStringArguments(IResource[] resources) throws CVSException { - List arguments = new ArrayList(resources.length); - for (int i=0;i<resources.length;i++) { - IPath cvsPath = resources[i].getFullPath().removeFirstSegments(1); - if (cvsPath.segmentCount() == 0) { - arguments.add(Session.CURRENT_LOCAL_FOLDER); - } else { - arguments.add(cvsPath.toString()); - } - } - return (String[])arguments.toArray(new String[arguments.size()]); - } - - public ICVSResource[] getCVSResources() { - ICVSResource[] cvsResources = new ICVSResource[resources.length]; - for (int i = 0; i < resources.length; i++) { - cvsResources[i] = CVSWorkspaceRoot.getCVSResourceFor(resources[i]); - } - return cvsResources; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagInRepositoryOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagInRepositoryOperation.java deleted file mode 100644 index 1b1faea3b..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagInRepositoryOperation.java +++ /dev/null @@ -1,105 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.operations; - -import java.util.HashSet; -import java.util.Set; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.SubProgressMonitor; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteResource; -import org.eclipse.team.internal.ccvs.core.client.Command; -import org.eclipse.team.internal.ccvs.core.client.RTag; -import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption; -import org.eclipse.team.internal.ccvs.ui.Policy; - - -public class TagInRepositoryOperation extends RemoteOperation implements ITagOperation { - - private Set localOptions = new HashSet(); - private CVSTag tag; - - public TagInRepositoryOperation(Shell shell, ICVSRemoteResource[] remoteResource) { - super(shell, remoteResource); - } - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#execute(org.eclipse.core.runtime.IProgressMonitor) - */ - public void execute(IProgressMonitor monitor) throws CVSException, InterruptedException { - ICVSRemoteResource[] resources = getRemoteResources(); - monitor.beginTask(null, 1000 * resources.length); - for (int i = 0; i < resources.length; i++) { - IStatus status = resources[i].tag(getTag(), getLocalOptions(), new SubProgressMonitor(monitor, 1000)); - collectStatus(status); - } - } - - /** - * Override to dislay the number of tag operations that succeeded - */ - protected String getErrorMessage(IStatus[] problems, int operationCount) { - if(operationCount == 1) { - return Policy.bind("TagInRepositoryAction.tagProblemsMessage"); //$NON-NLS-1$ - } else { - return Policy.bind("TagInRepositoryAction.tagProblemsMessageMultiple", //$NON-NLS-1$ - Integer.toString(operationCount - problems.length), Integer.toString(problems.length)); - } - } - - private LocalOption[] getLocalOptions() { - return (LocalOption[]) localOptions.toArray(new LocalOption[localOptions.size()]); - } - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.operations.ITagOperation#getTag() - */ - public CVSTag getTag() { - return tag; - } - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.operations.ITagOperation#setTag(org.eclipse.team.internal.ccvs.core.CVSTag) - */ - public void setTag(CVSTag tag) { - this.tag = tag; - } - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.operations.ITagOperation#addLocalOption(org.eclipse.team.internal.ccvs.core.client.Command.LocalOption) - */ - public void addLocalOption(LocalOption option) { - localOptions.add(option); - } - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.operations.ITagOperation#moveTag() - */ - public void moveTag() { - addLocalOption(RTag.FORCE_REASSIGNMENT); - addLocalOption(RTag.CLEAR_FROM_REMOVED); - } - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.operations.ITagOperation#recurse() - */ - public void recurse() { - addLocalOption(Command.DO_NOT_RECURSE); - } - - protected String getTaskName() { - return Policy.bind("TagFromRepository.taskName"); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagOperation.java deleted file mode 100644 index 13f9651da..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagOperation.java +++ /dev/null @@ -1,127 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.operations; - -import java.util.HashSet; -import java.util.Set; - -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.MultiStatus; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.CVSTeamProvider; -import org.eclipse.team.internal.ccvs.core.client.Command; -import org.eclipse.team.internal.ccvs.core.client.Session; -import org.eclipse.team.internal.ccvs.core.client.Tag; -import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.ui.Policy; - -public class TagOperation extends RepositoryProviderOperation implements ITagOperation { - - private Set localOptions = new HashSet(); - private CVSTag tag; - - public TagOperation(Shell shell, IResource[] resources) { - super(shell, resources); - } - - public CVSTag getTag() { - return tag; - } - - public void setTag(CVSTag tag) { - this.tag = tag; - } - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#execute(org.eclipse.team.internal.ccvs.core.CVSTeamProvider, org.eclipse.core.resources.IResource[], org.eclipse.core.runtime.IProgressMonitor) - */ - protected void execute(CVSTeamProvider provider, IResource[] resources, IProgressMonitor monitor) throws CVSException, InterruptedException { - collectStatus(tag(provider, resources, monitor)); - } - - /** - * Override to dislay the number of tag operations that succeeded - */ - protected String getErrorMessage(IStatus[] problems, int operationCount) { - // We accumulated 1 status per resource above. - MultiStatus combinedStatus; - if(operationCount == 1) { - return Policy.bind("TagAction.tagProblemsMessage"); //$NON-NLS-1$ - } else { - return Policy.bind("TagAction.tagProblemsMessageMultiple", //$NON-NLS-1$ - Integer.toString(operationCount - problems.length), Integer.toString(problems.length)); - } - } - - /** - * Tag the resources in the CVS repository with the given tag. - * - * The returned IStatus will be a status containing any errors or warnings. - * If the returned IStatus is a multi-status, the code indicates the severity. - * Possible codes are: - * CVSStatus.OK - Nothing to report - * CVSStatus.SERVER_ERROR - The server reported an error - * any other code - warning messages received from the server - */ - public IStatus tag(CVSTeamProvider provider, IResource[] resources, IProgressMonitor progress) throws CVSException { - - LocalOption[] commandOptions = (LocalOption[])localOptions.toArray(new LocalOption[localOptions.size()]); - - // Build the arguments list - String[] arguments = getStringArguments(resources); - - // Execute the command - CVSWorkspaceRoot root = provider.getCVSWorkspaceRoot(); - Session s = new Session(root.getRemoteLocation(), root.getLocalRoot()); - progress.beginTask(null, 100); - try { - // Opening the session takes 20% of the time - s.open(Policy.subMonitorFor(progress, 20)); - return Command.TAG.execute(s, - Command.NO_GLOBAL_OPTIONS, - commandOptions, - tag, - arguments, - null, - Policy.subMonitorFor(progress, 80)); - } finally { - s.close(); - progress.done(); - } - } - - public void addLocalOption(LocalOption option) { - localOptions.add(option); - } - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.operations.ITagOperation#moveTag() - */ - public void moveTag() { - addLocalOption(Tag.FORCE_REASSIGNMENT); - } - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.operations.ITagOperation#recurse() - */ - public void recurse() { - addLocalOption(Command.DO_NOT_RECURSE); - } - - protected String getTaskName() { - return Policy.bind("TagFromWorkspace.taskName"); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOnlyMergableOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOnlyMergableOperation.java deleted file mode 100644 index 2da01dc8b..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOnlyMergableOperation.java +++ /dev/null @@ -1,86 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.operations; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSTeamProvider; -import org.eclipse.team.internal.ccvs.core.ICVSRunnable; -import org.eclipse.team.internal.ccvs.core.client.Command; -import org.eclipse.team.internal.ccvs.core.client.Session; -import org.eclipse.team.internal.ccvs.core.client.UpdateMergableOnly; -import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.ui.Policy; - -/** - * This operation performs an update that will only effect files - * that have no conflicts or automergable conflicts. - */ -public class UpdateOnlyMergableOperation extends RepositoryProviderOperation { - - private LocalOption[] localOptions; - - List skippedFiles = new ArrayList(); - - public UpdateOnlyMergableOperation(Shell shell, IResource[] resources, LocalOption[] localOptions) { - super(shell, resources); - this.localOptions = localOptions; - } - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#getTaskName() - */ - protected String getTaskName() { - return Policy.bind("UpdateOnlyMergeable.taskName"); - } - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#execute(org.eclipse.team.internal.ccvs.core.CVSTeamProvider, org.eclipse.core.resources.IResource[], org.eclipse.core.runtime.IProgressMonitor) - */ - protected void execute(CVSTeamProvider provider, final IResource[] resources, IProgressMonitor monitor) throws CVSException, InterruptedException { - CVSWorkspaceRoot workspaceRoot = provider.getCVSWorkspaceRoot(); - Session.run(workspaceRoot.getRemoteLocation(), workspaceRoot.getLocalRoot(), true /* output to console */, - new ICVSRunnable() { - public void run(IProgressMonitor monitor) throws CVSException { - UpdateMergableOnly update = new UpdateMergableOnly(); - IStatus status = update.execute( - Command.NO_GLOBAL_OPTIONS, - localOptions, - getCVSArguments(resources), - null, - monitor); - if (status.getCode() != IStatus.ERROR) { - addSkippedFiles(update.getSkippedFiles()); - } else { - addError(status); - } - } - }, monitor); - - } - - protected void addSkippedFiles(IFile[] files) { - skippedFiles.addAll(Arrays.asList(files)); - } - - public IFile[] getSkippedFiles() { - return (IFile[]) skippedFiles.toArray(new IFile[skippedFiles.size()]); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/AddToBranchAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/AddToBranchAction.java deleted file mode 100644 index 4c513f624..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/AddToBranchAction.java +++ /dev/null @@ -1,93 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.repo; - -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Path; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.dialogs.IInputValidator; -import org.eclipse.jface.dialogs.InputDialog; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ccvs.ui.actions.CVSAction; - -/** - * Action to add a root remote folder to a branch - */ -public class AddToBranchAction extends CVSAction { - - IInputValidator validator = new IInputValidator() { - public String isValid(String newText) { - IStatus status = CVSTag.validateTagName(newText); - if (status.isOK()) return null; - return status.getMessage(); - } - }; - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#execute(org.eclipse.jface.action.IAction) - */ - protected void execute(IAction action) throws InvocationTargetException, InterruptedException { - run(new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException { - final ICVSRemoteFolder folder = getSelectedRootFolder(); - if (folder == null) return; - Shell shell = getShell(); - final CVSException[] exception = new CVSException[] { null }; - shell.getDisplay().syncExec(new Runnable() { - public void run() { - InputDialog dialog = new InputDialog(getShell(), Policy.bind("AddToBranchAction.enterTag"), Policy.bind("AddToBranchAction.enterTagLong"), null, validator); //$NON-NLS-1$ //$NON-NLS-2$ - if (dialog.open() == InputDialog.OK) { - CVSTag tag = new CVSTag(dialog.getValue(), CVSTag.BRANCH); - try { - CVSUIPlugin.getPlugin().getRepositoryManager().addTags(folder, new CVSTag[] {tag}); - } catch (CVSException e) { - exception[0] = e; - } - } - } - }); - if (exception[0] != null) - throw new InvocationTargetException(exception[0]); - } - }, false, PROGRESS_BUSYCURSOR); //$NON-NLS-1$ - } - - /** - * @see org.eclipse.team.internal.ui.actions.TeamAction#isEnabled() - */ - protected boolean isEnabled() throws TeamException { - return getSelectedRootFolder() != null; - } - - protected ICVSRemoteFolder getSelectedRootFolder() { - ICVSRemoteFolder[] folders = getSelectedRemoteFolders(); - ICVSRemoteFolder selectedFolder = null; - for (int i = 0; i < folders.length; i++) { - ICVSRemoteFolder folder = folders[i]; - if (folder.isDefinedModule() || new Path(folder.getRepositoryRelativePath()).segmentCount()==1) { - // only return a folder if one valid one is selected. - if (selectedFolder != null) return null; - selectedFolder = folder; - } - } - return selectedFolder; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSRepositoryPropertiesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSRepositoryPropertiesPage.java deleted file mode 100644 index d5d083f80..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSRepositoryPropertiesPage.java +++ /dev/null @@ -1,508 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.repo; - -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.dialogs.ProgressMonitorDialog; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Combo; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Text; -import org.eclipse.team.core.RepositoryProvider; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; -import org.eclipse.team.internal.ccvs.core.CVSTeamProvider; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.core.IConnectionMethod; -import org.eclipse.team.internal.ccvs.core.IUserInfo; -import org.eclipse.team.internal.ccvs.core.connection.CVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ui.dialogs.DetailsDialogWithProjects; -import org.eclipse.ui.actions.WorkspaceModifyOperation; -import org.eclipse.ui.dialogs.PropertyPage; -import org.eclipse.ui.help.WorkbenchHelp; - -public class CVSRepositoryPropertiesPage extends PropertyPage { - ICVSRepositoryLocation location; - - // Widgets - Text userText; - Text passwordText; - Combo methodType; - Label hostLabel; - Label pathLabel; - Label portLabel; - - boolean passwordChanged; - boolean connectionInfoChanged; - boolean programNameChanged; - boolean labelChanged; - - IUserInfo info; - - // Program Name - private Text programNameText; - private Button useDefaultProgramName; - private Button useCustomProgramName; - // Label - private Button useLocationAsLabel; - private Button useCustomLabel; - private Text labelText; - - /* - * @see PreferencesPage#createContents - */ - protected Control createContents(Composite parent) { - initialize(); - - Composite composite = new Composite(parent, SWT.NULL); - composite.setLayoutData(new GridData(GridData.FILL_BOTH)); - GridLayout layout = new GridLayout(); - layout.numColumns = 3; - composite.setLayout(layout); - - // Repository Label - // create a composite to ensure the radio buttons come in the correct order - Composite labelGroup = new Composite(composite, SWT.NONE); - GridData data = new GridData(); - data.horizontalSpan = 3; - labelGroup.setLayoutData(data); - layout = new GridLayout(); - layout.numColumns = 3; - layout.marginHeight = 0; - layout.marginWidth = 0; - labelGroup.setLayout(layout); - Listener labelListener = new Listener() { - public void handleEvent(Event event) { - labelChanged = true; - updateWidgetEnablements(); - } - }; - useLocationAsLabel = createRadioButton(labelGroup, Policy.bind("CVSRepositoryPropertiesPage.useLocationAsLabel"), 3); //$NON-NLS-1$ - useCustomLabel = createRadioButton(labelGroup, Policy.bind("CVSRepositoryPropertiesPage.useCustomLabel"), 1); //$NON-NLS-1$ - useCustomLabel.addListener(SWT.Selection, labelListener); - labelText = createTextField(labelGroup); - labelText.addListener(SWT.Modify, labelListener); - - // Add some extra space - createLabel(composite, "", 3); //$NON-NLS-1$ - - Label label = createLabel(composite, Policy.bind("CVSPropertiesPage.connectionType"), 1); //$NON-NLS-1$ - methodType = createCombo(composite); - - label = createLabel(composite, Policy.bind("CVSPropertiesPage.user"), 1); //$NON-NLS-1$ - userText = createTextField(composite); - - label = createLabel(composite, Policy.bind("CVSPropertiesPage.password"), 1); //$NON-NLS-1$ - passwordText = createPasswordField(composite); - - label = createLabel(composite, Policy.bind("CVSPropertiesPage.host"), 1); //$NON-NLS-1$ - hostLabel = createLabel(composite, "", 2); //$NON-NLS-1$ - - label = createLabel(composite, Policy.bind("CVSPropertiesPage.port"), 1); //$NON-NLS-1$ - portLabel = createLabel(composite, "", 2); //$NON-NLS-1$ - - label = createLabel(composite, Policy.bind("CVSPropertiesPage.path"), 1); //$NON-NLS-1$ - pathLabel = createLabel(composite, "", 2); //$NON-NLS-1$ - - // Add some extra space - createLabel(composite, "", 3); //$NON-NLS-1$ - - // Remote CVS program name - // create a composite to ensure the radio buttons come in the correct order - Composite programNameGroup = new Composite(composite, SWT.NONE); - data = new GridData(); - data.horizontalSpan = 3; - programNameGroup.setLayoutData(data); - layout = new GridLayout(); - layout.numColumns = 3; - layout.marginHeight = 0; - layout.marginWidth = 0; - programNameGroup.setLayout(layout); - Listener programNameListener = new Listener() { - public void handleEvent(Event event) { - programNameChanged = true; - updateWidgetEnablements(); - } - }; - useDefaultProgramName = createRadioButton(programNameGroup, Policy.bind("CVSRepositoryPropertiesPage.useDefaultProgramName"), 3); //$NON-NLS-1$ - useCustomProgramName = createRadioButton(programNameGroup, Policy.bind("CVSRepositoryPropertiesPage.useProgramName"), 1); //$NON-NLS-1$ - useCustomProgramName.addListener(SWT.Selection, programNameListener); - programNameText = createTextField(programNameGroup); - programNameText.addListener(SWT.Modify, programNameListener); - - initializeValues(); - updateWidgetEnablements(); - passwordText.addListener(SWT.Modify, new Listener() { - public void handleEvent(Event event) { - passwordChanged = true; - } - }); - userText.addListener(SWT.Modify, new Listener() { - public void handleEvent(Event event) { - connectionInfoChanged = true; - } - }); - methodType.addListener(SWT.Modify, new Listener() { - public void handleEvent(Event event) { - connectionInfoChanged = true; - } - }); - WorkbenchHelp.setHelp(getControl(), IHelpContextIds.REPOSITORY_LOCATION_PROPERTY_PAGE); - return composite; - } - /** - * Utility method that creates a combo box - * - * @param parent the parent for the new label - * @return the new widget - */ - protected Combo createCombo(Composite parent) { - Combo combo = new Combo(parent, SWT.READ_ONLY); - GridData data = new GridData(GridData.FILL_HORIZONTAL); - data.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH; - data.horizontalSpan = 2; - combo.setLayoutData(data); - return combo; - } - /** - * Utility method that creates a label instance - * and sets the default layout data. - * - * @param parent the parent for the new label - * @param text the text for the new label - * @return the new label - */ - protected Label createLabel(Composite parent, String text, int span) { - Label label = new Label(parent, SWT.LEFT); - label.setText(text); - GridData data = new GridData(); - data.horizontalSpan = span; - data.horizontalAlignment = GridData.FILL; - label.setLayoutData(data); - return label; - } - /** - * Create a text field specific for this application - * - * @param parent the parent of the new text field - * @return the new text field - */ - protected Text createTextField(Composite parent) { - Text text = new Text(parent, SWT.SINGLE | SWT.BORDER); - return layoutTextField(text); - } - /** - * Create a password field specific for this application - * - * @param parent the parent of the new text field - * @return the new text field - */ - protected Text createPasswordField(Composite parent) { - Text text = new Text(parent, SWT.SINGLE | SWT.BORDER | SWT.PASSWORD); - return layoutTextField(text); - } - /** - * Layout a text or password field specific for this application - * - * @param parent the parent of the new text field - * @return the new text field - */ - protected Text layoutTextField(Text text) { - GridData data = new GridData(GridData.FILL_HORIZONTAL); - data.verticalAlignment = GridData.CENTER; - data.grabExcessVerticalSpace = false; - data.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH; - data.horizontalSpan = 2; - text.setLayoutData(data); - return text; - } - - /** - * Utility method to create a radio button - * - * @param parent the parent of the radio button - * @param label the label of the radio button - * @param span the number of columns to span - * @return the created radio button - */ - protected Button createRadioButton(Composite parent, String label, int span) { - Button button = new Button(parent, SWT.RADIO); - button.setText(label); - GridData data = new GridData(); - data.horizontalSpan = span; - button.setLayoutData(data); - return button; - } - /** - * Initializes the page - */ - private void initialize() { - location = null; - IAdaptable element = getElement(); - if (element instanceof ICVSRepositoryLocation) { - location = (ICVSRepositoryLocation)element; - } else { - Object adapter = element.getAdapter(ICVSRepositoryLocation.class); - if (adapter instanceof ICVSRepositoryLocation) { - location = (ICVSRepositoryLocation)adapter; - } - } - } - /** - * Set the initial values of the widgets - */ - private void initializeValues() { - passwordChanged = false; - - IConnectionMethod[] methods = CVSRepositoryLocation.getPluggedInConnectionMethods(); - for (int i = 0; i < methods.length; i++) { - methodType.add(methods[i].getName()); - } - String method = location.getMethod().getName(); - methodType.select(methodType.indexOf(method)); - info = location.getUserInfo(true); - userText.setText(info.getUsername()); - passwordText.setText("*********"); //$NON-NLS-1$ - hostLabel.setText(location.getHost()); - int port = location.getPort(); - if (port == ICVSRepositoryLocation.USE_DEFAULT_PORT) { - portLabel.setText(Policy.bind("CVSPropertiesPage.defaultPort")); //$NON-NLS-1$ - } else { - portLabel.setText("" + port); //$NON-NLS-1$ - } - pathLabel.setText(location.getRootDirectory()); - - // get the program name - String programName = ((CVSRepositoryLocation)location).getRemoteCVSProgramName(); - programNameText.setText(programName); - useDefaultProgramName.setSelection(programName == CVSRepositoryLocation.DEFAULT_REMOTE_CVS_PROGRAM_NAME); - useCustomProgramName.setSelection(!useDefaultProgramName.getSelection()); - - // get the repository label - String label = null; - RepositoryRoot root = CVSUIPlugin.getPlugin().getRepositoryManager().getRepositoryRootFor(location); - label = root.getName(); - useLocationAsLabel.setSelection(label == null); - useCustomLabel.setSelection(!useLocationAsLabel.getSelection()); - if (label == null) { - label = location.getLocation(); - } - labelText.setText(label); - } - - /* - * @see PreferencesPage#performOk - */ - public boolean performOk() { - if (!connectionInfoChanged && !passwordChanged) { - if (programNameChanged) { - recordNewProgramName((CVSRepositoryLocation)location); - } - if (labelChanged) { - recordNewLabel((CVSRepositoryLocation)location); - } - return true; - } - info.setUsername(userText.getText()); - if (passwordChanged) { - info.setPassword(passwordText.getText()); - } - final String type = methodType.getText(); - final String password = passwordText.getText(); - final boolean[] result = new boolean[] { false }; - try { - // This operation is done inside a workspace operation in case the sharing - // info for existing projects is changed - new ProgressMonitorDialog(getShell()).run(false, false, new WorkspaceModifyOperation() { - public void execute(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - try { - // Check if the password was the only thing to change. - if (passwordChanged && !connectionInfoChanged) { - CVSRepositoryLocation oldLocation = (CVSRepositoryLocation)location; - oldLocation.setPassword(password); - oldLocation.updateCache(); - passwordChanged = false; - result[0] = true; - return; - } - - // Create a new repository location with the new information - CVSRepositoryLocation newLocation = CVSRepositoryLocation.fromString(location.getLocation()); - newLocation.setMethod(type); - newLocation.setUserInfo(info); - - try { - // For each project shared with the old location, set connection info to the new one - List projects = new ArrayList(); - IProject[] allProjects = ResourcesPlugin.getWorkspace().getRoot().getProjects(); - for (int i = 0; i < allProjects.length; i++) { - RepositoryProvider teamProvider = RepositoryProvider.getProvider(allProjects[i], CVSProviderPlugin.getTypeId()); - if (teamProvider != null) { - CVSTeamProvider cvsProvider = (CVSTeamProvider)teamProvider; - if (cvsProvider.getCVSWorkspaceRoot().getRemoteLocation().equals(location)) { - projects.add(allProjects[i]); - } - } - } - if (projects.size() > 0) { - // To do: warn the user - DetailsDialogWithProjects dialog = new DetailsDialogWithProjects( - getShell(), - Policy.bind("CVSRepositoryPropertiesPage.Confirm_Project_Sharing_Changes_1"), //$NON-NLS-1$ - Policy.bind("CVSRepositoryPropertiesPage.There_are_projects_in_the_workspace_shared_with_this_repository_2"), //$NON-NLS-1$ - Policy.bind("CVSRepositoryPropertiesPage.sharedProject", location.toString()), //$NON-NLS-1$ - (IProject[]) projects.toArray(new IProject[projects.size()]), - true, - DetailsDialogWithProjects.DLG_IMG_WARNING); - int r = dialog.open(); - if (r != DetailsDialogWithProjects.OK) { - result[0] = false; - return; - } - monitor.beginTask(null, 1000 * projects.size()); - try { - Iterator it = projects.iterator(); - while (it.hasNext()) { - IProject project = (IProject)it.next(); - RepositoryProvider teamProvider = RepositoryProvider.getProvider(project, CVSProviderPlugin.getTypeId()); - CVSTeamProvider cvsProvider = (CVSTeamProvider)teamProvider; - cvsProvider.setRemoteRoot(newLocation, Policy.subMonitorFor(monitor, 1000)); - } - } finally { - monitor.done(); - } - } - - // Dispose the old repository location - CVSUIPlugin.getPlugin().getRepositoryManager().replaceRepositoryLocation(location, newLocation); - - } finally { - // Even if we failed, ensure that the new location appears in the repo view. - newLocation = (CVSRepositoryLocation)CVSProviderPlugin.getPlugin().getRepository(newLocation.getLocation()); - newLocation.updateCache(); - } - - - // Set the location of the page to the new location in case Apply was chosen - location = newLocation; - - if (programNameChanged) { - recordNewProgramName((CVSRepositoryLocation)location); - } - if (labelChanged) { - recordNewLabel((CVSRepositoryLocation)location); - } - - connectionInfoChanged = false; - passwordChanged = false; - programNameChanged = false; - } catch (TeamException e) { - throw new InvocationTargetException(e); - } - result[0] = true; - } - }); - } catch (InvocationTargetException e) { - handle(e); - } catch (InterruptedException e) { - } - - return result[0]; - } - /** - * Shows the given errors to the user. - */ - protected void handle(Throwable e) { - CVSUIPlugin.openError(getShell(), null, null, e); - } - - /** - * Updates widget enablements and sets error message if appropriate. - */ - protected void updateWidgetEnablements() { - if (useDefaultProgramName.getSelection()) { - programNameText.setEnabled(false); - } else { - programNameText.setEnabled(true); - } - if (useLocationAsLabel.getSelection()) { - labelText.setEnabled(false); - } else { - labelText.setEnabled(true); - } - validateFields(); - } - - private void validateFields() { - if (programNameText.isEnabled()) { - if (programNameText.getText().length() == 0) { - setValid(false); - return; - } - } - if (labelText.isEnabled()) { - if (labelText.getText().length() == 0) { - setValid(false); - return; - } - } - setValid(true); - } - - private void recordNewProgramName(CVSRepositoryLocation location) { - // Set the remote program name if appropriate - String newProgramName; - if (useDefaultProgramName.getSelection()) { - newProgramName = CVSRepositoryLocation.DEFAULT_REMOTE_CVS_PROGRAM_NAME; - } else { - newProgramName = programNameText.getText(); - } - if (!location.getRemoteCVSProgramName().equals(newProgramName)) { - CVSProviderPlugin.getPlugin().setCVSProgramName(location, newProgramName); - } - } - - private void recordNewLabel(CVSRepositoryLocation location) { - String label = null; - if (useCustomLabel.getSelection()) { - label = labelText.getText(); - if (label.equals(location.getLocation())) { - label = null; - } - } - try { - CVSUIPlugin.getPlugin().getRepositoryManager().setLabel(location, label); - } catch (CVSException e) { - CVSUIPlugin.log(e); - } - } -} - diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSWorkingSet.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSWorkingSet.java deleted file mode 100644 index 157701878..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSWorkingSet.java +++ /dev/null @@ -1,103 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.repo; - -import java.util.HashSet; -import java.util.Set; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.jface.util.IPropertyChangeListener; -import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteResource; -import org.eclipse.ui.IWorkingSet; -import org.eclipse.ui.IWorkingSetManager; -import org.eclipse.ui.PlatformUI; - -/** - * This class adds ICVSRemoteResource filtering to a working set - */ -public class CVSWorkingSet { - - IWorkingSet workingSet; - IProject[] includedProjects; - IPropertyChangeListener listener = new IPropertyChangeListener() { - public void propertyChange(PropertyChangeEvent event) { - IWorkingSet changedSet = getChangedSet(event); - if (changedSet == null || !changedSet.equals(workingSet)) return; - String property = event.getProperty(); - if (property.equals(IWorkingSetManager.CHANGE_WORKING_SET_CONTENT_CHANGE)) { - includedProjects = null; - } else if (property.equals(IWorkingSetManager.CHANGE_WORKING_SET_REMOVE)) { - workingSet = null; - includedProjects = null; - } - } - private IWorkingSet getChangedSet(PropertyChangeEvent event) { - Object old = event.getOldValue(); - if (old instanceof IWorkingSet) { - return (IWorkingSet)old; - - } - Object newSet = event.getNewValue(); - if (newSet instanceof IWorkingSet) { - return (IWorkingSet)newSet; - - } - return null; - } - }; - - /** - * - */ - public CVSWorkingSet(IWorkingSet workingSet) { - this.workingSet = workingSet; - PlatformUI.getWorkbench().getWorkingSetManager().addPropertyChangeListener(listener); - } - - public void dispose() { - PlatformUI.getWorkbench().getWorkingSetManager().removePropertyChangeListener(listener); - } - - private void initializeProjects() { - if (workingSet == null) { - includedProjects = null; - return; - } - // get the projects associated with the working set - IAdaptable[] adaptables = workingSet.getElements(); - Set projects = new HashSet(); - for (int i = 0; i < adaptables.length; i++) { - IAdaptable adaptable = adaptables[i]; - Object adapted = adaptable.getAdapter(IResource.class); - if (adapted != null) { - // Can this code be generalized? - IProject project = ((IResource)adapted).getProject(); - projects.add(project); - } - } - this.includedProjects = (IProject[]) projects.toArray(new IProject[projects.size()]); - } - - public boolean select(ICVSRemoteResource remoteResource) { - if (workingSet == null) return true; - if (includedProjects == null) initializeProjects(); - for (int i = 0; i < includedProjects.length; i++) { - IProject project = includedProjects[i]; - if (project.getName().equals(remoteResource.getName())) { - return true; - } - } - return false; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSWorkingSetPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSWorkingSetPage.java deleted file mode 100644 index 812182947..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSWorkingSetPage.java +++ /dev/null @@ -1,477 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.repo; - -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.viewers.CheckStateChangedEvent; -import org.eclipse.jface.viewers.CheckboxTreeViewer; -import org.eclipse.jface.viewers.ICheckStateListener; -import org.eclipse.jface.viewers.ITreeViewerListener; -import org.eclipse.jface.viewers.TreeExpansionEvent; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Text; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteResource; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ccvs.ui.model.ModulesCategory; -import org.eclipse.team.internal.ccvs.ui.wizards.CVSWizardPage; -import org.eclipse.ui.IWorkingSet; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.dialogs.IWorkingSetPage; -import org.eclipse.ui.help.WorkbenchHelp; -import org.eclipse.ui.model.WorkbenchContentProvider; -import org.eclipse.ui.model.WorkbenchLabelProvider; - -/** - * @author Administrator - * - * To change this generated comment edit the template variable "typecomment": - * Window>Preferences>Java>Templates. - * To enable and disable the creation of type comments go to - * Window>Preferences>Java>Code Generation. - */ -public class CVSWorkingSetPage extends CVSWizardPage implements IWorkingSetPage { - - private IWorkingSet workingSet; - private String workingSetName; - private Set checkedFolders; - private Map modulesCategoryCache = new HashMap(); - private boolean editing = false; - - private Text nameField; - private CheckboxTreeViewer tree; - private ICheckStateListener checkStateListener; - - /** - * @see org.eclipse.team.internal.ccvs.ui.wizards.CVSWizardPage#CVSWizardPage(String, String, ImageDescriptor, String) - */ - public CVSWorkingSetPage(String pageName, String title, ImageDescriptor titleImage, String description) { - super(pageName, title, titleImage, description); - checkedFolders = new HashSet(); - workingSetName = ""; //$NON-NLS-1$ - } - /** - * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) - */ - public void createControl(Composite parent) { - Composite composite= createComposite(parent, 2); - setControl(composite); - - WorkbenchHelp.setHelp(composite, IHelpContextIds.WORKING_SET_FOLDER_SELECTION_PAGE); - - createLabel(composite, Policy.bind("CVSWorkingSetFolderSelectionPage.name")); //$NON-NLS-1$ - nameField = createTextField(composite); - nameField.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent event) { - workingSetName = nameField.getText(); - updateWidgetEnablements(); - } - }); - - createWrappingLabel(composite, Policy.bind("CVSWorkingSetFolderSelectionPage.treeLabel"), 0, 2); //$NON-NLS-1$ - - tree = createFolderSelectionTree(composite, 2); - checkStateListener = new ICheckStateListener() { - public void checkStateChanged(CheckStateChangedEvent event) { - CVSWorkingSetPage.this.handleChecked(event.getElement(), event.getChecked()); - } - }; - tree.addCheckStateListener(checkStateListener); - tree.addTreeListener(new ITreeViewerListener() { - public void treeCollapsed(TreeExpansionEvent event) { - // Ignore - } - public void treeExpanded(TreeExpansionEvent event) { - CVSWorkingSetPage.this.handleExpansion(event.getElement()); - } - }); - - createLabel(composite, ""); //$NON-NLS-1$ - Button refresh = new Button(composite, SWT.PUSH); - refresh.setText(Policy.bind("CVSWorkingSetFolderSelectionPage.refresh")); //$NON-NLS-1$ - GridData data = new GridData(); - data.horizontalAlignment = GridData.END; - data.horizontalSpan = 1; - refresh.setLayoutData(data); - refresh.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - CVSWorkingSetPage.this.refreshTree(); - } - }); - - initializeValues(); - updateWidgetEnablements(); - nameField.setFocus(); - } - /** - * Method handleExpansion. - * @param object - */ - public void handleExpansion(Object element) { - if (element instanceof ICVSRepositoryLocation) { - ICVSRepositoryLocation location = (ICVSRepositoryLocation) element; - tree.setGrayed(CVSWorkingSetPage.this.getModuleCategory(location), true); - } - updateCheckState(element); - } - - /** - * Method handleChecked. - * @param object - * @param b - */ - public void handleChecked(Object object, boolean checked) { - if (object instanceof ICVSRepositoryLocation) { - ICVSRepositoryLocation location = (ICVSRepositoryLocation) object; - if (checked) { - repositoryLocationChecked(location); - } else { - repositoryLocationUnchecked(location); - } - } else if (object instanceof ModulesCategory) { - ModulesCategory category = (ModulesCategory) object; - if (checked) { - modulesCategoryChecked(category); - } else { - modulesCategoryUnchecked(category); - } - } else if (object instanceof ICVSRemoteFolder) { - ICVSRemoteFolder folder = (ICVSRemoteFolder) object; - if (checked) { - folderChecked(folder); - } else { - folderUnchecked(folder); - } - } - updateWidgetEnablements(); - } - - public ModulesCategory getModuleCategory(ICVSRepositoryLocation location) { - ModulesCategory category = (ModulesCategory)modulesCategoryCache.get(location.getLocation()); - if (category == null) { - category = new ModulesCategory(location); - modulesCategoryCache.put(location.getLocation(), category); - category.setRunnableContext(getContainer()); - } - return category; - } - - private void folderUnchecked(ICVSRemoteFolder folder) { - checkedFolders.remove(folder); - } - - private void folderChecked(ICVSRemoteFolder folder) { - checkedFolders.add(folder); - } - - private void repositoryLocationChecked(ICVSRepositoryLocation location) { - Object[] elements = tree.getCheckedElements(); - boolean stayChecked = false; - for (int i = 0; i < elements.length; i++) { - Object object = elements[i]; - if (object instanceof ICVSRemoteFolder) { - ICVSRemoteFolder folder = (ICVSRemoteFolder) object; - if (folder.getRepository().equals(location)) { - stayChecked = true; - } - } - } - if (!stayChecked) { - tree.setChecked(location, false); - } - } - - private void repositoryLocationUnchecked(ICVSRepositoryLocation location) { - for (Iterator iter = checkedFolders.iterator(); iter.hasNext();) { - ICVSRemoteFolder folder = (ICVSRemoteFolder) iter.next(); - if (folder.getRepository().equals(location)) { - tree.setChecked(folder, false); - iter.remove(); - } - } - } - - private void modulesCategoryChecked(ModulesCategory category) { - ICVSRepositoryLocation location = category.getRepository(); - Object[] elements = tree.getCheckedElements(); - boolean stayChecked = false; - for (int i = 0; i < elements.length; i++) { - Object object = elements[i]; - if (object instanceof ICVSRemoteFolder) { - ICVSRemoteFolder folder = (ICVSRemoteFolder) object; - if (folder.getRepository().equals(location) && (folder.isDefinedModule())) { - stayChecked = true; - } - } - } - if (!stayChecked) { - tree.setChecked(category, false); - } - } - - private void modulesCategoryUnchecked(ModulesCategory category) { - ICVSRepositoryLocation location = category.getRepository(); - for (Iterator iter = checkedFolders.iterator(); iter.hasNext();) { - ICVSRemoteFolder folder = (ICVSRemoteFolder) iter.next(); - if (folder.getRepository().equals(location) && folder.isDefinedModule()) { - tree.setChecked(folder, false); - iter.remove(); - } - } - } - - /** - * Method refreshTree. - */ - public void refreshTree() { - tree.refresh(); - } - - /** - * Method initializeValues. - */ - private void initializeValues() { - nameField.setText(workingSetName); - tree.setGrayedElements(getRepositoryManager().getKnownRepositoryLocations()); - } - - /** - * Method updateWidgetEnablement. - */ - private void updateWidgetEnablements() { - // update the check state of repository locations and modules categories - tree.removeCheckStateListener(checkStateListener); - try { - updateCheckState(null); - // Make sure the name is valid - if (workingSetName.length() == 0) { - setPageComplete(false); - setErrorMessage(null); - } else if (!isValidName(workingSetName)) { - setPageComplete(false); - setErrorMessage(Policy.bind("CVSWorkingSetFolderSelectionPage.invalidWorkingSetName", workingSetName)); //$NON-NLS-1$ - } else if (isDuplicateName(workingSetName)) { - setPageComplete(false); - setErrorMessage(Policy.bind("CVSWorkingSetFolderSelectionPage.duplicateWorkingSetName", workingSetName)); //$NON-NLS-1$ - } else if (checkedFolders.isEmpty()) { - setErrorMessage(Policy.bind("CVSWorkingSetFolderSelectionPage.mustSelectFolder")); //$NON-NLS-1$ - setPageComplete(false); - } else { - setPageComplete(true); - setErrorMessage(null); - } - } finally { - tree.addCheckStateListener(checkStateListener); - } - } - - private void updateCheckState(Object expanded) { - ICVSRepositoryLocation[] locations = getRepositoryManager().getKnownRepositoryLocations(); - Set checkedLocations = new HashSet(); - Set checkedCategories = new HashSet(); - List expandedParents = new ArrayList(); - expandedParents.addAll(Arrays.asList(tree.getExpandedElements())); - if (expanded != null) - expandedParents.add(expanded); - for (Iterator iter = checkedFolders.iterator(); iter.hasNext();) { - ICVSRemoteFolder folder = (ICVSRemoteFolder) iter.next(); - checkedLocations.add(folder.getRepository()); - if (folder.isDefinedModule()) { - ModulesCategory category = getModuleCategory(folder.getRepository()); - checkedCategories.add(getModuleCategory(folder.getRepository())); - if (expandedParents.contains(category)) - tree.setChecked(folder, true); - } else if (expandedParents.contains(folder.getRepository())) { - tree.setChecked(folder, true); - } - } - for (int i = 0; i < locations.length; i++) { - ICVSRepositoryLocation location = locations[i]; - tree.setChecked(location, checkedLocations.contains(location)); - } - for (Iterator iter = modulesCategoryCache.values().iterator(); iter.hasNext();) { - ModulesCategory element = (ModulesCategory) iter.next(); - if (expandedParents.contains(element.getRepository())) - tree.setChecked(element, checkedCategories.contains(element)); - } - } - - /** - * Method isValidName. - * @param workingSetName - * @return boolean - */ - private boolean isValidName(String workingSetName) { - if (workingSetName.length() == 0) - return false; - if (workingSetName.startsWith(" ")) //$NON-NLS-1$ - return false; - if (workingSetName.endsWith(" ")) //$NON-NLS-1$ - return false; - for (int i = 0; i < workingSetName.length(); i++) { - char c = workingSetName.charAt(i); - if (! Character.isLetterOrDigit(c) && ! Character.isSpaceChar(c)) - return false; - } - return true; - } - - /** - * Method isDuplicateName. - * @param workingSetName - * @return boolean - */ - private boolean isDuplicateName(String workingSetName) { - String originalWorkingSetName = workingSet.getName(); - if (originalWorkingSetName != null && workingSetName.equals(originalWorkingSetName)) { - return false; - } - IWorkingSet[] workingSets = PlatformUI.getWorkbench().getWorkingSetManager().getWorkingSets(); - for (int i= 0; i < workingSets.length; i++) { - if (workingSetName.equals(workingSets[i].getName())) { - return true; - } - } - return false; - } - - protected CheckboxTreeViewer createFolderSelectionTree(Composite composite, int span) { - CheckboxTreeViewer tree = new CheckboxTreeViewer(composite, SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER); - tree.setUseHashlookup(true); - tree.setContentProvider(new WorkbenchContentProvider() { - public Object[] getChildren(Object parentElement) { - if (parentElement instanceof CVSWorkingSetPage) { - return getRepositoryManager().getKnownRepositoryLocations(); - } - if (parentElement instanceof ICVSRepositoryLocation) { - ICVSRepositoryLocation location = (ICVSRepositoryLocation)parentElement; - List result = new ArrayList(); - result.add(getModuleCategory(location)); - result.addAll(Arrays.asList(CVSWorkingSetPage.this.getChildren((ICVSRepositoryLocation)parentElement))); - return (Object[]) result.toArray(new Object[result.size()]); - } - if (parentElement instanceof ModulesCategory) { - ModulesCategory modules = (ModulesCategory)parentElement; - return modules.getChildren(modules); - } - return new Object[0]; - } - public Object getParent(Object element) { - if (element instanceof ICVSRemoteFolder) { - return ((ICVSRemoteFolder)element).getRepository(); - } - return null; - } - public boolean hasChildren(Object parentElement) { - return parentElement instanceof CVSWorkingSetPage || parentElement instanceof ICVSRepositoryLocation || parentElement instanceof ModulesCategory; - } - }); - tree.setLabelProvider(new WorkbenchLabelProvider()); - tree.setSorter(new RepositorySorter()); - tree.setInput(this); - - GridData data = new GridData(GridData.FILL_BOTH | GridData.GRAB_VERTICAL); - data.heightHint = LIST_HEIGHT_HINT; - data.horizontalSpan = span; - tree.getControl().setLayoutData(data); - return tree; - } - - /** - * Method getChildren. - * @param iCVSRepositoryLocation - * @return Object[] - */ - public ICVSRemoteResource[] getChildren(final ICVSRepositoryLocation location) { - final ICVSRemoteResource[][] result = new ICVSRemoteResource[1][0]; - result[0] = null; - try { - getContainer().run(false /* fork */, true /* cancelable */, new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - try { - result[0] = location.members(CVSTag.DEFAULT, false /* show modules */, monitor); - } catch (CVSException e) { - throw new InvocationTargetException(e); - } - } - }); - } catch (InvocationTargetException e) { - CVSUIPlugin.openError(getContainer().getShell(), null, null, e, CVSUIPlugin.PERFORM_SYNC_EXEC); - } catch (InterruptedException e) { - } - return result[0]; - } - - public ICVSRepositoryLocation[] getRepositoryLocationsWithCheckedChildren() { - Set locations = new HashSet(); - for (Iterator iter = checkedFolders.iterator(); iter.hasNext();) { - ICVSRemoteFolder element = (ICVSRemoteFolder) iter.next(); - locations.add(element.getRepository()); - } - return (ICVSRepositoryLocation[]) locations.toArray(new ICVSRepositoryLocation[locations.size()]); - } - /** - * Returns the workingSetName. - * @return String - */ - public String getWorkingSetName() { - return workingSetName; - } - - public ICVSRemoteFolder[] getSelectedFolders() { - return (ICVSRemoteFolder[]) checkedFolders.toArray(new ICVSRemoteFolder[checkedFolders.size()]); - } - - /** - * @see org.eclipse.ui.dialogs.IWorkingSetPage#finish() - */ - public void finish() { - // todo - } - /** - * @see org.eclipse.ui.dialogs.IWorkingSetPage#getSelection() - */ - public IWorkingSet getSelection() { - return workingSet; - } - /** - * @see org.eclipse.ui.dialogs.IWorkingSetPage#setSelection(org.eclipse.ui.IWorkingSet) - */ - public void setSelection(IWorkingSet workingSet) { - this.workingSet = workingSet; - workingSetName = workingSet.getName(); - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CommentHistoryContentHandler.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CommentHistoryContentHandler.java deleted file mode 100644 index bbcc4c963..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CommentHistoryContentHandler.java +++ /dev/null @@ -1,69 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.team.internal.ccvs.ui.repo; - -import java.util.Vector; - -import org.xml.sax.SAXException; -import org.xml.sax.helpers.DefaultHandler; -import org.xml.sax.Attributes; - -class CommentHistoryContentHandler extends DefaultHandler { - - private StringBuffer buffer; - private Vector comments; - public CommentHistoryContentHandler() { - } - - /** - * @see ContentHandler#characters(char[], int, int) - */ - public void characters(char[] chars, int startIndex, int length) throws SAXException { - if (buffer == null) return; - buffer.append(chars, startIndex, length); - } - - /** - * @see ContentHandler#startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) - */ - public void startElement( - String namespaceURI, - String localName, - String qName, - Attributes atts) - throws SAXException { - if (localName.equals(RepositoryManager.ELEMENT_COMMIT_COMMENT)) { - buffer = new StringBuffer(); - return; - } - if (localName.equals(RepositoryManager.ELEMENT_COMMIT_HISTORY)) { - comments = new Vector(RepositoryManager.MAX_COMMENTS); - return; - } - } - - /** - * @see org.xml.sax.ContentHandler#endElement(java.lang.String, java.lang.String, java.lang.String) - */ - public void endElement(String namespaceURI, String localName, String qName) { - if (localName.equals(RepositoryManager.ELEMENT_COMMIT_COMMENT)) { - comments.add(buffer.toString()); - buffer = null; - return; - } - if (localName.equals(RepositoryManager.ELEMENT_COMMIT_HISTORY)) { - RepositoryManager.previousComments = new String[comments.size()]; - comments.copyInto(RepositoryManager.previousComments); - return; - } - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CopyRepositoryNameAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CopyRepositoryNameAction.java deleted file mode 100644 index b237d36a1..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CopyRepositoryNameAction.java +++ /dev/null @@ -1,64 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.repo; - -import java.util.ArrayList; -import java.util.Iterator; - -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.swt.dnd.Clipboard; -import org.eclipse.swt.dnd.TextTransfer; -import org.eclipse.swt.dnd.Transfer; -import org.eclipse.swt.widgets.Display; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.ui.actions.CVSAction; - -public class CopyRepositoryNameAction extends CVSAction { - protected boolean isEnabled() throws TeamException { - return true; - } - public void execute(IAction action) { - ICVSRepositoryLocation[] locations = getSelectedRepositories(); - StringBuffer buffer = new StringBuffer(); - for (int i = 0; i < locations.length; i++) { - buffer.append(locations[i].getLocation()); - if (i < locations.length - 1) buffer.append("\n"); //$NON-NLS-1$ - } - copyToClipbard(Display.getDefault(), buffer.toString()); - } - protected ICVSRepositoryLocation[] getSelectedRepositories() { - ArrayList repositories = null; - if (!selection.isEmpty()) { - repositories = new ArrayList(); - Iterator elements = ((IStructuredSelection)selection).iterator(); - while (elements.hasNext()) { - Object next = getAdapter(elements.next(), ICVSRepositoryLocation.class); - if (next instanceof ICVSRepositoryLocation) { - repositories.add(next); - continue; - } - } - } - if (repositories != null && !repositories.isEmpty()) { - ICVSRepositoryLocation[] result = new ICVSRepositoryLocation[repositories.size()]; - repositories.toArray(result); - return result; - } - return new ICVSRepositoryLocation[0]; - } - private void copyToClipbard(Display display, String str) { - Clipboard clipboard = new Clipboard(display); - clipboard.setContents(new String[] { str }, new Transfer[] { TextTransfer.getInstance()}); - clipboard.dispose(); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/NewCVSAnonEclipseConnection.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/NewCVSAnonEclipseConnection.java deleted file mode 100644 index 586cce61a..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/NewCVSAnonEclipseConnection.java +++ /dev/null @@ -1,46 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.repo; - - -import java.util.Properties; - -import org.eclipse.jface.action.Action; -import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.wizards.NewLocationWizard; -import org.eclipse.ui.IWorkbenchWindow; - -/** - * Called from Welcome page only. - */ -public class NewCVSAnonEclipseConnection extends Action { - public void run() { - Shell shell; - IWorkbenchWindow window = CVSUIPlugin.getPlugin().getWorkbench().getActiveWorkbenchWindow(); - if (window != null) { - shell = window.getShell(); - } else { - Display display = Display.getCurrent(); - shell = new Shell(display); - } - Properties p = new Properties(); - p.setProperty("connection", "pserver"); //$NON-NLS-1$ //$NON-NLS-2$ - p.setProperty("user", "anonymous"); //$NON-NLS-1$ //$NON-NLS-2$ - p.setProperty("host", "dev.eclipse.org"); //$NON-NLS-1$ //$NON-NLS-2$ - p.setProperty("root", "/home/eclipse"); //$NON-NLS-1$ //$NON-NLS-2$ - NewLocationWizard wizard = new NewLocationWizard(p); - WizardDialog dialog = new WizardDialog(shell, wizard); - dialog.open(); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/NewCVSRepositoryAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/NewCVSRepositoryAction.java deleted file mode 100644 index 172607e6a..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/NewCVSRepositoryAction.java +++ /dev/null @@ -1,39 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.repo; - - -import org.eclipse.jface.action.Action; -import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.wizards.NewLocationWizard; -import org.eclipse.ui.IWorkbenchWindow; - -/** - * Called from Welcome page only. - */ -public class NewCVSRepositoryAction extends Action { - public void run() { - Shell shell; - IWorkbenchWindow window = CVSUIPlugin.getPlugin().getWorkbench().getActiveWorkbenchWindow(); - if (window != null) { - shell = window.getShell(); - } else { - Display display = Display.getCurrent(); - shell = new Shell(display); - } - NewLocationWizard wizard = new NewLocationWizard(); - WizardDialog dialog = new WizardDialog(shell, wizard); - dialog.open(); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshRemoteProjectSelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshRemoteProjectSelectionPage.java deleted file mode 100644 index 5437518ad..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshRemoteProjectSelectionPage.java +++ /dev/null @@ -1,173 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.repo; - -import java.util.Arrays; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.dialogs.IDialogSettings; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.util.IPropertyChangeListener; -import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteResource; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.ListSelectionArea; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ccvs.ui.WorkingSetSelectionArea; -import org.eclipse.team.internal.ccvs.ui.model.RemoteContentProvider; -import org.eclipse.team.internal.ccvs.ui.wizards.CVSWizardPage; -import org.eclipse.ui.IWorkingSet; -import org.eclipse.ui.help.WorkbenchHelp; -import org.eclipse.ui.model.IWorkbenchAdapter; -import org.eclipse.ui.model.WorkbenchLabelProvider; - -/** - * Page that allows the user to select the remote projects whose tags should be - * refreshed. - */ -public class RefreshRemoteProjectSelectionPage extends CVSWizardPage { - - private Dialog parentDialog; - private ICVSRepositoryLocation root; - private ICVSRemoteResource[] rootFolders; - private ListSelectionArea listArea; - private WorkingSetSelectionArea workingSetArea; - private IWorkingSet workingSet; - private IDialogSettings settings; - - /** - * Custom input provider which returns the list of root folders - */ - private class InputElement implements IWorkbenchAdapter, IAdaptable { - public Object[] getChildren(Object o) { - return rootFolders; - } - public ImageDescriptor getImageDescriptor(Object object) { - return null; - } - public String getLabel(Object o) { - return null; - } - public Object getParent(Object o) { - return null; - } - public Object getAdapter(Class adapter) { - if (adapter == IWorkbenchAdapter.class) return this; - return null; - } - } - - /** - * Constructor for RemoteProjectSelectionPage. - * @param pageName - * @param title - * @param titleImage - * @param description - */ - public RefreshRemoteProjectSelectionPage( - String pageName, - String title, - ImageDescriptor titleImage, - String description, - Dialog parentDialog, - IDialogSettings settings, - ICVSRepositoryLocation root, - ICVSRemoteResource[] rootFolders) { - super(pageName, title, titleImage, description); - this.parentDialog = parentDialog; - this.settings = settings; - this.root = root; - this.rootFolders = rootFolders; - } - - /** - * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) - */ - public void createControl(Composite parent) { - Composite composite = createComposite(parent, 1); - setControl(composite); - // set F1 help - WorkbenchHelp.setHelp(composite, IHelpContextIds.REFRESH_REMOTE_PROJECT_SELECTION_PAGE); - - listArea = new ListSelectionArea(parentDialog, - new InputElement(), - new RemoteContentProvider(), - new WorkbenchLabelProvider(), - Policy.bind("RefreshRemoteProjectSelectionPage.selectRemoteProjects")); //$NON-NLS-1$ - listArea.createArea(composite); - listArea.addPropertyChangeListener(new IPropertyChangeListener() { - public void propertyChange(PropertyChangeEvent event) { - updateEnablement(); - } - }); - listArea.getViewer().setSorter(new RepositorySorter()); - - workingSetArea = new WorkingSetSelectionArea(parentDialog, Policy.bind("RefreshRemoteProjectSelectionPage.noWorkingSet"), Policy.bind("RefreshRemoteProjectSelectionPage.workingSet"), settings); //$NON-NLS-1$ //$NON-NLS-2$ - setWorkingSet(workingSet); - workingSetArea.addPropertyChangeListener(new IPropertyChangeListener() { - public void propertyChange(PropertyChangeEvent event) { - workingSet = (IWorkingSet)event.getNewValue(); - handleWorkingSetChange(); - } - }); - workingSetArea.createArea(composite); - } - - /** - * Sets the working set that should be selected in the most recently - * used working set list. - * - * @param workingSet the working set that should be selected. - * has to exist in the list returned by - * org.eclipse.ui.IWorkingSetManager#getRecentWorkingSets(). - * Must not be null. - */ - public void setWorkingSet(IWorkingSet workingSet) { - this.workingSet = workingSet; - - if (workingSetArea != null) { - workingSetArea.setWorkingSet(workingSet); - } - } - - private void handleWorkingSetChange() { - if (workingSet != null) { - // check any projects in the working set - listArea.getViewer().setAllChecked(false); - RepositoryManager manager = CVSUIPlugin.getPlugin().getRepositoryManager(); - ICVSRemoteResource[] resources = manager.filterResources(workingSet, rootFolders); - for (int i = 0; i < resources.length; i++) { - ICVSRemoteResource resource = resources[i]; - listArea.getViewer().setChecked(resource, true); - } - - } - } - - private void updateEnablement() { - boolean atLeastOne = listArea.getViewer().getCheckedElements().length > 0; - setPageComplete(atLeastOne); - } - - /** - * Method getSelectedRemoteProject. - * @return ICVSRemoteResource[] - */ - public ICVSRemoteResource[] getSelectedRemoteProject() { - Object[] checked = listArea.getViewer().getCheckedElements(); - return (ICVSRemoteResource[]) Arrays.asList(checked).toArray(new ICVSRemoteResource[checked.length]); - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshRemoteProjectWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshRemoteProjectWizard.java deleted file mode 100644 index 5e7f3a6ea..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshRemoteProjectWizard.java +++ /dev/null @@ -1,136 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.repo; - -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.dialogs.IDialogSettings; -import org.eclipse.jface.dialogs.ProgressMonitorDialog; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.window.Window; -import org.eclipse.jface.wizard.Wizard; -import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteResource; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.Policy; - -/** - * Wizard for refreshing the tags for a CVS repository location - */ -public class RefreshRemoteProjectWizard extends Wizard { - - private Dialog parentDialog; - private ICVSRepositoryLocation root; - private ICVSRemoteResource[] rootFolders; - private RefreshRemoteProjectSelectionPage projectSelectionPage; - private IDialogSettings settings; - - public static boolean execute(Shell shell, final ICVSRepositoryLocation root) { - final ICVSRemoteResource[][] rootFolders = new ICVSRemoteResource[1][0]; - rootFolders[0] = null; - try { - new ProgressMonitorDialog(shell).run(true, true, new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - try { - rootFolders[0] = CVSUIPlugin.getPlugin().getRepositoryManager().getFoldersForTag(root, CVSTag.DEFAULT, monitor); - } catch (CVSException e) { - throw new InvocationTargetException(e); - } - } - }); - } catch (InvocationTargetException e) { - CVSUIPlugin.openError(shell, null, null, e); - return false; - } catch (InterruptedException e) { - return false; - } - RefreshRemoteProjectWizard wizard = new RefreshRemoteProjectWizard(root, rootFolders[0]); - WizardDialog dialog = new WizardDialog(shell, wizard); - wizard.setParentDialog(dialog); - return (dialog.open() == Window.OK); - } - - public RefreshRemoteProjectWizard(ICVSRepositoryLocation root, ICVSRemoteResource[] rootFolders) { - this.root = root; - this.rootFolders = rootFolders; - IDialogSettings workbenchSettings = CVSUIPlugin.getPlugin().getDialogSettings(); - this.settings = workbenchSettings.getSection("RefreshRemoteProjectWizard");//$NON-NLS-1$ - if (settings == null) { - this.settings = workbenchSettings.addNewSection("RefreshRemoteProjectWizard");//$NON-NLS-1$ - } - setWindowTitle(Policy.bind("RefreshRemoteProjectWizard.title")); //$NON-NLS-1$ - } - - /** - * @see org.eclipse.jface.wizard.IWizard#addPages() - */ - public void addPages() { - setNeedsProgressMonitor(true); - ImageDescriptor substImage = CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_NEW_LOCATION); - projectSelectionPage = new RefreshRemoteProjectSelectionPage( - "ProjectSelectionPage", //$NON-NLS-1$ - Policy.bind("RefreshRemoteProjectSelectionPage.pageTitle"), //$NON-NLS-1$ - substImage, - Policy.bind("RefreshRemoteProjectSelectionPage.pageDescription"), //$NON-NLS-1$ - parentDialog, settings, root, rootFolders); - addPage(projectSelectionPage); - } - - /** - * @see org.eclipse.jface.wizard.Wizard#performFinish() - */ - public boolean performFinish() { - final ICVSRemoteResource[] selectedFolders = projectSelectionPage.getSelectedRemoteProject(); - try { - getContainer().run(true, true, new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - monitor.beginTask(null, 100 * selectedFolders.length); - try { - RepositoryManager manager = CVSUIPlugin.getPlugin().getRepositoryManager(); - for (int i = 0; i < selectedFolders.length; i++) { - ICVSRemoteResource resource = selectedFolders[i]; - if (resource instanceof ICVSFolder) { - manager.refreshDefinedTags((ICVSFolder)resource, true /* replace */, true, Policy.subMonitorFor(monitor, 100)); - } - } - } catch (TeamException e) { - throw new InvocationTargetException(e); - } finally { - monitor.done(); - } - } - }); - return true; - } catch (InvocationTargetException e) { - CVSUIPlugin.openError(getShell(), null, null ,e); - } catch (InterruptedException e) { - } - return false; - } - - /** - * Sets the parentDialog. - * @param parentDialog The parentDialog to set - */ - public void setParentDialog(Dialog parentDialog) { - this.parentDialog = parentDialog; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshTagsAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshTagsAction.java deleted file mode 100644 index bb2402e2e..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshTagsAction.java +++ /dev/null @@ -1,73 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.repo; - -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.Iterator; - -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.ui.actions.CVSAction; -import org.eclipse.team.internal.ccvs.ui.model.BranchCategory; - -/** - * @author Administrator - * - * To change this generated comment edit the template variable "typecomment": - * Window>Preferences>Java>Templates. - * To enable and disable the creation of type comments go to - * Window>Preferences>Java>Code Generation. - */ -public class RefreshTagsAction extends CVSAction { - - /** - * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#execute(org.eclipse.jface.action.IAction) - */ - protected void execute(IAction action) throws InvocationTargetException, InterruptedException { - ICVSRepositoryLocation[] locations = getSelectedRepositoryLocations(); - RefreshRemoteProjectWizard.execute(getShell(), locations[0]); - } - - /** - * @see org.eclipse.team.internal.ui.actions.TeamAction#isEnabled() - */ - protected boolean isEnabled() throws TeamException { - ICVSRepositoryLocation[] locations = getSelectedRepositoryLocations(); - if (locations.length != 1) return false; - return true; - } - - /** - * Returns the selected CVS tags - */ - protected ICVSRepositoryLocation[] getSelectedRepositoryLocations() { - ArrayList tags = new ArrayList(); - if (!selection.isEmpty()) { - Iterator elements = ((IStructuredSelection) selection).iterator(); - while (elements.hasNext()) { - Object element = elements.next(); - Object adapter = getAdapter(element, ICVSRepositoryLocation.class); - if (adapter != null) { - tags.add(adapter); - } else { - adapter = getAdapter(element, BranchCategory.class); - if(adapter != null) { - tags.add(((BranchCategory)adapter).getRepository(adapter)); - } - } - } - } - return (ICVSRepositoryLocation[])tags.toArray(new ICVSRepositoryLocation[tags.size()]); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoteProjectsView.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoteProjectsView.java deleted file mode 100644 index 84b0a63dc..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoteProjectsView.java +++ /dev/null @@ -1,79 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.repo; - -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.ui.model.CVSTagElement; -import org.eclipse.team.internal.ccvs.ui.model.RemoteProjectsElement; -import org.eclipse.team.internal.ui.actions.TeamAction; -import org.eclipse.ui.IWorkbenchPart; - -/** - * This view shows a list of projects stored in a repository that share the same - * tag - */ -public class RemoteProjectsView extends RemoteViewPart { - - public static final String VIEW_ID = "org.eclipse.team.ccvs.ui.RemoteProjectsView"; //$NON-NLS-1$ - - private RemoteProjectsElement root; - - /** - * Constructor for RemoteProjectsView. - * @param partName - */ - public RemoteProjectsView() { - super(VIEW_ID); - } - - protected void initializeListeners() { - // listen for selection changes in the repo view - getSite().getWorkbenchWindow().getSelectionService().addPostSelectionListener(RepositoriesView.VIEW_ID, this); - getSite().getWorkbenchWindow().getSelectionService().addPostSelectionListener(RemoteTagsView.VIEW_ID, this); - } - - /** - * @see org.eclipse.ui.IWorkbenchPart#dispose() - */ - public void dispose() { - getSite().getWorkbenchWindow().getSelectionService().removePostSelectionListener(RepositoriesView.VIEW_ID, this); - getSite().getWorkbenchWindow().getSelectionService().removePostSelectionListener(RemoteTagsView.VIEW_ID, this); - super.dispose(); - } - - /** - * @see org.eclipse.ui.ISelectionListener#selectionChanged(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) - */ - public void selectionChanged(IWorkbenchPart part, ISelection selection) { - Object[] selected = TeamAction.getSelectedAdaptables(selection, ICVSRepositoryLocation.class); - if (selected.length != 0) { - root.setRoot((ICVSRepositoryLocation)selected[0]); - } else { - selected = TeamAction.getSelectedAdaptables(selection, CVSTagElement.class); - if (selected.length != 0) { - CVSTagElement element = (CVSTagElement)selected[0]; - root.setRoot(element.getRoot()); - root.setTag(element.getTag()); - } - }; - refreshViewer(); - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.repo.RemoteViewPart#getTreeInput() - */ - protected Object getTreeInput() { - root = new RemoteProjectsElement(); - return root; - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoteTagsView.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoteTagsView.java deleted file mode 100644 index 99f9d931c..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoteTagsView.java +++ /dev/null @@ -1,66 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.repo; - -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.team.internal.ui.actions.TeamAction; -import org.eclipse.ui.IWorkbenchPart; - - -/** - * This view shows the tags for the repository selected in the Repositories view - */ -public class RemoteTagsView extends RemoteViewPart { - - public static final String VIEW_ID = "org.eclipse.team.ccvs.ui.RemoteTagsView"; //$NON-NLS-1$ - - /** - * Constructor for RemoteTagsView. - * @param partName - */ - public RemoteTagsView() { - super(VIEW_ID); - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.repo.RemoteViewPart#getTreeInput() - */ - protected Object getTreeInput() { - return null; - } - - protected void initializeListeners() { - // listen for selection changes in the repo view - getSite().getWorkbenchWindow().getSelectionService().addPostSelectionListener(RepositoriesView.VIEW_ID, this); - } - - /** - * @see org.eclipse.ui.IWorkbenchPart#dispose() - */ - public void dispose() { - getSite().getWorkbenchWindow().getSelectionService().removePostSelectionListener(RepositoriesView.VIEW_ID, this); - super.dispose(); - } - - /** - * @see org.eclipse.ui.ISelectionListener#selectionChanged(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) - */ - public void selectionChanged(IWorkbenchPart part, ISelection selection) { - Object[] selected = TeamAction.getSelectedAdaptables(selection, ICVSRepositoryLocation.class); - if (selected.length == 0) { - getViewer().setInput(null); - } else { - getViewer().setInput((ICVSRepositoryLocation)selected[0]); - }; - refreshViewer(); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoteViewPart.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoteViewPart.java deleted file mode 100644 index 4313af511..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoteViewPart.java +++ /dev/null @@ -1,428 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.repo; - -import org.eclipse.jface.action.Action; -import org.eclipse.jface.action.IMenuListener; -import org.eclipse.jface.action.IMenuManager; -import org.eclipse.jface.action.IToolBarManager; -import org.eclipse.jface.action.MenuManager; -import org.eclipse.jface.action.Separator; -import org.eclipse.jface.dialogs.IDialogSettings; -import org.eclipse.jface.viewers.DoubleClickEvent; -import org.eclipse.jface.viewers.IDoubleClickListener; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.jface.window.Window; -import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.KeyAdapter; -import org.eclipse.swt.events.KeyEvent; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Menu; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.Tree; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFile; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ccvs.ui.actions.OpenRemoteFileAction; -import org.eclipse.team.internal.ccvs.ui.model.RemoteContentProvider; -import org.eclipse.ui.IActionBars; -import org.eclipse.ui.ISelectionListener; -import org.eclipse.ui.IWorkbenchActionConstants; -import org.eclipse.ui.IWorkbenchPart; -import org.eclipse.ui.IWorkingSet; -import org.eclipse.ui.IWorkingSetManager; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.dialogs.IWorkingSetEditWizard; -import org.eclipse.ui.dialogs.IWorkingSetSelectionDialog; -import org.eclipse.ui.help.WorkbenchHelp; -import org.eclipse.ui.model.WorkbenchLabelProvider; -import org.eclipse.ui.part.DrillDownAdapter; -import org.eclipse.ui.part.ViewPart; - -/** - * This class acts as a superclass to all remote CVS tree views. - */ -public abstract class RemoteViewPart extends ViewPart implements ISelectionListener { - - // The tree viewer - protected TreeViewer viewer; - - // Drill down adapter - private DrillDownAdapter drillPart; - - private Action refreshAction; - private Action collapseAllAction; - - private Action selectWorkingSetAction; - private Action deselectWorkingSetAction; - private Action editWorkingSetAction; - private OpenRemoteFileAction openAction; - - private RemoteContentProvider contentProvider; - private IDialogSettings settings; - private static final String SELECTED_WORKING_SET = "SelectedWorkingSet"; //$NON-NLS-1$ - - private class ChangeWorkingSetAction extends Action { - String name; - public ChangeWorkingSetAction(String name, int index) { - super(Policy.bind("RepositoriesView.workingSetMenuItem", new Integer(index).toString(), name)); //$NON-NLS-1$ - this.name = name; - } - public void run() { - IWorkingSetManager manager = PlatformUI.getWorkbench().getWorkingSetManager(); - setWorkingSet(manager.getWorkingSet(name), true); - } - } - - protected RemoteViewPart(String partName) { - IDialogSettings workbenchSettings = CVSUIPlugin.getPlugin().getDialogSettings(); - settings = workbenchSettings.getSection(partName); - if (settings == null) { - settings = workbenchSettings.addNewSection(partName); - } - String name = settings.get(SELECTED_WORKING_SET); - IWorkingSet set = null; - if (name != null) - set = PlatformUI.getWorkbench().getWorkingSetManager().getWorkingSet(name); - setWorkingSet(set, false); - } - - /** - * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite) - */ - public void createPartControl(Composite parent) { - viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL); - viewer.setContentProvider(getContentProvider()); - viewer.setLabelProvider(new WorkbenchLabelProvider()); - getSite().setSelectionProvider(viewer); - viewer.setInput(getTreeInput()); - viewer.setSorter(new RepositorySorter()); - viewer.getControl().addKeyListener(getKeyListener()); - drillPart = new DrillDownAdapter(viewer); - - contributeActions(); - initializeListeners(); - - // F1 Help - String helpID = getHelpContextId(); - if (helpID != null) - WorkbenchHelp.setHelp(viewer.getControl(), helpID); - } - - /** - * @see WorkbenchPart#setFocus - */ - public void setFocus() { - viewer.getControl().setFocus(); - } - - /** - * Method getHelpContextId should be overridden by subclasses to provide the - * appropriate help id. - * - * @return String - */ - protected String getHelpContextId() { - return null; - } - - /** - * Method getTreeInput. - * @return Object - */ - protected abstract Object getTreeInput(); - - /** - * @see org.eclipse.team.internal.ccvs.ui.repo.RemoteViewPart#getContentProvider() - */ - protected RemoteContentProvider getContentProvider() { - if (contentProvider == null) { - contentProvider = new RemoteContentProvider(); - } - return contentProvider; - }; - - protected KeyAdapter getKeyListener() { - return new KeyAdapter() { - public void keyPressed(KeyEvent event) { - if (event.keyCode == SWT.F5) { - refreshAction.run(); - } - } - }; - } - - protected void initializeListeners() { - // listen for selection changes in the repo view - getSite().getWorkbenchWindow().getSelectionService().addPostSelectionListener(this); - } - - protected IWorkingSet getWorkingSet() { - return getContentProvider().getWorkingSet(); - } - - protected void setWorkingSet(IWorkingSet workingSet, boolean refreshViewer) { - if (settings != null) { - String name = null; - if (workingSet != null) - name = workingSet.getName(); - settings.put(SELECTED_WORKING_SET, name); - } - getContentProvider().setWorkingSet(workingSet); - String toolTip; - if (workingSet == null) { - toolTip = null; - } else { - toolTip = Policy.bind("RemoteViewPart.workingSetToolTip", workingSet.getName()); //$NON-NLS-1$ - } - setTitleToolTip(toolTip); - if (refreshViewer) refreshViewer(); - } - - /** - * Contribute actions to the view - */ - protected void contributeActions() { - - final Shell shell = getShell(); - - // Refresh (toolbar) - CVSUIPlugin plugin = CVSUIPlugin.getPlugin(); - refreshAction = new Action(Policy.bind("RepositoriesView.refresh"), CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_REFRESH_ENABLED)) { //$NON-NLS-1$ - public void run() { - refreshAll(); - } - }; - refreshAction.setToolTipText(Policy.bind("RepositoriesView.refreshTooltip")); //$NON-NLS-1$ - refreshAction.setDisabledImageDescriptor(plugin.getImageDescriptor(ICVSUIConstants.IMG_REFRESH_DISABLED)); - refreshAction.setHoverImageDescriptor(plugin.getImageDescriptor(ICVSUIConstants.IMG_REFRESH)); - getViewSite().getActionBars().setGlobalActionHandler(IWorkbenchActionConstants.REFRESH, refreshAction); - - collapseAllAction = new Action(Policy.bind("RepositoriesView.collapseAll"), CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_COLLAPSE_ALL_ENABLED)) { //$NON-NLS-1$ - public void run() { - collapseAll(); - } - }; - collapseAllAction.setToolTipText(Policy.bind("RepositoriesView.collapseAllTooltip")); //$NON-NLS-1$ - collapseAllAction.setHoverImageDescriptor(plugin.getImageDescriptor(ICVSUIConstants.IMG_COLLAPSE_ALL)); - - // Select Working Set (popup) - selectWorkingSetAction = new Action(Policy.bind("RepositoriesView.newWorkingSet")) { //$NON-NLS-1$ - public void run() { - IWorkingSetManager manager = PlatformUI.getWorkbench().getWorkingSetManager(); - IWorkingSetSelectionDialog dialog = manager.createWorkingSetSelectionDialog(shell, false); - IWorkingSet workingSet = null; - if (workingSet != null) - dialog.setSelection(new IWorkingSet[]{workingSet}); - - if (dialog.open() == Window.OK) { - IWorkingSet[] result = dialog.getSelection(); - if (result != null && result.length > 0) { - setWorkingSet(result[0], true); - manager.addRecentWorkingSet(result[0]); - } else { - setWorkingSet(null, true); - } - } - } - }; - WorkbenchHelp.setHelp(selectWorkingSetAction, IHelpContextIds.SELECT_WORKING_SET_ACTION); - - // Deselect Working Set (popup) - deselectWorkingSetAction = new Action(Policy.bind("RepositoriesView.deselectWorkingSet")) { //$NON-NLS-1$ - public void run() { - setWorkingSet(null, true); - } - }; - WorkbenchHelp.setHelp(deselectWorkingSetAction, IHelpContextIds.DESELECT_WORKING_SET_ACTION); - - // Edit Working Set (popup) - editWorkingSetAction = new Action(Policy.bind("RepositoriesView.editWorkingSet")) { //$NON-NLS-1$ - public void run() { - IWorkingSetManager manager = PlatformUI.getWorkbench().getWorkingSetManager(); - IWorkingSet workingSet = getWorkingSet(); - if (workingSet == null) { - setEnabled(false); - return; - } - IWorkingSetEditWizard wizard = manager.createWorkingSetEditWizard(workingSet); - if (wizard == null) { - // todo - String title = Policy.bind("EditWorkingSetAction.error.nowizard.title"); //$NON-NLS-1$ - String message = Policy.bind("EditWorkingSetAction.error.nowizard.message"); //$NON-NLS-1$ - CVSUIPlugin.openError(shell, title, message, null); - return; - } - WizardDialog dialog = new WizardDialog(shell, wizard); - dialog.create(); - if (dialog.open() == WizardDialog.OK) - setWorkingSet(wizard.getSelection(), true); - } - }; - WorkbenchHelp.setHelp(editWorkingSetAction, IHelpContextIds.EDIT_WORKING_SET_ACTION); - - // Create the popup menu - MenuManager menuMgr = new MenuManager(); - Tree tree = viewer.getTree(); - Menu menu = menuMgr.createContextMenu(tree); - menuMgr.addMenuListener(new IMenuListener() { - public void menuAboutToShow(IMenuManager manager) { - addWorkbenchActions(manager); - } - - }); - menuMgr.setRemoveAllWhenShown(true); - tree.setMenu(menu); - getSite().registerContextMenu(menuMgr, viewer); - - // Create the local tool bar - IActionBars bars = getViewSite().getActionBars(); - IToolBarManager tbm = bars.getToolBarManager(); - drillPart.addNavigationActions(tbm); - tbm.add(refreshAction); - tbm.add(new Separator()); - tbm.add(collapseAllAction); - tbm.update(false); - - // Create the open action for double clicks - openAction = new OpenRemoteFileAction(); - viewer.addDoubleClickListener(new IDoubleClickListener() { - public void doubleClick(DoubleClickEvent e) { - handleDoubleClick(e); - } - }); - - updateWorkingSetMenu(); - bars.updateActionBars(); - } - - /** - * Add the menu actions that were contributed in plugin.xml - * - * @param manager - */ - protected void addWorkbenchActions(IMenuManager manager) { - // File actions go first (view file) - manager.add(new Separator(IWorkbenchActionConstants.GROUP_FILE)); - // Misc additions - manager.add(new Separator("checkoutGroup")); //$NON-NLS-1$ - manager.add(new Separator("tagGroup")); //$NON-NLS-1$ - manager.add(new Separator("miscGroup")); //$NON-NLS-1$ - manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS)); - - manager.add(refreshAction); - } - - /** - * Method getShell. - * @return Shell - */ - protected Shell getShell() { - return viewer.getTree().getShell(); - } - - public void updateWorkingSetMenu() { - IActionBars bars = getViewSite().getActionBars(); - IMenuManager mgr = bars.getMenuManager(); - - mgr.removeAll(); - - mgr.add(selectWorkingSetAction); - mgr.add(deselectWorkingSetAction); - deselectWorkingSetAction.setEnabled(getWorkingSet() != null); - mgr.add(editWorkingSetAction); - editWorkingSetAction.setEnabled(getWorkingSet() != null); - - mgr.add(new Separator()); - - IWorkingSetManager manager = PlatformUI.getWorkbench().getWorkingSetManager(); - IWorkingSet[] workingSets = manager.getWorkingSets(); - for (int i = 0; i < workingSets.length; i++) { - String name = workingSets[i].getName(); - ChangeWorkingSetAction action = new ChangeWorkingSetAction(name, i + 1); - mgr.add(action); - action.setChecked(getWorkingSet() != null && getWorkingSet().getName().equals(name)); - } - - bars.updateActionBars(); - } - - protected void refreshAll() { - //CVSUIPlugin.getPlugin().getRepositoryManager().clearCaches(); - refreshViewer(); - } - - protected void refreshViewer() { - if (viewer == null) return; - //((RemoteContentProvider)viewer.getContentProvider()).clearCache(); - CVSUIPlugin.getPlugin().getRepositoryManager().purgeCache(); - updateWorkingSetMenu(); - viewer.refresh(); - } - - public void collapseAll() { - if (viewer == null) return; - viewer.getControl().setRedraw(false); - viewer.collapseToLevel(viewer.getInput(), TreeViewer.ALL_LEVELS); - viewer.getControl().setRedraw(true); - } - /** - * The mouse has been double-clicked in the tree, perform appropriate - * behaviour. - */ - private void handleDoubleClick(DoubleClickEvent e) { - // Only act on single selection - ISelection selection = e.getSelection(); - if (selection instanceof IStructuredSelection) { - IStructuredSelection structured = (IStructuredSelection)selection; - if (structured.size() == 1) { - Object first = structured.getFirstElement(); - if (first instanceof ICVSRemoteFile) { - // It's a file, open it. - openAction.selectionChanged(null, selection); - openAction.run(null); - } else { - // Try to expand/contract - viewer.setExpandedState(first, !viewer.getExpandedState(first)); - } - } - } - } - - /** - * Returns the viewer. - * @return TreeViewer - */ - protected TreeViewer getViewer() { - return viewer; - } - - /** - * @see org.eclipse.ui.ISelectionListener#selectionChanged(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) - */ - public void selectionChanged(IWorkbenchPart part, ISelection selection) { - } - - /** - * @see org.eclipse.ui.IWorkbenchPart#dispose() - */ - public void dispose() { - getSite().getWorkbenchWindow().getSelectionService().removePostSelectionListener(this); - super.dispose(); - viewer = null; - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoveRootAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoveRootAction.java deleted file mode 100644 index 954501adb..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoveRootAction.java +++ /dev/null @@ -1,123 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.repo; - -import java.util.ArrayList; -import java.util.Iterator; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.core.RepositoryProvider; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; -import org.eclipse.team.internal.ccvs.core.CVSTeamProvider; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ccvs.ui.actions.CVSAction; -import org.eclipse.team.internal.ui.dialogs.DetailsDialogWithProjects; -import org.eclipse.ui.actions.SelectionListenerAction; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; - - -/** - * RemoveRootAction removes a repository - */ -public class RemoveRootAction extends SelectionListenerAction { - private IStructuredSelection selection; - private Shell shell; - - public RemoveRootAction(Shell shell) { - super(Policy.bind("RemoteRootAction.label")); //$NON-NLS-1$ - this.shell = shell; - } - - /** - * Returns the selected remote files - */ - protected ICVSRepositoryLocation[] getSelectedRemoteRoots() { - ArrayList resources = null; - if (selection!=null && !selection.isEmpty()) { - resources = new ArrayList(); - Iterator elements = ((IStructuredSelection) selection).iterator(); - while (elements.hasNext()) { - Object next = CVSAction.getAdapter(elements.next(), ICVSRepositoryLocation.class); - if (next instanceof ICVSRepositoryLocation) { - resources.add(next); - } - } - } - if (resources != null && !resources.isEmpty()) { - ICVSRepositoryLocation[] result = new ICVSRepositoryLocation[resources.size()]; - resources.toArray(result); - return result; - } - return new ICVSRepositoryLocation[0]; - } - - protected String getErrorTitle() { - return Policy.bind("RemoveRootAction.removeRoot_3"); //$NON-NLS-1$ - } - - public void run() { - ICVSRepositoryLocation[] roots = getSelectedRemoteRoots(); - if (roots.length == 0) return; - CVSProviderPlugin provider = CVSProviderPlugin.getPlugin(); - for (int i = 0; i < roots.length; i++) { - try { - // Check if any projects are shared with the repository - IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects(); - final ArrayList shared = new ArrayList(); - for (int j = 0; j < projects.length; j++) { - RepositoryProvider teamProvider = RepositoryProvider.getProvider(projects[j], CVSProviderPlugin.getTypeId()); - if (teamProvider!=null) { - CVSTeamProvider cvsProvider = (CVSTeamProvider)teamProvider; - if (cvsProvider.getCVSWorkspaceRoot().getRemoteLocation().equals(roots[i])) { - shared.add(projects[j]); - } - } - } - - // This will notify the RepositoryManager of the removal - if (!shared.isEmpty()) { - final String location = roots[i].getLocation(); - shell.getDisplay().syncExec(new Runnable() { - public void run() { - DetailsDialogWithProjects dialog = new DetailsDialogWithProjects( - shell, - Policy.bind("RemoteRootAction.Unable_to_Discard_Location_1"), //$NON-NLS-1$ - Policy.bind("RemoteRootAction.Projects_in_the_local_workspace_are_shared_with__2", location), //$NON-NLS-1$ - Policy.bind("RemoteRootAction.The_projects_that_are_shared_with_the_above_repository_are__4"), //$NON-NLS-1$ - (IProject[]) shared.toArray(new IProject[shared.size()]), - false, - DetailsDialogWithProjects.DLG_IMG_ERROR); - dialog.open(); - } - }); - } else { - provider.disposeRepository(roots[i]); - } - } catch (CVSException e) { - CVSUIPlugin.log(e); - } - } - } - - protected boolean updateSelection(IStructuredSelection selection) { - this.selection = selection; - - ICVSRepositoryLocation[] roots = getSelectedRemoteRoots(); - return roots.length > 0; - } - -} - diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesView.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesView.java deleted file mode 100644 index 505993ba8..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesView.java +++ /dev/null @@ -1,316 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.repo; - - -import java.util.Properties; - -import org.eclipse.core.runtime.IStatus; -import org.eclipse.jface.action.Action; -import org.eclipse.jface.action.IMenuManager; -import org.eclipse.jface.action.MenuManager; -import org.eclipse.jface.action.Separator; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.KeyAdapter; -import org.eclipse.swt.events.KeyEvent; -import org.eclipse.swt.events.KeyListener; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFile; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteResource; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.IRepositoryListener; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ccvs.ui.WorkbenchUserAuthenticator; -import org.eclipse.team.internal.ccvs.ui.actions.CVSAction; -import org.eclipse.team.internal.ccvs.ui.model.AllRootsElement; -import org.eclipse.team.internal.ccvs.ui.wizards.NewLocationWizard; -import org.eclipse.team.internal.core.TeamPlugin; -import org.eclipse.ui.IActionBars; -import org.eclipse.ui.IWorkbenchActionConstants; -import org.eclipse.ui.IWorkbenchPart; -import org.eclipse.ui.dialogs.PropertyDialogAction; -import org.eclipse.ui.help.WorkbenchHelp; - -/** - * RepositoriesView is a view on a set of known CVS repositories - * which allows navigation of the structure of the repository and - * the performing of CVS-specific operations on the repository contents. - */ -public class RepositoriesView extends RemoteViewPart { - public static final String VIEW_ID = "org.eclipse.team.ccvs.ui.RepositoriesView"; //$NON-NLS-1$ - - // The root - private AllRootsElement root; - - // Actions - private Action newAction; - private Action newAnonAction; - private PropertyDialogAction propertiesAction; - private RemoveRootAction removeRootAction; - - IRepositoryListener listener = new IRepositoryListener() { - public void repositoryAdded(final ICVSRepositoryLocation root) { - getViewer().getControl().getDisplay().syncExec(new Runnable() { - public void run() { - refreshViewer(); - getViewer().setSelection(new StructuredSelection(root)); - } - }); - } - public void repositoryRemoved(ICVSRepositoryLocation root) { - refresh(); - } - public void repositoriesChanged(ICVSRepositoryLocation[] roots) { - refresh(); - } - private void refresh() { - Display display = getViewer().getControl().getDisplay(); - display.syncExec(new Runnable() { - public void run() { - RepositoriesView.this.refreshViewer(); - } - }); - } - }; - - /** - * Constructor for RepositoriesView. - * @param partName - */ - public RepositoriesView() { - super(VIEW_ID); - } - - /** - * Contribute actions to the view - */ - protected void contributeActions() { - - final Shell shell = getShell(); - - // Create actions - - // New Repository (popup) - newAction = new Action(Policy.bind("RepositoriesView.new"), CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_NEWLOCATION)) { //$NON-NLS-1$ - public void run() { - NewLocationWizard wizard = new NewLocationWizard(); - WizardDialog dialog = new WizardDialog(shell, wizard); - dialog.open(); - } - }; - WorkbenchHelp.setHelp(newAction, IHelpContextIds.NEW_REPOSITORY_LOCATION_ACTION); - - if (includeAnonConnection()) { - newAnonAction = new Action(Policy.bind("RepositoriesView.newAnonCVS"), CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_NEWLOCATION)) { //$NON-NLS-1$ - public void run() { - Properties p = new Properties(); - p.setProperty("connection", "pserver"); //$NON-NLS-1$ //$NON-NLS-2$ - p.setProperty("user", "anonymous"); //$NON-NLS-1$ //$NON-NLS-2$ - p.setProperty("host", "dev.eclipse.org"); //$NON-NLS-1$ //$NON-NLS-2$ - p.setProperty("root", "/home/eclipse"); //$NON-NLS-1$ //$NON-NLS-2$ - NewLocationWizard wizard = new NewLocationWizard(p); - WizardDialog dialog = new WizardDialog(shell, wizard); - dialog.open(); - } - }; - WorkbenchHelp.setHelp(newAnonAction, IHelpContextIds.NEW_DEV_ECLIPSE_REPOSITORY_LOCATION_ACTION); - } - - // Properties - propertiesAction = new PropertyDialogAction(shell, getViewer()); - getViewSite().getActionBars().setGlobalActionHandler(IWorkbenchActionConstants.PROPERTIES, propertiesAction); - IStructuredSelection selection = (IStructuredSelection)getViewer().getSelection(); - if (selection.size() == 1 && selection.getFirstElement() instanceof RepositoryRoot) { - propertiesAction.setEnabled(true); - } else { - propertiesAction.setEnabled(false); - } - getViewer().addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - IStructuredSelection ss = (IStructuredSelection)event.getSelection(); - boolean enabled = ss.size() == 1 && ss.getFirstElement() instanceof RepositoryRoot; - propertiesAction.setEnabled(enabled); - } - }); - removeRootAction = new RemoveRootAction(viewer.getControl().getShell()); - removeRootAction.selectionChanged((IStructuredSelection)null); - WorkbenchHelp.setHelp(removeRootAction, IHelpContextIds.REMOVE_REPOSITORY_LOCATION_ACTION); - IActionBars bars = getViewSite().getActionBars(); - bars.setGlobalActionHandler(IWorkbenchActionConstants.DELETE, removeRootAction); - super.contributeActions(); - } - - /** - * Method includeEclipseConnection. - * @return boolean - */ - private boolean includeAnonConnection() { - return System.getProperty("eclipse.cvs.anon") != null; //$NON-NLS-1$ - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.repo.RemoteViewPart#addWorkbenchActions(org.eclipse.jface.action.IMenuManager) - */ - protected void addWorkbenchActions(IMenuManager manager) { - // New actions go next - MenuManager sub = new MenuManager(Policy.bind("RepositoriesView.newSubmenu"), IWorkbenchActionConstants.GROUP_ADD); //$NON-NLS-1$ - sub.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS)); - manager.add(sub); - super.addWorkbenchActions(manager); - IStructuredSelection selection = (IStructuredSelection)getViewer().getSelection(); - - removeRootAction.selectionChanged(selection); - if(removeRootAction.isEnabled()) { - manager.add(removeRootAction); - } - - if (selection.size() == 1 && selection.getFirstElement() instanceof RepositoryRoot) { - manager.add(new Separator()); - manager.add(propertiesAction); - } - sub.add(newAction); - if (newAnonAction != null) - sub.add(newAnonAction); - } - - /* - * @see WorkbenchPart#createPartControl - */ - public void createPartControl(Composite parent) { - super.createPartControl(parent); - CVSUIPlugin.getPlugin().getRepositoryManager().addRepositoryListener(listener); - } - - /* - * @see WorkbenchPart#dispose - */ - public void dispose() { - CVSUIPlugin.getPlugin().getRepositoryManager().removeRepositoryListener(listener); - super.dispose(); - } - - /** - * Initialize the repositories and actions - */ - private void initialize() { - root = new AllRootsElement(); - } - - protected void initializeListeners() { - super.initializeListeners(); - viewer.addSelectionChangedListener(removeRootAction); - viewer.getControl().addKeyListener(new KeyListener() { - public void keyPressed(KeyEvent event) { - handleKeyPressed(event); - } - public void keyReleased(KeyEvent event) { - handleKeyReleased(event); - } - }); - } - public void handleKeyPressed(KeyEvent event) { - if (event.character == SWT.DEL && event.stateMask == 0) { - removeRootAction.run(); - } - } - protected void handleKeyReleased(KeyEvent event) { - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.repo.RemoteViewPart#getTreeInput() - */ - protected Object getTreeInput() { - initialize(); - return root; - } - - /** - * @see org.eclipse.ui.ISelectionListener#selectionChanged(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) - */ - public void selectionChanged(IWorkbenchPart part, ISelection selection) { - String msg = getStatusLineMessage(selection); - getViewSite().getActionBars().getStatusLineManager().setMessage(msg); - } - - private String getStatusLineMessage(ISelection selection) { - if (selection==null || selection.isEmpty()) return ""; //$NON-NLS-1$ - if (!(selection instanceof IStructuredSelection)) return ""; //$NON-NLS-1$ - IStructuredSelection s = (IStructuredSelection)selection; - - if (s.size() > 1) return Policy.bind("RepositoriesView.NItemsSelected", String.valueOf(s.size())); //$NON-NLS-1$ - Object element = CVSAction.getAdapter(s.getFirstElement(), ICVSResource.class); - if (element instanceof ICVSRemoteResource) { - ICVSRemoteResource res = (ICVSRemoteResource)element; - String name; - if (res.isContainer()) { - name = res.getRepositoryRelativePath(); - } else { - try { - name = res.getRepositoryRelativePath() + " " + ((ICVSRemoteFile)res).getRevision(); //$NON-NLS-1$ - } catch (TeamException e) { - TeamPlugin.log(IStatus.ERROR, Policy.bind("RepositoriesView.CannotGetRevision"), e); //$NON-NLS-1$ - name = res.getRepositoryRelativePath(); - } - } - return Policy.bind("RepositoriesView.ResourceInRepository", name, res.getRepository().getLocation()); //$NON-NLS-1$ - } - return Policy.bind("RepositoriesView.OneItemSelected"); //$NON-NLS-1$ - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.repo.RemoteViewPart#getHelpContextId() - */ - protected String getHelpContextId() { - return IHelpContextIds.REPOSITORIES_VIEW; - } - - /** - * @see org.eclipse.team.internal.ccvs.ui.repo.RemoteViewPart#getKeyListener() - */ - protected KeyAdapter getKeyListener() { - return new KeyAdapter() { - public void keyPressed(KeyEvent event) { - if (event.keyCode == SWT.F5) { - if (WorkbenchUserAuthenticator.USE_ALTERNATE_PROMPTER) { - try { - ICVSRepositoryLocation[] locations = CVSProviderPlugin.getPlugin().getKnownRepositories(); - for (int i = 0; i < locations.length; i++) { - locations[i].flushUserInfo(); - } - } catch (CVSException e) { - // Do nothing - } - } else { - refreshAll(); - } - } else if (event.keyCode == SWT.F9 && WorkbenchUserAuthenticator.USE_ALTERNATE_PROMPTER) { - refreshAll(); - } - } - }; - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesViewContentHandler.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesViewContentHandler.java deleted file mode 100644 index ff6ffd4dd..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesViewContentHandler.java +++ /dev/null @@ -1,199 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.repo; - -import java.util.ArrayList; -import java.util.List; -import java.util.Stack; - -import org.eclipse.core.runtime.Path; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.xml.sax.Attributes; -import org.xml.sax.SAXException; -import org.xml.sax.helpers.DefaultHandler; - -public class RepositoriesViewContentHandler extends DefaultHandler { - - public static final String REPOSITORIES_VIEW_TAG = "repositories-view"; //$NON-NLS-1$ - - public static final String REPOSITORY_TAG = "repository"; //$NON-NLS-1$ - public static final String WORKING_SET_TAG = "working-set"; //$NON-NLS-1$ - public static final String CURRENT_WORKING_SET_TAG = "current-working-set"; //$NON-NLS-1$ - public static final String MODULE_TAG = "module"; //$NON-NLS-1$ - public static final String TAG_TAG = "tag"; //$NON-NLS-1$ - public static final String AUTO_REFRESH_FILE_TAG = "auto-refresh-file"; //$NON-NLS-1$ - - public static final String ID_ATTRIBUTE = "id"; //$NON-NLS-1$ - public static final String NAME_ATTRIBUTE = "name"; //$NON-NLS-1$ - public static final String PATH_ATTRIBUTE = "path"; //$NON-NLS-1$ - public static final String FULL_PATH_ATTRIBUTE = "full-path"; //$NON-NLS-1$ - public static final String TYPE_ATTRIBUTE = "type"; //$NON-NLS-1$ - public static final String REPOSITORY_PROGRAM_NAME_ATTRIBUTE = "program-name"; //$NON-NLS-1$ - - public static final String[] TAG_TYPES = {"head", "branch", "version", "date"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ - public static final String DEFAULT_TAG_TYPE = "version"; //$NON-NLS-1$ - public static final String DEFINED_MODULE_TYPE = "defined"; //$NON-NLS-1$ - - private RepositoryManager manager; - private StringBuffer buffer = new StringBuffer(); - private Stack tagStack = new Stack(); - private RepositoryRoot currentRepositoryRoot; - private String currentRemotePath; - private List tags; - private List autoRefreshFiles; - private boolean ignoreElements; - - public RepositoriesViewContentHandler(RepositoryManager manager) { - this.manager = manager; - } - - /** - * @see ContentHandler#characters(char[], int, int) - */ - public void characters(char[] chars, int startIndex, int length) throws SAXException { - buffer.append(chars, startIndex, length); - } - - /** - * @see ContentHandler#endElement(java.lang.String, java.lang.String, java.lang.String) - */ - public void endElement(String namespaceURI, String localName, String qName) throws SAXException { - - if (!localName.equals(tagStack.peek())) { - throw new SAXException(Policy.bind("RepositoriesViewContentHandler.unmatchedTag", localName)); //$NON-NLS-1$ - } - - if (localName.equals(REPOSITORIES_VIEW_TAG)) { - // all done - } else if (localName.equals(REPOSITORY_TAG)) { - if (!ignoreElements) { - manager.add(currentRepositoryRoot); - } - currentRepositoryRoot = null; - } else if (localName.equals(WORKING_SET_TAG)) { - // This tag is no longer used - ignoreElements = false; - } else if (localName.equals(CURRENT_WORKING_SET_TAG)) { - // This tag is no longer used - ignoreElements = false; - } else if (localName.equals(MODULE_TAG)) { - if (! ignoreElements && currentRepositoryRoot != null) { - currentRepositoryRoot.addTags(currentRemotePath, - (CVSTag[]) tags.toArray(new CVSTag[tags.size()])); - currentRepositoryRoot.setAutoRefreshFiles(currentRemotePath, - (String[]) autoRefreshFiles.toArray(new String[autoRefreshFiles.size()])); - } - } - tagStack.pop(); - } - - /** - * @see ContentHandler#startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) - */ - public void startElement( - String namespaceURI, - String localName, - String qName, - Attributes atts) - throws SAXException { - - if (localName.equals(REPOSITORIES_VIEW_TAG)) { - // just started - } else if (localName.equals(REPOSITORY_TAG)) { - String id = atts.getValue(ID_ATTRIBUTE); - if (id == null) { - throw new SAXException(Policy.bind("RepositoriesViewContentHandler.missingAttribute", REPOSITORY_TAG, ID_ATTRIBUTE)); //$NON-NLS-1$ - } - ICVSRepositoryLocation root; - try { - root = CVSProviderPlugin.getPlugin().getRepository(id); - } catch (CVSException e) { - throw new SAXException(Policy.bind("RepositoriesViewContentHandler.errorCreatingRoot", id), e); //$NON-NLS-1$ - } - currentRepositoryRoot = new RepositoryRoot(root); - String name = atts.getValue(NAME_ATTRIBUTE); - if (name != null) { - currentRepositoryRoot.setName(name); - } - } else if (localName.equals(WORKING_SET_TAG)) { - String name = atts.getValue(NAME_ATTRIBUTE); - if (name == null) { - throw new SAXException(Policy.bind("RepositoriesViewContentHandler.missingAttribute", WORKING_SET_TAG, NAME_ATTRIBUTE)); //$NON-NLS-1$ - } - // Ignore any elements until the corresponding end tag is reached - ignoreElements = true; - } else if (localName.equals(MODULE_TAG)) { - String path = atts.getValue(PATH_ATTRIBUTE); - if (path == null) { - throw new SAXException(Policy.bind("RepositoriesViewContentHandler.missingAttribute", MODULE_TAG, PATH_ATTRIBUTE)); //$NON-NLS-1$ - } - String type = atts.getValue(TYPE_ATTRIBUTE); - if (type != null && type.equals(DEFINED_MODULE_TYPE)) { - path = RepositoryRoot.asDefinedModulePath(path); - } - startModule(path); - } else if (localName.equals(TAG_TAG)) { - String type = atts.getValue(TYPE_ATTRIBUTE); - if (type == null) { - type = DEFAULT_TAG_TYPE; - } - String name = atts.getValue(NAME_ATTRIBUTE); - if (name == null) { - throw new SAXException(Policy.bind("RepositoriesViewContentHandler.missingAttribute", TAG_TAG, NAME_ATTRIBUTE)); //$NON-NLS-1$ - } - tags.add(new CVSTag(name, getCVSTagType(type))); - } else if (localName.equals(AUTO_REFRESH_FILE_TAG)) { - String path = atts.getValue(FULL_PATH_ATTRIBUTE); - if (path == null) { - // get the old path attribute format which was relative to the module - path = atts.getValue(PATH_ATTRIBUTE); - if (path == null) { - throw new SAXException(Policy.bind("RepositoriesViewContentHandler.missingAttribute", AUTO_REFRESH_FILE_TAG, FULL_PATH_ATTRIBUTE)); //$NON-NLS-1$ - } - if (RepositoryRoot.isDefinedModuleName(currentRemotePath)) { - path = null; - } else { - path = new Path(currentRemotePath).append(path).toString(); - } - } - if (path != null) autoRefreshFiles.add(path); - } else if (localName.equals(CURRENT_WORKING_SET_TAG)) { - // Ignore any elements until the corresponding end tag is reached - ignoreElements = true; - } - // empty buffer - buffer = new StringBuffer(); - tagStack.push(localName); - } - - private void startModule(String path) { - currentRemotePath = path; - tags = new ArrayList(); - autoRefreshFiles = new ArrayList(); - } - - /** - * Method getCVSTagType. - * @param type - */ - public int getCVSTagType(String type) { - for (int i = 0; i < TAG_TYPES.length; i++) { - if (TAG_TYPES[i].equals(type)) - return i; - } - return CVSTag.VERSION; - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryManager.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryManager.java deleted file mode 100644 index 778a7fd74..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryManager.java +++ /dev/null @@ -1,958 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.repo; - - -import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; -import java.io.DataInputStream; -import java.io.EOFException; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.apache.xerces.parsers.SAXParser; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.SubProgressMonitor; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.core.RepositoryProvider; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.core.sync.IRemoteSyncElement; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.CVSTeamProvider; -import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.team.internal.ccvs.core.ICVSListener; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteResource; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.internal.ccvs.core.client.Command; -import org.eclipse.team.internal.ccvs.core.connection.CVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.ui.AddToVersionControlDialog; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.IRepositoryListener; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ccvs.ui.ReleaseCommentDialog; -import org.eclipse.team.internal.ccvs.ui.XMLWriter; -import org.eclipse.ui.IWorkingSet; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; - -/** - * This class is repsible for maintaining the UI's list of known repositories, - * and a list of known tags within each of those repositories. - * - * It also provides a number of useful methods for assisting in repository operations. - */ -public class RepositoryManager { - // old state file - private static final String STATE_FILE = ".repositoryManagerState"; //$NON-NLS-1$ - private static final int STATE_FILE_VERSION_1 = -1; - // new state file - private static final String REPOSITORIES_VIEW_FILE = "repositoriesView.xml"; //$NON-NLS-1$ - private static final String COMMENT_HIST_FILE = "commitCommentHistory.xml"; //$NON-NLS-1$ - static final String ELEMENT_COMMIT_COMMENT = "CommitComment"; //$NON-NLS-1$ - static final String ELEMENT_COMMIT_HISTORY = "CommitComments"; //$NON-NLS-1$ - - private Map repositoryRoots = new HashMap(); - - List listeners = new ArrayList(); - - // The previously remembered comment - static String[] previousComments = new String[0]; - - public static boolean notifyRepoView = true; - - // Cache of changed repository roots - private int notificationLevel = 0; - private Map changedRepositories = new HashMap(); - - static final int MAX_COMMENTS = 10; - - /** - * Answer an array of all known remote roots. - */ - public ICVSRepositoryLocation[] getKnownRepositoryLocations() { - return CVSProviderPlugin.getPlugin().getKnownRepositories(); - } - - /** - * Method getRepositoryRoots. - * @param iCVSRepositoryLocations - * @return RepositoryRoot[] - */ - private RepositoryRoot[] getRepositoryRoots(ICVSRepositoryLocation[] locations) { - List roots = new ArrayList(); - for (int i = 0; i < locations.length; i++) { - ICVSRepositoryLocation location = locations[i]; - RepositoryRoot root = getRepositoryRootFor(location); - if (root != null) - roots.add(root); - } - return (RepositoryRoot[]) roots.toArray(new RepositoryRoot[roots.size()]); - } - - public RepositoryRoot[] getKnownRepositoryRoots() { - return getRepositoryRoots(getKnownRepositoryLocations()); - } - - /** - * Get the list of known branch tags for a given remote root. - */ - public CVSTag[] getKnownTags(ICVSFolder project, int tagType) { - try { - CVSTag[] tags = getKnownTags(project); - Set result = new HashSet(); - for (int i = 0; i < tags.length; i++) { - CVSTag tag = tags[i]; - if (tag.getType() == tagType) - result.add(tag); - } - - return (CVSTag[])result.toArray(new CVSTag[result.size()]); - } catch(CVSException e) { - CVSUIPlugin.log(e); - return new CVSTag[0]; - } - } - - /** - * Get the list of known version tags for a given project. - */ - public CVSTag[] getKnownTags(ICVSRepositoryLocation location, int tagType) { - Set result = new HashSet(); - RepositoryRoot root = (RepositoryRoot)repositoryRoots.get(location.getLocation()); - if (root != null) { - String[] paths = root.getKnownRemotePaths(); - for (int i = 0; i < paths.length; i++) { - String path = paths[i]; - CVSTag[] tags = root.getKnownTags(path); - for (int j = 0; j < tags.length; j++) { - CVSTag tag = tags[j]; - if (tag.getType() == tagType) - result.add(tag); - } - } - } - return (CVSTag[])result.toArray(new CVSTag[0]); - } - - /** - * Method getKnownTags. - * @param repository - * @param set - * @param i - * @param monitor - * @return CVSTag[] - */ - public CVSTag[] getKnownTags(ICVSRepositoryLocation repository, IWorkingSet set, int tagType, IProgressMonitor monitor) throws CVSException { - if (set == null) { - return getKnownTags(repository, tagType); - } - ICVSRemoteResource[] folders = getFoldersForTag(repository, CVSTag.DEFAULT, monitor); - folders = filterResources(set, folders); - Set tags = new HashSet(); - for (int i = 0; i < folders.length; i++) { - ICVSRemoteFolder folder = (ICVSRemoteFolder)folders[i]; - tags.addAll(Arrays.asList(getKnownTags(folder, tagType))); - } - return (CVSTag[]) tags.toArray(new CVSTag[tags.size()]); - } - - public CVSTag[] getKnownTags(ICVSFolder project) throws CVSException { - RepositoryRoot root = getRepositoryRootFor(project); - String remotePath = RepositoryRoot.getRemotePathFor(project); - return root.getKnownTags(remotePath); - } - - /* - * XXX I hope this methos is not needed in this form - */ - public Map getKnownProjectsAndVersions(ICVSRepositoryLocation location) { - Map knownTags = new HashMap(); - RepositoryRoot root = getRepositoryRootFor(location); - String[] paths = root.getKnownRemotePaths(); - for (int i = 0; i < paths.length; i++) { - String path = paths[i]; - Set result = new HashSet(); - result.addAll(Arrays.asList(root.getKnownTags(path))); - knownTags.put(path, result); - } - return knownTags; - } - - public ICVSRemoteResource[] getFoldersForTag(ICVSRepositoryLocation location, CVSTag tag, IProgressMonitor monitor) throws CVSException { - monitor = Policy.monitorFor(monitor); - try { - monitor.beginTask(Policy.bind("RepositoryManager.fetchingRemoteFolders", tag.getName()), 100); - if (tag.getType() == CVSTag.HEAD) { - ICVSRemoteResource[] resources = location.members(tag, false, Policy.subMonitorFor(monitor, 60)); - RepositoryRoot root = getRepositoryRootFor(location); - ICVSRemoteResource[] modules = root.getDefinedModules(tag, Policy.subMonitorFor(monitor, 40)); - ICVSRemoteResource[] result = new ICVSRemoteResource[resources.length + modules.length]; - System.arraycopy(resources, 0, result, 0, resources.length); - System.arraycopy(modules, 0, result, resources.length, modules.length); - return result; - } - Set result = new HashSet(); - // Get the tags for the location - RepositoryRoot root = getRepositoryRootFor(location); - String[] paths = root.getKnownRemotePaths(); - for (int i = 0; i < paths.length; i++) { - String path = paths[i]; - List tags = Arrays.asList(root.getKnownTags(path)); - if (tags.contains(tag)) { - ICVSRemoteFolder remote = root.getRemoteFolder(path, tag, Policy.subMonitorFor(monitor, 100)); - result.add(remote); - } - } - return (ICVSRemoteResource[])result.toArray(new ICVSRemoteResource[result.size()]); - } finally { - monitor.done(); - } - } - - /* - * Fetches tags from .project and .vcm_meta if they exist. Then fetches tags from the user defined auto-refresh file - * list. The fetched tags are cached in the CVS ui plugin's tag cache. - */ - public void refreshDefinedTags(ICVSFolder project, boolean replace, boolean notify, IProgressMonitor monitor) throws TeamException { - RepositoryRoot root = getRepositoryRootFor(project); - String remotePath = RepositoryRoot.getRemotePathFor(project); - root.refreshDefinedTags(remotePath, replace, monitor); - if (notify) - broadcastRepositoryChange(root); - } - - /** - * A repository root has been added. Notify any listeners. - */ - public void rootAdded(ICVSRepositoryLocation root) { - Iterator it = listeners.iterator(); - while (it.hasNext()) { - IRepositoryListener listener = (IRepositoryListener)it.next(); - listener.repositoryAdded(root); - } - } - - /** - * A repository root has been removed. - * Remove the tags defined for this root and notify any listeners - */ - public void rootRemoved(ICVSRepositoryLocation root) { - RepositoryRoot repoRoot = (RepositoryRoot)repositoryRoots.remove(root.getLocation()); - if (root != null) - broadcastRepositoryChange(repoRoot); - } - - /** - * Accept tags for any CVS resource. However, for the time being, - * the given version tags are added to the list of known tags for the - * remote ancestor of the resource that is a direct child of the remote root - */ - public void addTags(ICVSResource resource, CVSTag[] tags) throws CVSException { - RepositoryRoot root = getRepositoryRootFor(resource); - // XXX could be a file or folder - String remotePath = RepositoryRoot.getRemotePathFor(resource); - root.addTags(remotePath, tags); - broadcastRepositoryChange(root); - } - - public void setAutoRefreshFiles(ICVSFolder project, String[] filePaths) throws CVSException { - RepositoryRoot root = getRepositoryRootFor(project); - String remotePath = RepositoryRoot.getRemotePathFor(project); - root.setAutoRefreshFiles(remotePath, filePaths); - } - - public void removeAutoRefreshFiles(ICVSFolder project, String[] relativeFilePaths) throws CVSException { - RepositoryRoot root = getRepositoryRootFor(project); - String remotePath = RepositoryRoot.getRemotePathFor(project); - Set set = new HashSet(); - set.addAll(Arrays.asList(root.getAutoRefreshFiles(remotePath))); - set.removeAll(Arrays.asList(relativeFilePaths)); - root.setAutoRefreshFiles(remotePath, (String[]) set.toArray(new String[set.size()])); - } - - public String[] getAutoRefreshFiles(ICVSFolder project) throws CVSException { - RepositoryRoot root = getRepositoryRootFor(project); - String remotePath = RepositoryRoot.getRemotePathFor(project); - return root.getAutoRefreshFiles(remotePath); - } - - /** - * Remove the given tags from the list of known tags for the - * given remote root. - */ - public void removeTags(ICVSFolder project, CVSTag[] tags) throws CVSException { - RepositoryRoot root = getRepositoryRootFor(project); - String remotePath = RepositoryRoot.getRemotePathFor(project); - root.removeTags(remotePath, tags); - broadcastRepositoryChange(root); - } - - public void startup() throws TeamException { - loadState(); - loadCommentHistory(); - CVSProviderPlugin.getPlugin().addRepositoryListener(new ICVSListener() { - public void repositoryAdded(ICVSRepositoryLocation root) { - rootAdded(root); - } - public void repositoryRemoved(ICVSRepositoryLocation root) { - rootRemoved(root); - } - }); - } - - public void shutdown() throws TeamException { - saveState(); - saveCommentHistory(); - } - - private void loadState() throws TeamException { - IPath pluginStateLocation = CVSUIPlugin.getPlugin().getStateLocation().append(REPOSITORIES_VIEW_FILE); - File file = pluginStateLocation.toFile(); - if (file.exists()) { - try { - BufferedInputStream is = new BufferedInputStream(new FileInputStream(file)); - try { - readState(is); - } finally { - is.close(); - } - } catch (IOException e) { - CVSUIPlugin.log(Status.ERROR, Policy.bind("RepositoryManager.ioException"), e); //$NON-NLS-1$ - } catch (TeamException e) { - CVSUIPlugin.log(e); - } - } else { - IPath oldPluginStateLocation = CVSUIPlugin.getPlugin().getStateLocation().append(STATE_FILE); - file = oldPluginStateLocation.toFile(); - if (file.exists()) { - try { - DataInputStream dis = new DataInputStream(new FileInputStream(file)); - try { - readOldState(dis); - } finally { - dis.close(); - } - saveState(); - file.delete(); - } catch (IOException e) { - CVSUIPlugin.log(Status.ERROR, Policy.bind("RepositoryManager.ioException"), e); //$NON-NLS-1$ - } catch (TeamException e) { - CVSUIPlugin.log(e); - } - } - } - } - private void loadCommentHistory() throws TeamException { - IPath pluginStateLocation = CVSUIPlugin.getPlugin().getStateLocation().append(COMMENT_HIST_FILE); - File file = pluginStateLocation.toFile(); - if (!file.exists()) return; - try { - BufferedInputStream is = new BufferedInputStream(new FileInputStream(file)); - try { - readCommentHistory(is); - } finally { - is.close(); - } - } catch (IOException e) { - CVSUIPlugin.log(Status.ERROR, Policy.bind("RepositoryManager.ioException"), e); //$NON-NLS-1$ - } catch (TeamException e) { - CVSUIPlugin.log(e); - } - } - - protected void saveState() throws TeamException { - IPath pluginStateLocation = CVSUIPlugin.getPlugin().getStateLocation(); - File tempFile = pluginStateLocation.append(REPOSITORIES_VIEW_FILE + ".tmp").toFile(); //$NON-NLS-1$ - File stateFile = pluginStateLocation.append(REPOSITORIES_VIEW_FILE).toFile(); - try { - XMLWriter writer = new XMLWriter(new BufferedOutputStream(new FileOutputStream(tempFile))); - try { - writeState(writer); - } finally { - writer.close(); - } - if (stateFile.exists()) { - stateFile.delete(); - } - boolean renamed = tempFile.renameTo(stateFile); - if (!renamed) { - throw new TeamException(new Status(Status.ERROR, CVSUIPlugin.ID, TeamException.UNABLE, Policy.bind("RepositoryManager.rename", tempFile.getAbsolutePath()), null)); //$NON-NLS-1$ - } - } catch (IOException e) { - throw new TeamException(new Status(Status.ERROR, CVSUIPlugin.ID, TeamException.UNABLE, Policy.bind("RepositoryManager.save",stateFile.getAbsolutePath()), e)); //$NON-NLS-1$ - } - } - private void writeState(XMLWriter writer) throws IOException, CVSException { - writer.startTag(RepositoriesViewContentHandler.REPOSITORIES_VIEW_TAG, null, true); - // Write the repositories - Collection repos = Arrays.asList(getKnownRepositoryLocations()); - Iterator it = repos.iterator(); - while (it.hasNext()) { - CVSRepositoryLocation location = (CVSRepositoryLocation)it.next(); - RepositoryRoot root = getRepositoryRootFor(location); - root.writeState(writer); - } - writer.endTag(RepositoriesViewContentHandler.REPOSITORIES_VIEW_TAG); - } - - private void readState(InputStream stream) throws IOException, TeamException { - SAXParser parser = new SAXParser(); - parser.setContentHandler(new RepositoriesViewContentHandler(this)); - try { - parser.parse(new InputSource(stream)); - } catch (SAXException ex) { - throw new CVSException(Policy.bind("RepositoryManager.parsingProblem", REPOSITORIES_VIEW_FILE), ex); //$NON-NLS-1$ - } - } - private void readCommentHistory(InputStream stream) throws IOException, TeamException { - SAXParser parser = new SAXParser(); - parser.setContentHandler(new CommentHistoryContentHandler()); - try { - parser.parse(new InputSource(stream)); - } catch (SAXException ex) { - throw new CVSException(Policy.bind("RepositoryManager.parsingProblem", COMMENT_HIST_FILE), ex); //$NON-NLS-1$ - } - } - - private void readOldState(DataInputStream dis) throws IOException, TeamException { - int repoSize = dis.readInt(); - boolean version1 = false; - if (repoSize == STATE_FILE_VERSION_1) { - version1 = true; - repoSize = dis.readInt(); - } - for (int i = 0; i < repoSize; i++) { - ICVSRepositoryLocation root = CVSProviderPlugin.getPlugin().getRepository(dis.readUTF()); - RepositoryRoot repoRoot = getRepositoryRootFor(root); - - // read branch tags associated with this root - int tagsSize = dis.readInt(); - CVSTag[] branchTags = new CVSTag[tagsSize]; - for (int j = 0; j < tagsSize; j++) { - String tagName = dis.readUTF(); - int tagType = dis.readInt(); - branchTags[j] = new CVSTag(tagName, tagType); - } - // Ignore the branch tags since they are handled differently now - // addBranchTags(root, branchTags); - - // read the number of projects for this root that have version tags - int projSize = dis.readInt(); - if (projSize > 0) { - for (int j = 0; j < projSize; j++) { - String name = dis.readUTF(); - Set tagSet = new HashSet(); - int numTags = dis.readInt(); - for (int k = 0; k < numTags; k++) { - tagSet.add(new CVSTag(dis.readUTF(), CVSTag.VERSION)); - } - CVSTag[] tags = (CVSTag[]) tagSet.toArray(new CVSTag[tagSet.size()]); - repoRoot.addTags(name, tags); - } - } - // read the auto refresh filenames for this project - if (version1) { - try { - projSize = dis.readInt(); - if (projSize > 0) { - for (int j = 0; j < projSize; j++) { - String name = dis.readUTF(); - Set filenames = new HashSet(); - int numFilenames = dis.readInt(); - for (int k = 0; k < numFilenames; k++) { - filenames.add(dis.readUTF()); - } - repoRoot.setAutoRefreshFiles(name, (String[]) filenames.toArray(new String[filenames.size()])); - } - } - } catch (EOFException e) { - // auto refresh files are not persisted, continue and save them next time. - } - } - broadcastRepositoryChange(repoRoot); - } - } - - protected void saveCommentHistory() throws TeamException { - IPath pluginStateLocation = CVSUIPlugin.getPlugin().getStateLocation(); - File tempFile = pluginStateLocation.append(COMMENT_HIST_FILE + ".tmp").toFile(); //$NON-NLS-1$ - File histFile = pluginStateLocation.append(COMMENT_HIST_FILE).toFile(); - try { - XMLWriter writer = new XMLWriter(new BufferedOutputStream(new FileOutputStream(tempFile))); - try { - writeCommentHistory(writer); - } finally { - writer.close(); - } - if (histFile.exists()) { - histFile.delete(); - } - boolean renamed = tempFile.renameTo(histFile); - if (!renamed) { - throw new TeamException(new Status(Status.ERROR, CVSUIPlugin.ID, TeamException.UNABLE, Policy.bind("RepositoryManager.rename", tempFile.getAbsolutePath()), null)); //$NON-NLS-1$ - } - } catch (IOException e) { - throw new TeamException(new Status(Status.ERROR, CVSUIPlugin.ID, TeamException.UNABLE, Policy.bind("RepositoryManager.save",histFile.getAbsolutePath()), e)); //$NON-NLS-1$ - } - } - private void writeCommentHistory(XMLWriter writer) throws IOException, CVSException { - writer.startTag(ELEMENT_COMMIT_HISTORY, null, false); - for (int i=0; i<previousComments.length && i<MAX_COMMENTS; i++) - writer.printSimpleTag(ELEMENT_COMMIT_COMMENT, previousComments[i]); - writer.endTag(ELEMENT_COMMIT_HISTORY); - } - - public void addRepositoryListener(IRepositoryListener listener) { - listeners.add(listener); - } - - public void removeRepositoryListener(IRepositoryListener listener) { - listeners.remove(listener); - } - - /** - * Add the given resources to their associated providers. - * This schedules the resources for addition; they still need to be committed. - */ - public void add(IResource[] resources, IProgressMonitor monitor) throws TeamException { - Map table = getProviderMapping(resources); - Set keySet = table.keySet(); - monitor.beginTask("", keySet.size() * 1000); //$NON-NLS-1$ - monitor.setTaskName(Policy.bind("RepositoryManager.adding")); //$NON-NLS-1$ - Iterator iterator = keySet.iterator(); - while (iterator.hasNext()) { - IProgressMonitor subMonitor = new SubProgressMonitor(monitor, 1000); - CVSTeamProvider provider = (CVSTeamProvider)iterator.next(); - provider.setComment(getCurrentComment()); - List list = (List)table.get(provider); - IResource[] providerResources = (IResource[])list.toArray(new IResource[list.size()]); - provider.add(providerResources, IResource.DEPTH_ZERO, subMonitor); - } - } - - /** - * Method getCurrentComment. - * @return String - */ - private String getCurrentComment() { - if (previousComments.length == 0) - return ""; //$NON-NLS-1$ - return (String)previousComments[0]; - } - - /** - * Delete the given resources from their associated providers. - * This schedules the resources for deletion; they still need to be committed. - */ - public void delete(IResource[] resources, IProgressMonitor monitor) throws TeamException { - Map table = getProviderMapping(resources); - Set keySet = table.keySet(); - monitor.beginTask("", keySet.size() * 1000); //$NON-NLS-1$ - monitor.setTaskName(Policy.bind("RepositoryManager.deleting")); //$NON-NLS-1$ - Iterator iterator = keySet.iterator(); - while (iterator.hasNext()) { - IProgressMonitor subMonitor = new SubProgressMonitor(monitor, 1000); - CVSTeamProvider provider = (CVSTeamProvider)iterator.next(); - provider.setComment(getCurrentComment()); - List list = (List)table.get(provider); - IResource[] providerResources = (IResource[])list.toArray(new IResource[list.size()]); - provider.delete(providerResources, subMonitor); - } - } - - public void update(IResource[] resources, Command.LocalOption[] options, boolean createBackups, IProgressMonitor monitor) throws TeamException { - Map table = getProviderMapping(resources); - Set keySet = table.keySet(); - monitor.beginTask("", keySet.size() * 1000); //$NON-NLS-1$ - monitor.setTaskName(Policy.bind("RepositoryManager.updating")); //$NON-NLS-1$ - Iterator iterator = keySet.iterator(); - while (iterator.hasNext()) { - IProgressMonitor subMonitor = new SubProgressMonitor(monitor, 1000); - CVSTeamProvider provider = (CVSTeamProvider)iterator.next(); - List list = (List)table.get(provider); - IResource[] providerResources = (IResource[])list.toArray(new IResource[list.size()]); - provider.update(providerResources, options, null, createBackups, subMonitor); - } - } - - /** - * Mark the files as merged. - */ - public void merged(IRemoteSyncElement[] elements) throws TeamException { - Map table = getProviderMapping(elements); - Set keySet = table.keySet(); - Iterator iterator = keySet.iterator(); - while (iterator.hasNext()) { - CVSTeamProvider provider = (CVSTeamProvider)iterator.next(); - provider.setComment(getCurrentComment()); - List list = (List)table.get(provider); - IRemoteSyncElement[] providerElements = (IRemoteSyncElement[])list.toArray(new IRemoteSyncElement[list.size()]); - provider.merged(providerElements); - } - } - - /** - * Return the entered comment or null if canceled. - */ - public String promptForComment(final Shell shell, IResource[] resourcesToCommit) { - final int[] result = new int[1]; - final ReleaseCommentDialog dialog = new ReleaseCommentDialog(shell, resourcesToCommit); - shell.getDisplay().syncExec(new Runnable() { - public void run() { - result[0] = dialog.open(); - if (result[0] != ReleaseCommentDialog.OK) return; - } - }); - if (result[0] != ReleaseCommentDialog.OK) return null; - return dialog.getComment(); - } - - /** - * Prompt to add all or some of the provided resources to version control. - * The value null is returned if the dialog is cancelled. - * - * @param shell - * @param unadded - * @return IResource[] - */ - public IResource[] promptForResourcesToBeAdded(Shell shell, IResource[] unadded) { - if (unadded == null) return new IResource[0]; - if (unadded.length == 0) return unadded; - final IResource[][] result = new IResource[1][0]; - result[0] = null; - final AddToVersionControlDialog dialog = new AddToVersionControlDialog(shell, unadded); - shell.getDisplay().syncExec(new Runnable() { - public void run() { - int code = dialog.open(); - if (code == IDialogConstants.YES_ID) { - result[0] = dialog.getResourcesToAdd(); - } else if(code == IDialogConstants.NO_ID) { - // allow the commit to continue. - result[0] = new IResource[0]; - } - } - }); - return result[0]; - } - /** - * Commit the given resources to their associated providers. - * - * @param resources the resources to commit - * @param monitor the progress monitor - */ - public void commit(IResource[] resources, String comment, IProgressMonitor monitor) throws TeamException { - Map table = getProviderMapping(resources); - Set keySet = table.keySet(); - monitor.beginTask("", keySet.size() * 1000); //$NON-NLS-1$ - monitor.setTaskName(Policy.bind("RepositoryManager.committing")); //$NON-NLS-1$ - Iterator iterator = keySet.iterator(); - while (iterator.hasNext()) { - IProgressMonitor subMonitor = new SubProgressMonitor(monitor, 1000); - CVSTeamProvider provider = (CVSTeamProvider)iterator.next(); - provider.setComment(comment); - List list = (List)table.get(provider); - IResource[] providerResources = (IResource[])list.toArray(new IResource[list.size()]); - provider.checkin(providerResources, IResource.DEPTH_INFINITE, subMonitor); - } - } - - /** - * Helper method. Return a Map mapping provider to a list of resources - * shared with that provider. - */ - private Map getProviderMapping(IResource[] resources) { - Map result = new HashMap(); - for (int i = 0; i < resources.length; i++) { - RepositoryProvider provider = RepositoryProvider.getProvider(resources[i].getProject(), CVSProviderPlugin.getTypeId()); - List list = (List)result.get(provider); - if (list == null) { - list = new ArrayList(); - result.put(provider, list); - } - list.add(resources[i]); - } - return result; - } - /** - * Helper method. Return a Map mapping provider to a list of IRemoteSyncElements - * shared with that provider. - */ - private Map getProviderMapping(IRemoteSyncElement[] elements) { - Map result = new HashMap(); - for (int i = 0; i < elements.length; i++) { - RepositoryProvider provider = RepositoryProvider.getProvider(elements[i].getLocal().getProject(), CVSProviderPlugin.getTypeId()); - List list = (List)result.get(provider); - if (list == null) { - list = new ArrayList(); - result.put(provider, list); - } - list.add(elements[i]); - } - return result; - } - - public ICVSRepositoryLocation getRepositoryLocationFor(ICVSResource resource) { - try { - return internalGetRepositoryLocationFor(resource); - } catch (CVSException e) { - CVSUIPlugin.log(e); - return null; - } - } - - private ICVSRepositoryLocation internalGetRepositoryLocationFor(ICVSResource resource) throws CVSException { - ICVSFolder folder; - if (resource.isFolder()) { - folder = (ICVSFolder)resource; - } else { - folder = resource.getParent(); - } - if (folder.isCVSFolder()) { - ICVSRepositoryLocation location = CVSProviderPlugin.getPlugin().getRepository(folder.getFolderSyncInfo().getRoot()); - return location; - } - // XXX This is asking for trouble - return null; - } - - private RepositoryRoot getRepositoryRootFor(ICVSResource resource) throws CVSException { - ICVSRepositoryLocation location = internalGetRepositoryLocationFor(resource); - if (location == null) return null; - return getRepositoryRootFor(location); - } - - public RepositoryRoot getRepositoryRootFor(ICVSRepositoryLocation location) { - RepositoryRoot root = (RepositoryRoot)repositoryRoots.get(location.getLocation()); - if (root == null) { - root = new RepositoryRoot(location); - add(root); - } - return root; - } - - /** - * Add the given repository root to the receiver. The provided instance of RepositoryRoot - * is used to provide extra information about the repository location - * - * @param currentRepositoryRoot - */ - public void add(RepositoryRoot root) { - repositoryRoots.put(root.getRoot().getLocation(), root); - broadcastRepositoryChange(root); - } - - private void broadcastRepositoryChange(RepositoryRoot root) { - if (notificationLevel == 0) { - broadcastRepositoriesChanged(new ICVSRepositoryLocation[] {root.getRoot()}); - } else { - changedRepositories.put(root.getRoot().getLocation(), root.getRoot()); - } - } - - private void broadcastRepositoriesChanged(ICVSRepositoryLocation[] roots) { - if (roots.length == 0) return; - Iterator it = listeners.iterator(); - while (it.hasNext()) { - IRepositoryListener listener = (IRepositoryListener)it.next(); - listener.repositoriesChanged(roots); - } - } - - /** - * Run the given runnable, waiting until the end to perform a refresh - * - * @param runnable - * @param monitor - */ - public void run(IRunnableWithProgress runnable, IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - try { - notificationLevel++; - runnable.run(monitor); - } finally { - notificationLevel = Math.max(0, notificationLevel - 1); - if (notificationLevel == 0) { - try { - Collection roots = changedRepositories.values(); - broadcastRepositoriesChanged((ICVSRepositoryLocation[]) roots.toArray(new ICVSRepositoryLocation[roots.size()])); - } finally { - changedRepositories.clear(); - } - } - } - } - - /** - * Method isDisplayingProjectVersions. - * @param repository - * @return boolean - */ - public boolean isDisplayingProjectVersions(ICVSRepositoryLocation repository) { - return true; - } - - /** - * Method filterResources filters the given resources using the given - * working set. - * - * @param current - * @param resources - * @return ICVSRemoteResource[] - */ - public ICVSRemoteResource[] filterResources(IWorkingSet workingSet, ICVSRemoteResource[] resources) { - if (workingSet == null) return resources; - // get the projects associated with the working set - IAdaptable[] adaptables = workingSet.getElements(); - Set projects = new HashSet(); - for (int i = 0; i < adaptables.length; i++) { - IAdaptable adaptable = adaptables[i]; - Object adapted = adaptable.getAdapter(IResource.class); - if (adapted != null) { - // Can this code be generalized? - IProject project = ((IResource)adapted).getProject(); - projects.add(project); - } - } - List result = new ArrayList(); - for (int i = 0; i < resources.length; i++) { - ICVSRemoteResource resource = resources[i]; - for (Iterator iter = projects.iterator(); iter.hasNext();) { - IProject project = (IProject) iter.next(); - if (project.getName().equals(resource.getName())) { - result.add(resource); - break; - } - } - } - return (ICVSRemoteResource[]) result.toArray(new ICVSRemoteResource[result.size()]); - } - - /** - * This method is invoked whenever the refresh button in the - * RepositoriesView is pressed. - */ - void clearCaches() { - for (Iterator iter = repositoryRoots.values().iterator(); iter.hasNext();) { - RepositoryRoot root = (RepositoryRoot) iter.next(); - root.clearCache(); - } - } - /** - * Method setLabel. - * @param location - * @param label - */ - public void setLabel(CVSRepositoryLocation location, String label) throws CVSException { - RepositoryRoot root = getRepositoryRootFor(location); - String oldLabel = root.getName(); - if (oldLabel == null) { - if (label == null) return; - root.setName(label); - } else if (label == null) { - root.setName(label); - } else if (label.equals(oldLabel)) { - return; - } else { - root.setName(label); - } - broadcastRepositoryChange(root); - } - - /** - * Replace the old repository location with the new one assuming that they - * are the same location with different authentication informations - * @param location - * @param newLocation - */ - public void replaceRepositoryLocation( - final ICVSRepositoryLocation oldLocation, - final CVSRepositoryLocation newLocation) throws CVSException { - - try { - run(new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - try { - RepositoryRoot root = getRepositoryRootFor(oldLocation); - // Disposing of the old location will result in the deletion of the - // cached root through a listener callback - CVSProviderPlugin.getPlugin().disposeRepository(oldLocation); - - newLocation.updateCache(); - root.setRepositoryLocation(newLocation); - add(root); - } catch (CVSException e) { - throw new InvocationTargetException(e); - } - } - }, Policy.monitorFor(null)); - } catch (InvocationTargetException e) { - CVSException.wrapException(e); - } catch (InterruptedException e) { - } - } - - /** - * Purge any cahced information. - */ - public void purgeCache() { - for (Iterator iter = repositoryRoots.values().iterator(); iter.hasNext();) { - RepositoryRoot root = (RepositoryRoot) iter.next(); - root.clearCache(); - } - } - - /** - * Answer the list of comments that were previously used when committing. - * @return String[] - */ - public String[] getPreviousComments() { - return previousComments; - } - - /** - * Method addComment. - * @param string - */ - public void addComment(String comment) { - // Only add the comment if the first entry isn't the same already - if (previousComments.length > 0 && previousComments[0].equals(comment)) return; - // Insert the comment as the first element - String[] newComments = new String[Math.min(previousComments.length + 1, MAX_COMMENTS)]; - newComments[0] = comment; - for (int i = 1; i < newComments.length; i++) { - newComments[i] = previousComments[i-1]; - } - previousComments = newComments; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryRoot.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryRoot.java deleted file mode 100644 index 3da924145..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryRoot.java +++ /dev/null @@ -1,465 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.repo; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.PlatformObject; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSStatus; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFile; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteResource; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.internal.ccvs.core.ILogEntry; -import org.eclipse.team.internal.ccvs.core.connection.CVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ccvs.ui.XMLWriter; - -public class RepositoryRoot extends PlatformObject { - - public static final String[] DEFAULT_AUTO_REFRESH_FILES = { ".project", ".vcm_meta" }; //$NON-NLS-1$ //$NON-NLS-2$ - private static final String DEFINED_MODULE_PREFIX = "module:"; //$NON-NLS-1$ - - ICVSRepositoryLocation root; - String name; - // Map of String (remote folder path) -> Set (CVS tags) - Map knownTags = new HashMap(); - // Map of String (remote folder path) -> Set (file paths that are project relative) - Map autoRefreshFiles = new HashMap(); - // Map of String (module name) -> ICVSRemoteFolder (that is a defined module) - Map modulesCache; - - public RepositoryRoot(ICVSRepositoryLocation root) { - this.root = root; - } - - /** - * Returns the name. - * @return String - */ - public String getName() { - return name; - } - - /** - * Method getRemoteFolder. - * @param path - * @param tag - * @return ICVSRemoteFolder - */ - public ICVSRemoteFolder getRemoteFolder(String path, CVSTag tag, IProgressMonitor monitor) throws CVSException { - if (isDefinedModuleName(path)) { - return getDefinedModule(getDefinedModuleName(path), tag, monitor); - } else { - return root.getRemoteFolder(path, tag); - } - } - - static boolean isDefinedModuleName(String path) { - return path.startsWith(DEFINED_MODULE_PREFIX); - } - - static String getDefinedModuleName(String path) { - return path.substring(DEFINED_MODULE_PREFIX.length()); - } - - static String asDefinedModulePath(String path) { - return DEFINED_MODULE_PREFIX + path; - } - - /** - * Method getDefinedModule. - * @param path - * @param tag - * @param monitor - * @return ICVSRemoteFolder - */ - private ICVSRemoteFolder getDefinedModule(String path, CVSTag tag, IProgressMonitor monitor) throws CVSException { - Map cache = getDefinedModulesCache(tag, monitor); - ICVSRemoteFolder folder = (ICVSRemoteFolder)cache.get(path); - if (folder != null) { - folder = (ICVSRemoteFolder)folder.forTag(tag); - } - return folder; - } - - private Map getDefinedModulesCache(CVSTag tag, IProgressMonitor monitor) throws CVSException { - if (modulesCache == null) { - modulesCache = new HashMap(); - try { - ICVSRemoteResource[] folders = root.members(CVSTag.DEFAULT, true, monitor); - for (int i = 0; i < folders.length; i++) { - ICVSRemoteResource resource = folders[i]; - modulesCache.put(resource.getName(), resource); - } - } catch (CVSException e) { - // we could't fetch the modules. Log the problem and continue - CVSUIPlugin.log(e); - } - } - return modulesCache; - } - - public ICVSRemoteResource[] getDefinedModules(CVSTag tag, IProgressMonitor monitor) throws CVSException { - Map cache = getDefinedModulesCache(tag, monitor); - return (ICVSRemoteResource[]) cache.values().toArray(new ICVSRemoteResource[cache.size()]); - } - - public static String getRemotePathFor(ICVSResource resource) throws CVSException { - if (resource.isFolder()) { - if (resource instanceof ICVSRemoteFolder) { - ICVSRemoteFolder remoteFolder = (ICVSRemoteFolder) resource; - if (remoteFolder.isDefinedModule()) { - return asDefinedModulePath(remoteFolder.getName()); - } - } - FolderSyncInfo info = ((ICVSFolder)resource).getFolderSyncInfo(); - if (info == null) - throw new CVSException(Policy.bind("RepositoryRoot.folderInfoMissing", resource.getName())); //$NON-NLS-1$ - return info.getRepository(); - } else { - FolderSyncInfo info = resource.getParent().getFolderSyncInfo(); - if (info == null) - throw new CVSException(Policy.bind("RepositoryRoot.folderInfoMissing", resource.getParent().getName())); //$NON-NLS-1$ - String path = new Path(info.getRepository()).append(resource.getName()).toString(); - return path; - } - } - - /** - * Returns the root. - * @return ICVSRepositoryLocation - */ - public ICVSRepositoryLocation getRoot() { - return root; - } - - /** - * Sets the name. - * @param name The name to set - */ - public void setName(String name) { - this.name = name; - } - - /** - * Accept the tags for any remote path that represents a folder. However, for the time being, - * the given version tags are added to the list of known tags for the - * remote ancestor of the resource that is a direct child of the remote root. - * - * It is the reponsibility of the caller to ensure that the given remote path is valid. - */ - public void addTags(String remotePath, CVSTag[] tags) { - // Get the name to cache the version tags with - String name = getCachePathFor(remotePath); - - // Make sure there is a table for the ancestor that holds the tags - Set set = (Set)knownTags.get(name); - if (set == null) { - set = new HashSet(); - knownTags.put(name, set); - } - - // Store the tag with the appropriate ancestor - for (int i = 0; i < tags.length; i++) { - set.add(tags[i]); - } - } - - /** - * Remove the given tags from the receiver - * @param remotePath - * @param tags - */ - public void removeTags(String remotePath, CVSTag[] tags) { - // Get the name to cache the version tags with - String name = getCachePathFor(remotePath); - - // Make sure there is a table for the ancestor that holds the tags - Set set = (Set)knownTags.get(name); - if (set == null) { - return; - } - - // Store the tag with the appropriate ancestor - for (int i = 0; i < tags.length; i++) { - set.remove(tags[i]); - } - } - - /** - * Returns the absolute paths of the auto refresh files relative to the - * repository. - * - * @return String[] - */ - public String[] getAutoRefreshFiles(String remotePath) { - String name = getCachePathFor(remotePath); - Set files = (Set)autoRefreshFiles.get(name); - if (files == null || files.isEmpty()) { - // convert the default relative file paths to full paths - if (isDefinedModuleName(remotePath)) { - return new String[0]; - } - List result = new ArrayList(); - for (int i = 0; i < DEFAULT_AUTO_REFRESH_FILES.length; i++) { - String relativePath = DEFAULT_AUTO_REFRESH_FILES[i]; - result.add(new Path(remotePath).append(relativePath).toString()); - } - return (String[]) result.toArray(new String[result.size()]); - } else { - return (String[]) files.toArray(new String[files.size()]); - } - } - - /** - * Sets the auto refresh files for the given remote path to the given - * string values which are absolute file paths (relative to the receiver). - * - * @param autoRefreshFiles The autoRefreshFiles to set - */ - public void setAutoRefreshFiles(String remotePath, String[] autoRefreshFiles) { - Set newFiles = new HashSet(Arrays.asList(autoRefreshFiles)); - // Check to see if the auto-refresh files are the default files - if (autoRefreshFiles.length == DEFAULT_AUTO_REFRESH_FILES.length) { - boolean isDefault = true; - for (int i = 0; i < DEFAULT_AUTO_REFRESH_FILES.length; i++) { - String filePath = DEFAULT_AUTO_REFRESH_FILES[i]; - if (!newFiles.contains(new Path(remotePath).append(filePath).toString())) { - isDefault = false; - break; - } - } - if (isDefault) { - this.autoRefreshFiles.remove(getCachePathFor(remotePath)); - return; - } - } - this.autoRefreshFiles.put(getCachePathFor(remotePath), newFiles); - } - - /** - * Fetches tags from auto-refresh files. - */ - public void refreshDefinedTags(String remotePath, boolean replace, IProgressMonitor monitor) throws TeamException { - String[] filesToRefresh = getAutoRefreshFiles(remotePath); - monitor.beginTask(null, filesToRefresh.length * 10); //$NON-NLS-1$ - try { - List tags = new ArrayList(); - for (int i = 0; i < filesToRefresh.length; i++) { - ICVSRemoteFile file = root.getRemoteFile(filesToRefresh[i], CVSTag.DEFAULT); - tags.addAll(Arrays.asList(fetchTags(file, Policy.subMonitorFor(monitor, 5)))); - } - if (!tags.isEmpty()) { - addTags(remotePath, (CVSTag[]) tags.toArray(new CVSTag[tags.size()])); - } - } finally { - monitor.done(); - } - } - - /* - * Method clearTags. - */ - private void clearTags(String remotePath) { - String name = getCachePathFor(remotePath); - knownTags.remove(name); - } - - /** - * Returns Branch and Version tags for the given files - */ - private CVSTag[] fetchTags(ICVSRemoteFile file, IProgressMonitor monitor) throws TeamException { - try { - Set tagSet = new HashSet(); - ILogEntry[] entries = file.getLogEntries(monitor); - for (int j = 0; j < entries.length; j++) { - CVSTag[] tags = entries[j].getTags(); - for (int k = 0; k < tags.length; k++) { - tagSet.add(tags[k]); - } - } - return (CVSTag[])tagSet.toArray(new CVSTag[0]); - } catch (TeamException e) { - IStatus status = e.getStatus(); - if (status.getCode() == CVSStatus.SERVER_ERROR && status.isMultiStatus()) { - IStatus[] children = status.getChildren(); - if (children.length == 1 && children[0].getCode() == CVSStatus.DOES_NOT_EXIST) { - return new CVSTag[0]; - } - } - throw e; - } - } - - private String getCachePathFor(String remotePath) { - String root = new Path(remotePath).segment(0); - if (isDefinedModuleName(remotePath)) { - return asDefinedModulePath(root); - } - return root; - } - - /** - * Write out the state of the receiver as XML on the given XMLWriter. - * - * @param writer - * @throws IOException - */ - public void writeState(XMLWriter writer) throws IOException { - - HashMap attributes = new HashMap(); - - attributes.clear(); - attributes.put(RepositoriesViewContentHandler.ID_ATTRIBUTE, root.getLocation()); - String programName = ((CVSRepositoryLocation)root).getRemoteCVSProgramName(); - if (!programName.equals(CVSRepositoryLocation.DEFAULT_REMOTE_CVS_PROGRAM_NAME)) { - attributes.put(RepositoriesViewContentHandler.REPOSITORY_PROGRAM_NAME_ATTRIBUTE, programName); - } - if (name != null) { - attributes.put(RepositoriesViewContentHandler.NAME_ATTRIBUTE, name); - } - writer.startTag(RepositoriesViewContentHandler.REPOSITORY_TAG, attributes, true); - - // Gather all the modules that have tags and/or auto-refresh files - - - // for each module, write the moduel, tags and auto-refresh files. - String[] paths = getKnownRemotePaths(); - for (int i = 0; i < paths.length; i++) { - String path = paths[i]; - attributes.clear(); - String name = path; - if (isDefinedModuleName(path)) { - name = getDefinedModuleName(path); - attributes.put(RepositoriesViewContentHandler.TYPE_ATTRIBUTE, RepositoriesViewContentHandler.DEFINED_MODULE_TYPE); - } - attributes.put(RepositoriesViewContentHandler.PATH_ATTRIBUTE, name); - writer.startTag(RepositoriesViewContentHandler.MODULE_TAG, attributes, true); - Set tagSet = (Set)knownTags.get(path); - if (tagSet != null) { - Iterator tagIt = tagSet.iterator(); - while (tagIt.hasNext()) { - CVSTag tag = (CVSTag)tagIt.next(); - attributes.clear(); - attributes.put(RepositoriesViewContentHandler.NAME_ATTRIBUTE, tag.getName()); - attributes.put(RepositoriesViewContentHandler.TYPE_ATTRIBUTE, RepositoriesViewContentHandler.TAG_TYPES[tag.getType()]); - writer.startAndEndTag(RepositoriesViewContentHandler.TAG_TAG, attributes, true); - } - } - Set refreshSet = (Set)autoRefreshFiles.get(path); - if (refreshSet != null) { - Iterator filenameIt = refreshSet.iterator(); - while (filenameIt.hasNext()) { - String filename = (String)filenameIt.next(); - attributes.clear(); - attributes.put(RepositoriesViewContentHandler.FULL_PATH_ATTRIBUTE, filename); - writer.startAndEndTag(RepositoriesViewContentHandler.AUTO_REFRESH_FILE_TAG, attributes, true); - } - } - writer.endTag(RepositoriesViewContentHandler.MODULE_TAG); - } - writer.endTag(RepositoriesViewContentHandler.REPOSITORY_TAG); - } - - /** - * Method getKnownTags. - * @param remotePath - * @return CVSTag[] - */ - public CVSTag[] getKnownTags(String remotePath) { - Set tagSet = (Set)knownTags.get(getCachePathFor(remotePath)); - if (tagSet == null) return new CVSTag[0]; - return (CVSTag[]) tagSet.toArray(new CVSTag[tagSet.size()]); - } - - public String[] getKnownRemotePaths() { - Set paths = new HashSet(); - paths.addAll(knownTags.keySet()); - paths.addAll(autoRefreshFiles.keySet()); - return (String[]) paths.toArray(new String[paths.size()]); - } - /** - * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) - */ - public Object getAdapter(Class adapter) { - if (ICVSRepositoryLocation.class.equals(adapter)) return getRoot(); - return super.getAdapter(adapter); - } - - public ICVSRemoteResource[] filterResources(ICVSRemoteResource[] resource) { - List result = new ArrayList(); - for (int i = 0; i < resource.length; i++) { - ICVSRemoteResource remoteResource = resource[i]; - if (remoteResource instanceof ICVSRemoteFolder) { - ICVSRemoteFolder folder = (ICVSRemoteFolder) remoteResource; - if (tagIsKnown(remoteResource)) { - result.add(folder); - } - } - } - return (ICVSRemoteResource[]) result.toArray(new ICVSRemoteResource[result.size()]); - } - - /** - * Method tagIsKnown. - * @param remoteResource - * @return boolean - */ - public boolean tagIsKnown(ICVSRemoteResource remoteResource) { - if (remoteResource instanceof ICVSRemoteFolder) { - ICVSRemoteFolder folder = (ICVSRemoteFolder) remoteResource; - String path = getCachePathFor(folder.getRepositoryRelativePath()); - CVSTag[] tags = getKnownTags(path); - CVSTag tag = folder.getTag(); - for (int i = 0; i < tags.length; i++) { - CVSTag knownTag = tags[i]; - if (knownTag.equals(tag)) return true; - } - } - return false; - } - - /** - * This method is invoked whenever the refresh button in the - * RepositoriesView is pressed. - */ - void clearCache() { - modulesCache = null; - } - - /** - * Sets the root. - * @param root The root to set - */ - void setRepositoryLocation(ICVSRepositoryLocation root) { - this.root = root; - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositorySorter.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositorySorter.java deleted file mode 100644 index ad050801b..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositorySorter.java +++ /dev/null @@ -1,110 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.repo; - - -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jface.viewers.ViewerSorter; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFile; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteResource; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.ui.model.BranchCategory; -import org.eclipse.team.internal.ccvs.ui.model.CVSTagElement; -import org.eclipse.team.internal.ccvs.ui.model.RemoteModule; -import org.eclipse.team.internal.ccvs.ui.model.VersionCategory; - -public class RepositorySorter extends ViewerSorter { - public int category(Object element) { - if (element instanceof ICVSRemoteFolder) { - if (((ICVSRemoteFolder)element).isDefinedModule()) { - return 7; - } - return 1; - } - if (element instanceof RemoteModule) { - ICVSRemoteResource resource = ((RemoteModule)element).getCVSResource(); - if (resource instanceof ICVSRemoteFolder) { - ICVSRemoteFolder folder = (ICVSRemoteFolder) resource; - if (folder.isDefinedModule()) { - return 7; - } - } - return 1; - } - if (element instanceof ICVSRemoteFile) { - return 2; - } - if (element instanceof CVSTagElement) { - CVSTagElement tagElement = (CVSTagElement)element; - if (tagElement.getTag().getType() == CVSTag.HEAD) { - return 0; - } else if (tagElement.getTag().getType() == CVSTag.BRANCH) { - return 4; - } else if (tagElement.getTag().getType() == CVSTag.VERSION) { - return 5; - } else { - return 6; - } - } - if (element instanceof BranchCategory) { - return 4; - } - if (element instanceof VersionCategory) { - return 5; - } - return 0; - } - - public int compare(Viewer viewer, Object o1, Object o2) { - int cat1 = category(o1); - int cat2 = category(o2); - if (cat1 != cat2) return cat1 - cat2; - - if (o1 instanceof CVSTagElement && o2 instanceof CVSTagElement) { - CVSTag tag1 = ((CVSTagElement)o1).getTag(); - CVSTag tag2 = ((CVSTagElement)o2).getTag(); - if (tag1.getType() == CVSTag.BRANCH) { - return tag1.compareTo(tag2); - } else { - return -1 * tag1.compareTo(tag2); - } - } - - // Sort versions in reverse alphabetical order - if (o1 instanceof ICVSRemoteFolder && o2 instanceof ICVSRemoteFolder) { - ICVSRemoteFolder f1 = (ICVSRemoteFolder)o1; - ICVSRemoteFolder f2 = (ICVSRemoteFolder)o2; - if (f1.getName().equals(f2.getName())) { - return compare(f1, f2); - } - } - - if (o1 instanceof ICVSRepositoryLocation && o2 instanceof ICVSRepositoryLocation) { - return ((ICVSRepositoryLocation)o1).getLocation().compareTo(((ICVSRepositoryLocation)o2).getLocation()); - } - - return super.compare(viewer, o1, o2); - } - - /* - * Compare to remote folders whose names are the same. - */ - private int compare(ICVSRemoteFolder f1, ICVSRemoteFolder f2) { - CVSTag tag1 = f1.getTag(); - CVSTag tag2 = f2.getTag(); - if (tag1 == null) return 1; - if (tag2 == null) return -1; - return tag2.compareTo(tag1); - } -} - diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSubscriberAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSubscriberAction.java deleted file mode 100644 index 3bb84704d..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSubscriberAction.java +++ /dev/null @@ -1,202 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.subscriber; - -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.operation.IRunnableContext; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.core.subscribers.SyncInfo; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; -import org.eclipse.team.internal.ccvs.core.CVSSyncInfo; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.internal.ccvs.core.ICVSRunnable; -import org.eclipse.team.internal.ccvs.core.client.PruneFolderVisitor; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.ui.sync.SubscriberAction; -import org.eclipse.team.ui.sync.SyncInfoSet; -import org.eclipse.ui.PlatformUI; - -public abstract class CVSSubscriberAction extends SubscriberAction { - - protected boolean isOutOfSync(SyncInfo resource) { - if (resource == null) return false; - return (!(resource.getKind() == 0) || ! resource.getLocal().exists()); - } - - protected void makeInSync(SyncInfo[] folders) throws TeamException { - // If a node has a parent that is an incoming folder creation, we have to - // create that folder locally and set its sync info before we can get the - // node itself. We must do this for all incoming folder creations (recursively) - // in the case where there are multiple levels of incoming folder creations. - for (int i = 0; i < folders.length; i++) { - SyncInfo resource = folders[i]; - makeInSync(resource); - } - } - - protected void makeInSync(SyncInfo info) throws TeamException { - if (isOutOfSync(info)) { - SyncInfo parent = getParent(info); - if (parent != null) { - makeInSync(parent); - } - if (info == null) return; - if (info instanceof CVSSyncInfo) { - CVSSyncInfo cvsInfo= (CVSSyncInfo) info; - cvsInfo.makeInSync(); - } - } - } - - protected void makeOutgoing(SyncInfo[] folders, IProgressMonitor monitor) throws TeamException { - // If a node has a parent that is an incoming folder creation, we have to - // create that folder locally and set its sync info before we can get the - // node itself. We must do this for all incoming folder creations (recursively) - // in the case where there are multiple levels of incoming folder creations. - monitor.beginTask(null, 100 * folders.length); - for (int i = 0; i < folders.length; i++) { - SyncInfo info = folders[i]; - makeOutgoing(info, Policy.subMonitorFor(monitor, 100)); - } - monitor.done(); - } - - private void makeOutgoing(SyncInfo info, IProgressMonitor monitor) throws TeamException { - if (info == null) return; - if (info instanceof CVSSyncInfo) { - CVSSyncInfo cvsInfo= (CVSSyncInfo) info; - cvsInfo.makeOutgoing(monitor); - } - } - - /** - * Handle the exception by showing an error dialog to the user. - * Sync actions seem to need to be sync-execed to work - * @param t - */ - protected void handle(Throwable t) { - CVSUIPlugin.openError(getShell(), getErrorTitle(), null, t, CVSUIPlugin.PERFORM_SYNC_EXEC | CVSUIPlugin.LOG_NONTEAM_EXCEPTIONS); - } - - /** - * Return the error title that will appear in any error dialogs shown to the user - * @return - */ - protected String getErrorTitle() { - return null; - } - - /* (non-Javadoc) - * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) - */ - public void run(IAction action) { -// TODO: Saving can change the sync state! How should this be handled? -// boolean result = saveIfNecessary(); -// if (!result) return null; - - SyncInfoSet syncSet = getFilteredSyncInfoSet(getFilteredSyncInfos()); - if (syncSet == null || syncSet.isEmpty()) return; - try { - getRunnableContext().run(true /* fork */, true /* cancelable */, getRunnable(syncSet)); - } catch (InvocationTargetException e) { - handle(e); - } catch (InterruptedException e) { - // nothing to do; - } - } - - /** - * Return an IRunnableWithProgress that will operate on the given sync set. - * This method is invoked by <code>run(IAction)</code> when the action is - * executed from a menu. The default implementation invokes the method - * <code>run(SyncInfoSet, IProgressMonitor)</code>. - * @param syncSet - * @return - */ - protected IRunnableWithProgress getRunnable(final SyncInfoSet syncSet) { - return new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - try { - CVSWorkspaceRoot.getCVSFolderFor(ResourcesPlugin.getWorkspace().getRoot()).run( - new ICVSRunnable() { - public void run(IProgressMonitor monitor) throws CVSException { - try { - CVSSubscriberAction.this.run(syncSet, monitor); - } catch (TeamException e) { - throw CVSException.wrapException(e); - } - } - }, monitor); - } catch (TeamException e) { - throw new InvocationTargetException(e); - } - } - }; - } - - protected abstract void run(SyncInfoSet syncSet, IProgressMonitor monitor) throws TeamException; - - protected IRunnableContext getRunnableContext() { - return PlatformUI.getWorkbench().getActiveWorkbenchWindow(); - } - - /** - * Filter the sync resource set using action specific criteria or input from the user. - */ - protected SyncInfoSet getFilteredSyncInfoSet(SyncInfo[] selectedResources) { - // If there are conflicts or outgoing changes in the syncSet, we need to warn the user. - return new SyncInfoSet(selectedResources); - } - - protected void pruneEmptyParents(SyncInfo[] nodes) throws CVSException { - // TODO: A more explicit tie in to the pruning mechanism would be prefereable. - // i.e. I don't like referencing the option and visitor directly - if (!CVSProviderPlugin.getPlugin().getPruneEmptyDirectories()) return; - ICVSResource[] cvsResources = new ICVSResource[nodes.length]; - for (int i = 0; i < cvsResources.length; i++) { - cvsResources[i] = CVSWorkspaceRoot.getCVSResourceFor(nodes[i].getLocal()); - } - new PruneFolderVisitor().visit( - CVSWorkspaceRoot.getCVSFolderFor(ResourcesPlugin.getWorkspace().getRoot()), - cvsResources); - } - - public CVSSyncInfo getCVSSyncInfo(SyncInfo info) { - if (info instanceof CVSSyncInfo) { - return (CVSSyncInfo)info; - } - return null; - } - - protected SyncInfo getParent(SyncInfo info) throws TeamException { - return getSubscriber().getSyncInfo(info.getLocal().getParent(), new NullProgressMonitor()); - } - - protected IResource[] getIResourcesFrom(SyncInfo[] nodes) { - List resources = new ArrayList(nodes.length); - for (int i = 0; i < nodes.length; i++) { - resources.add(nodes[i].getLocal()); - } - return (IResource[]) resources.toArray(new IResource[resources.size()]); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateAction.java deleted file mode 100644 index a6947c38c..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateAction.java +++ /dev/null @@ -1,198 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.subscriber; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.core.subscribers.SyncInfo; -import org.eclipse.team.core.subscribers.TeamSubscriber; -import org.eclipse.team.core.sync.IRemoteResource; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSMergeSubscriber; -import org.eclipse.team.internal.ccvs.core.CVSSyncInfo; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.team.internal.ccvs.core.client.Command; -import org.eclipse.team.internal.ccvs.core.client.Update; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.ui.sync.OrSyncInfoFilter; -import org.eclipse.team.ui.sync.SyncInfoDirectionFilter; -import org.eclipse.team.ui.sync.SyncInfoFilter; -import org.eclipse.team.ui.sync.SyncInfoSet; - -/** - * This action performs a "cvs update -j start -j end ..." to merge changes - * into the local workspace. - */ -public class MergeUpdateAction extends SafeUpdateAction { - - /* (non-Javadoc) - * @see org.eclipse.team.ui.sync.SubscriberAction#getSyncInfoFilter() - */ - protected SyncInfoFilter getSyncInfoFilter() { - // Update works for all incoming and conflicting nodes - // TODO: there should be an instance variable for the filter - return new OrSyncInfoFilter(new SyncInfoFilter[] { - new SyncInfoDirectionFilter(SyncInfo.INCOMING), - new SyncInfoDirectionFilter(SyncInfo.CONFLICTING) - }); - } - - protected void updated(IResource[] resources) throws CVSException { - // Mark all succesfully updated resources as merged - ((CVSMergeSubscriber)getSubscriber()).merged(resources); - } - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.subscriber.SafeUpdateAction#runUpdateDeletions(org.eclipse.team.internal.ui.sync.views.SyncInfo[], org.eclipse.team.internal.ccvs.ui.repo.RepositoryManager, org.eclipse.core.runtime.IProgressMonitor) - */ - protected void runUpdateDeletions(SyncInfo[] nodes, IProgressMonitor monitor) throws TeamException { - // When merging, update deletions become outgoing deletions so just delete - // the files locally without unmanaging (so the sync info is kept to - // indicate an outgoing deletion - try { - monitor.beginTask(null, 100 * nodes.length); - for (int i = 0; i < nodes.length; i++) { - IResource resource = nodes[i].getLocal(); - if (resource.getType() == IResource.FILE) { - ((IFile)resource).delete(false /* force */, true /* keep local history */, Policy.subMonitorFor(monitor, 100)); - } - } - } catch (CoreException e) { - throw CVSException.wrapException(e); - } finally { - monitor.done(); - } - } - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.subscriber.SubscriberUpdateAction#runUpdateShallow(org.eclipse.team.internal.ui.sync.views.SyncInfo[], org.eclipse.team.internal.ccvs.ui.repo.RepositoryManager, org.eclipse.core.runtime.IProgressMonitor) - */ - protected void runSafeUpdate(SyncInfo[] nodes, IProgressMonitor monitor) throws TeamException { - - TeamSubscriber subscriber = getSubscriber(); - if (!(subscriber instanceof CVSMergeSubscriber)) { - throw new CVSException("Invalid subscriber: " + subscriber.getId()); - } - CVSTag startTag = ((CVSMergeSubscriber)subscriber).getStartTag(); - CVSTag endTag = ((CVSMergeSubscriber)subscriber).getEndTag(); - - // Incoming additions require different handling then incoming changes and deletions - List additions = new ArrayList(); - List changes = new ArrayList(); - for (int i = 0; i < nodes.length; i++) { - SyncInfo resource = nodes[i]; - int kind = resource.getKind(); - if ((kind & SyncInfo.ADDITION) != 0) { - additions.add(resource); - } else { - changes.add(resource); - } - } - - monitor.beginTask(null, (additions.size() + changes.size()) * 100); - if (!additions.isEmpty()) { - safeUpdate( - getIResourcesFrom((SyncInfo[]) additions.toArray(new SyncInfo[additions.size()])), - new Command.LocalOption[] { - Command.DO_NOT_RECURSE, - Update.makeArgumentOption(Update.JOIN, endTag.getName()) - }, - Policy.subMonitorFor(monitor, additions.size() * 100)); - } - if (!changes.isEmpty()) { - safeUpdate( - getIResourcesFrom((SyncInfo[]) changes.toArray(new SyncInfo[changes.size()])), - new Command.LocalOption[] { - Command.DO_NOT_RECURSE, - Update.makeArgumentOption(Update.JOIN, startTag.getName()), - Update.makeArgumentOption(Update.JOIN, endTag.getName()) - }, - Policy.subMonitorFor(monitor, changes.size() * 100)); - } - monitor.done(); - } - - /* - * @see UpdateSyncAction#runUpdateDeep(IProgressMonitor, List, RepositoryManager) - * incoming-change - * incoming-deletion - */ - protected void overwriteUpdate(SyncInfoSet set, IProgressMonitor monitor) throws TeamException { - SyncInfo[] nodes = set.getSyncInfos(); - monitor.beginTask(null, 1000 * nodes.length); - try { - for (int i = 0; i < nodes.length; i++) { - makeRemoteLocal(nodes[i], Policy.subMonitorFor(monitor, 1000)); - } - } finally { - monitor.done(); - } - } - - /* - * If called on a new folder, the folder will become an outgoing addition. - */ - private void makeRemoteLocal(SyncInfo info, IProgressMonitor monitor) throws TeamException { - IRemoteResource remote = info.getRemote(); - IResource local = info.getLocal(); - try { - if(remote==null) { - local.delete(false, monitor); - } else { - if(remote.isContainer()) { - ensureContainerExists(info); - } else { - monitor.beginTask(null, 200); - try { - IFile localFile = (IFile)local; - if(local.exists()) { - localFile.setContents(remote.getContents(Policy.subMonitorFor(monitor, 100)), false /*don't force*/, true /*keep history*/, Policy.subMonitorFor(monitor, 100)); - } else { - ensureContainerExists(getParent(info)); - localFile.create(remote.getContents(Policy.subMonitorFor(monitor, 100)), false /*don't force*/, Policy.subMonitorFor(monitor, 100)); - } - } finally { - monitor.done(); - } - } - } - } catch(CoreException e) { - throw new CVSException(Policy.bind("UpdateMergeActionProblems_merging_remote_resources_into_workspace_1"), e); //$NON-NLS-1$ - } - } - - private void ensureContainerExists(SyncInfo info) throws TeamException { - IResource local = info.getLocal(); - // make sure that the parent exists - if (!local.exists()) { - ensureContainerExists(getParent(info)); - } - // make sure that the folder sync info is set; - if (info instanceof CVSSyncInfo) { - CVSSyncInfo cvsInfo = (CVSSyncInfo)info; - cvsInfo.makeInSync(); - } - // create the folder if it doesn't exist - ICVSFolder cvsFolder = CVSWorkspaceRoot.getCVSFolderFor((IContainer)local); - if (!cvsFolder.exists()) { - cvsFolder.mkdir(); - } - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SafeUpdateAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SafeUpdateAction.java deleted file mode 100644 index e4cd6d4d9..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SafeUpdateAction.java +++ /dev/null @@ -1,303 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.subscriber; - -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.core.subscribers.SyncInfo; -import org.eclipse.team.core.sync.IRemoteResource; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ccvs.ui.operations.UpdateOnlyMergableOperation; -import org.eclipse.team.ui.sync.AndSyncInfoFilter; -import org.eclipse.team.ui.sync.OrSyncInfoFilter; -import org.eclipse.team.ui.sync.SyncInfoDirectionFilter; -import org.eclipse.team.ui.sync.SyncInfoFilter; -import org.eclipse.team.ui.sync.SyncInfoSet; - -/** - * This update action will update all mergable resources first and then prompt the - * user to iverwrite any resources that failed the safe update - */ -public abstract class SafeUpdateAction extends CVSSubscriberAction { - - private List skippedFiles = new ArrayList(); - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.subscriber.CVSSubscriberAction#run(org.eclipse.team.ui.sync.SyncInfoSet, org.eclipse.core.runtime.IProgressMonitor) - */ - public void run(SyncInfoSet syncSet, IProgressMonitor monitor) throws TeamException { - try { - - // First, remove any known failure cases - SyncInfoFilter failFilter = getKnownFailureCases(); - SyncInfo[] willFail = syncSet.getNodes(failFilter); - syncSet.rejectNodes(failFilter); - skippedFiles.clear(); - - monitor.beginTask(null, (syncSet.size() + willFail.length) * 100); - - // Run the update on the remaining nodes in the set - // The update will fail for conflicts that turn out to be non-automergable - safeUpdate(syncSet, Policy.subMonitorFor(monitor, syncSet.size() * 100)); - - // It is possible that some of the conflicting changes were not auto-mergable. - // Accumulate all resources that have not been updated so far - final SyncInfoSet failedSet = createFailedSet(syncSet, willFail, (IFile[]) skippedFiles.toArray(new IFile[skippedFiles.size()])); - - // Remove all these from the original sync set - syncSet.rejectNodes(new SyncInfoFilter() { - public boolean select(SyncInfo info) { - return failedSet.getNodeFor(info.getLocal()) != null; - } - }); - - // Ask the user if a replace should be performed on the remaining nodes - if (!failedSet.isEmpty() && promptForOverwrite(failedSet)) { - overwriteUpdate(failedSet, Policy.subMonitorFor(monitor, willFail.length * 100)); - syncSet.addAll(failedSet); - } - - updated(syncSet.getResources()); - } finally { - monitor.done(); - } - } - - /** - * Perform a safe update on the resources in the provided set. Any included resources - * that cannot be updated safely wil be added to the skippedFiles list. - * @param syncSet the set containing the resources to be updated - * @param monitor - */ - protected void safeUpdate(SyncInfoSet syncSet, IProgressMonitor monitor) throws TeamException { - SyncInfo[] changed = syncSet.getSyncInfos(); - if (changed.length == 0) return; - - // The list of sync resources to be updated using "cvs update" - List updateShallow = new ArrayList(); - // A list of sync resource folders which need to be created locally - // (incoming addition or previously pruned) - Set parentCreationElements = new HashSet(); - // A list of sync resources that are incoming deletions. - // We do these first to avoid case conflicts - List updateDeletions = new ArrayList(); - - for (int i = 0; i < changed.length; i++) { - SyncInfo changedNode = changed[i]; - - // Make sure that parent folders exist - SyncInfo parent = getParent(changedNode); - if (parent != null && isOutOfSync(parent)) { - // We need to ensure that parents that are either incoming folder additions - // or previously pruned folders are recreated. - parentCreationElements.add(parent); - } - - IResource resource = changedNode.getLocal(); - int kind = changedNode.getKind(); - boolean willBeAttempted = false; - if (resource.getType() == IResource.FILE) { - // Not all change types will require a "cvs update" - // Some can be deleted locally without performing an update - switch (kind & SyncInfo.DIRECTION_MASK) { - case SyncInfo.INCOMING: - switch (kind & SyncInfo.CHANGE_MASK) { - case SyncInfo.DELETION: - // Incoming deletions can just be deleted instead of updated - updateDeletions.add(changedNode); - willBeAttempted = true; - break; - default: - // add the file to the list of files to be updated - updateShallow.add(changedNode); - willBeAttempted = true; - break; - } - break; - case SyncInfo.CONFLICTING: - switch (kind & SyncInfo.CHANGE_MASK) { - case SyncInfo.CHANGE: - // add the file to the list of files to be updated - updateShallow.add(changedNode); - willBeAttempted = true; - break; - } - break; - } - if (!willBeAttempted) { - skippedFiles.add(resource); - } - } else { - // Special handling for folders to support shallow operations on files - // (i.e. folder operations are performed using the sync info already - // contained in the sync info. - if (isOutOfSync(changedNode)) { - parentCreationElements.add(changedNode); - } - } - - } - try { - // Calculate the total amount of work needed - int work = (updateDeletions.size() + updateShallow.size()) * 100; - monitor.beginTask(null, work); - - if (parentCreationElements.size() > 0) { - makeInSync((SyncInfo[]) parentCreationElements.toArray(new SyncInfo[parentCreationElements.size()])); - } - if (updateDeletions.size() > 0) { - runUpdateDeletions((SyncInfo[])updateDeletions.toArray(new SyncInfo[updateDeletions.size()]), Policy.subMonitorFor(monitor, updateDeletions.size() * 100)); - } - if (updateShallow.size() > 0) { - runSafeUpdate((SyncInfo[])updateShallow.toArray(new SyncInfo[updateShallow.size()]), Policy.subMonitorFor(monitor, updateShallow.size() * 100)); - } - } finally { - monitor.done(); - } - return; - } - - /** - * Perform an overwrite (unsafe) update on the resources in the provided set. - * @param syncSet the set containing the resources to be updated - * @param monitor - */ - protected abstract void overwriteUpdate(SyncInfoSet syncSet, IProgressMonitor monitor) throws TeamException; - - /* - * Return a filter which selects the cases that we know ahead of time - * will fail on an update - */ - protected SyncInfoFilter getKnownFailureCases() { - return new OrSyncInfoFilter(new SyncInfoFilter[] { - // Conflicting additions of files will fail - new AndSyncInfoFilter(new SyncInfoFilter[] { - SyncInfoFilter.getDirectionAndChangeFilter(SyncInfo.CONFLICTING, SyncInfo.ADDITION), - new SyncInfoFilter() { - public boolean select(SyncInfo info) { - return info.getLocal().getType() == IResource.FILE; - } - } - }), - // Conflicting changes involving a deletion on one side will aways fail - new AndSyncInfoFilter(new SyncInfoFilter[] { - SyncInfoFilter.getDirectionAndChangeFilter(SyncInfo.CONFLICTING, SyncInfo.CHANGE), - new SyncInfoFilter() { - public boolean select(SyncInfo info) { - IRemoteResource remote = info.getRemote(); - IRemoteResource base = info.getBase(); - if (info.getLocal().exists()) { - // local != base and no remote will fail - return (base != null && remote == null); - } else { - // no local and base != remote - return (base != null && remote != null && !base.equals(remote)); - } - } - } - }), - // Outgoing changes may not fail but they are skipped as well - new SyncInfoDirectionFilter(SyncInfo.OUTGOING) - }); - } - - /* - * Return the complete set of selected resources that failed to update safely - */ - private SyncInfoSet createFailedSet(SyncInfoSet syncSet, SyncInfo[] willFail, IFile[] files) { - List result = new ArrayList(); - for (int i = 0; i < files.length; i++) { - IFile file = files[i]; - SyncInfo resource = syncSet.getNodeFor(file); - if (resource != null) result.add(resource); - } - for (int i = 0; i < willFail.length; i++) { - result.add(willFail[i]); - } - return new SyncInfoSet((SyncInfo[]) result.toArray(new SyncInfo[result.size()])); - } - - /** - * Prompt to overwrite those resources that could not be safely updated - * Note: This method is designed to be overridden by test cases. - * - * @return whether to perform the overwrite - */ - protected boolean promptForOverwrite(final SyncInfoSet syncSet) { - final int[] result = new int[] {Dialog.CANCEL}; - final Shell shell = getShell(); - shell.getDisplay().syncExec(new Runnable() { - public void run() { - UpdateDialog dialog = new UpdateDialog(shell, syncSet); - result[0] = dialog.open(); - } - }); - return (result[0] == UpdateDialog.YES); - } - - /** - * This method is invoked for all resources in the sync set that are incoming deletions. - * It is done separately to allow deletions to be performed before additions that may - * be the same name with different letter case. - * @param nodes the SyncInfo nodes that are incoming deletions - * @param monitor - * @throws TeamException - */ - protected abstract void runUpdateDeletions(SyncInfo[] nodes, IProgressMonitor monitor) throws TeamException; - - /** - * This method is invoked for all resources in the sync set that are incoming changes - * (but not deletions: @see runUpdateDeletions) or conflicting changes. - * This method should only update those conflicting resources that are automergable. - * @param nodes the incoming or conflicting SyncInfo nodes - * @param monitor - * @throws TeamException - */ - protected abstract void runSafeUpdate(SyncInfo[] nodes, IProgressMonitor monitor) throws TeamException; - - protected void safeUpdate(IResource[] resources, LocalOption[] localOptions, IProgressMonitor monitor) throws TeamException { - try { - UpdateOnlyMergableOperation operation = new UpdateOnlyMergableOperation(getShell(), resources, localOptions); - operation.run(monitor); - addSkippedFiles(operation.getSkippedFiles()); - } catch (InvocationTargetException e) { - throw CVSException.wrapException(e); - } catch (InterruptedException e) { - Policy.cancelOperation(); - } - } - - /** - * Notification of all resource that were updated (either safely or othrwise) - */ - protected abstract void updated(IResource[] resources) throws TeamException; - - private void addSkippedFiles(IFile[] files) { - skippedFiles.addAll(Arrays.asList(files)); - } - - protected String getErrorTitle() { - return Policy.bind("UpdateAction.update"); //$NON-NLS-1$ - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SubscriberCommitAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SubscriberCommitAction.java deleted file mode 100644 index 61be13a42..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SubscriberCommitAction.java +++ /dev/null @@ -1,304 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.subscriber; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.core.subscribers.SyncInfo; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.ICVSFile; -import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ccvs.ui.repo.RepositoryManager; -import org.eclipse.team.internal.ccvs.ui.sync.ToolTipMessageDialog; -import org.eclipse.team.ui.sync.SyncInfoSet; - -/** - * @author Administrator - * - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ -public class SubscriberCommitAction extends CVSSubscriberAction { - - private String comment; - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.subscriber.CVSSubscriberAction#getFilteredSyncInfoSet(org.eclipse.team.internal.ui.sync.views.SyncInfo[]) - */ - protected SyncInfoSet getFilteredSyncInfoSet(SyncInfo[] selectedResources) { - SyncInfoSet syncSet = super.getFilteredSyncInfoSet(selectedResources); - if (!promptForConflictHandling(syncSet)) return null; - try { - if (!promptForUnaddedHandling(syncSet)) return null; - } catch (CVSException e) { - // TODO Could prompt the user with option to continue - // instead of just continuing - CVSUIPlugin.log(e); - } - return syncSet; - } - - /** - * @param syncSet - * @return - */ - private boolean promptForConflictHandling(SyncInfoSet syncSet) { - // If there is a conflict in the syncSet, we need to prompt the user before proceeding. - if (syncSet.hasConflicts() || syncSet.hasIncomingChanges()) { - switch (promptForConflicts(syncSet)) { - case 0: - // Yes, synchronize conflicts as well - break; - case 1: - // No, only synchronize non-conflicting changes. - syncSet.removeConflictingNodes(); - syncSet.removeIncomingNodes(); - break; - case 2: - default: - // Cancel - return false; - } - } - return true; - } - - private boolean promptForUnaddedHandling(SyncInfoSet syncSet) throws CVSException { - if (syncSet.isEmpty()) return false; - - // accumulate any resources that are not under version control - IResource[] unadded = getUnaddedResources(syncSet); - - // prompt to get comment and any resources to be added to version control - RepositoryManager manager = CVSUIPlugin.getPlugin().getRepositoryManager(); - IResource[] toBeAdded = promptForResourcesToBeAdded(manager, unadded); - if (toBeAdded == null) return false; // User cancelled. - comment = promptForComment(manager, syncSet.getResources()); - if (comment == null) return false; // User cancelled. - - // remove unshared resources that were not selected by the user - if (unadded != null && unadded.length > 0) { - List resourcesToRemove = new ArrayList(unadded.length); - for (int i = 0; i < unadded.length; i++) { - IResource unaddedResource = unadded[i]; - boolean included = false; - for (int j = 0; j < toBeAdded.length; j++) { - IResource resourceToAdd = toBeAdded[j]; - if (unaddedResource.equals(resourceToAdd)) { - included = true; - break; - } - } - if (!included) - resourcesToRemove.add(unaddedResource); - } - syncSet.removeResources((IResource[]) resourcesToRemove.toArray(new IResource[resourcesToRemove.size()])); - } - return true; - } - - /** - * @param syncSet - * @return - */ - private IResource[] getUnaddedResources(SyncInfoSet syncSet) throws CVSException { - // TODO: should only get outgoing additions (since conflicting additions - // could be considered to be under version control already) - IResource[] resources = syncSet.getResources(); - List result = new ArrayList(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; - if (!isAdded(resource)) { - result.add(resource); - } - } - return (IResource[]) result.toArray(new IResource[result.size()]); - } - - private boolean isAdded(IResource resource) throws CVSException { - ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource); - if (cvsResource.isFolder()) { - return ((ICVSFolder)cvsResource).isCVSFolder(); - } else { - return cvsResource.isManaged(); - } - } - - private boolean isRemoved(IResource resource) throws CVSException { - ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource); - if (!cvsResource.isFolder()) { - byte[] syncBytes = ((ICVSFile)cvsResource).getSyncBytes(); - if (syncBytes == null) return true; - return ResourceSyncInfo.isDeletion(syncBytes); - } - return true; - } - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.subscriber.CVSSubscriberAction#run(org.eclipse.team.ui.sync.SyncInfoSet, org.eclipse.core.runtime.IProgressMonitor) - */ - public void run(SyncInfoSet syncSet, IProgressMonitor monitor) throws TeamException { - - final SyncInfo[] changed = syncSet.getSyncInfos(); - if (changed.length == 0) return; - - // A list of files to be committed - final List commits = new ArrayList(); // of IResource - // New resources that are not yet under CVS control and need a "cvs add" - final List additions = new ArrayList(); // of IResource - // Deleted resources that need a "cvs remove" - final List deletions = new ArrayList(); // of IResource - // A list of incoming or conflicting file changes to be made outgoing changes - final List makeOutgoing = new ArrayList(); // of SyncInfo - // A list of out-of-sync folders that must be made in-sync - final List makeInSync = new ArrayList(); // of SyncInfo - - for (int i = 0; i < changed.length; i++) { - SyncInfo changedNode = changed[i]; - int kind = changedNode.getKind(); - IResource resource = changedNode.getLocal(); - - // Any parent folders should be made in-sync. - // Steps will be taken after the commit to prune any empty folders - SyncInfo parent = getParent(changedNode); - if (parent != null) { - if (isOutOfSync(parent)) { - makeInSync.add(parent); - } - } - - if (resource.getType() == IResource.FILE) { - // By default, all files are committed - commits.add(resource); - // Determine what other work needs to be done for the file - switch (kind & SyncInfo.DIRECTION_MASK) { - case SyncInfo.INCOMING: - // Convert the incoming change to an outgoing change - makeOutgoing.add(changedNode); - break; - case SyncInfo.OUTGOING: - switch (kind & SyncInfo.CHANGE_MASK) { - case SyncInfo.ADDITION: - // Outgoing addition. 'add' it before committing. - if (!isAdded(resource)) - additions.add(resource); - break; - case SyncInfo.DELETION: - // Outgoing deletion. 'delete' it before committing. - if (!isRemoved(resource)) - deletions.add(resource); - break; - case SyncInfo.CHANGE: - // Outgoing change. Just commit it. - break; - } - break; - case SyncInfo.CONFLICTING: - // TODO: what about conflicting deletions - // Convert the conflicting change to an outgoing change - makeOutgoing.add(changedNode); - break; - } - } else { - if (((kind & SyncInfo.DIRECTION_MASK) == SyncInfo.OUTGOING) - && ((kind & SyncInfo.CHANGE_MASK) == SyncInfo.ADDITION)) { - // Outgoing folder additions must be added - additions.add(changedNode.getLocal()); - } else if (isOutOfSync(changedNode)) { - // otherwise, make any out-of-sync folders in-sync using the remote info - makeInSync.add(changedNode); - } - } - } - try { - // Calculate the total amount of work needed - int work = (makeOutgoing.size() + additions.size() + deletions.size() + commits.size()) * 100; - monitor.beginTask(null, work); - - if (makeInSync.size() > 0) { - makeInSync((SyncInfo[]) makeInSync.toArray(new SyncInfo[makeInSync.size()])); - } - - if (makeOutgoing.size() > 0) { - makeOutgoing((SyncInfo[]) makeOutgoing.toArray(new SyncInfo[makeInSync.size()]), Policy.subMonitorFor(monitor, makeOutgoing.size() * 100)); - } - - // TODO: There was special handling for undoing incoming deletions - // This should be handled by makeOutgoing but we'll need to verify - - RepositoryManager manager = CVSUIPlugin.getPlugin().getRepositoryManager(); - if (additions.size() != 0) { - manager.add((IResource[])additions.toArray(new IResource[0]), Policy.subMonitorFor(monitor, additions.size() * 100)); - } - if (deletions.size() != 0) { - manager.delete((IResource[])deletions.toArray(new IResource[0]), Policy.subMonitorFor(monitor, deletions.size() * 100)); - } - manager.commit((IResource[])commits.toArray(new IResource[commits.size()]), comment, Policy.subMonitorFor(monitor, commits.size() * 100)); - - // TODO: are there any cases that need to have folders pruned? - } catch (TeamException e) { - throw CVSException.wrapException(e); - } - } - - /** - * Prompts the user to determine how conflicting changes should be handled. - * Note: This method is designed to be overridden by test cases. - * @return 0 to sync conflicts, 1 to sync all non-conflicts, 2 to cancel - */ - protected int promptForConflicts(SyncInfoSet syncSet) { - String[] buttons = new String[] {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL}; - String question = Policy.bind("CommitSyncAction.questionRelease"); //$NON-NLS-1$ - String title = Policy.bind("CommitSyncAction.titleRelease"); //$NON-NLS-1$ - String[] tips = new String[] { - Policy.bind("CommitSyncAction.releaseAll"), //$NON-NLS-1$ - Policy.bind("CommitSyncAction.releasePart"), //$NON-NLS-1$ - Policy.bind("CommitSyncAction.cancelRelease") //$NON-NLS-1$ - }; - Shell shell = getShell(); - final ToolTipMessageDialog dialog = new ToolTipMessageDialog(shell, title, null, question, MessageDialog.QUESTION, buttons, tips, 0); - shell.getDisplay().syncExec(new Runnable() { - public void run() { - dialog.open(); - } - }); - return dialog.getReturnCode(); - } - - /** - * Prompts the user for a release comment. - * Note: This method is designed to be overridden by test cases. - * @return the comment, or null to cancel - */ - protected String promptForComment(RepositoryManager manager, IResource[] resourcesToCommit) { - return manager.promptForComment(getShell(), resourcesToCommit); - } - - protected IResource[] promptForResourcesToBeAdded(RepositoryManager manager, IResource[] unadded) { - return manager.promptForResourcesToBeAdded(getShell(), unadded); - } - - protected String getErrorTitle() { - return Policy.bind("CommitAction.commitFailed"); //$NON-NLS-1$ - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SubscriberConfirmMergedAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SubscriberConfirmMergedAction.java deleted file mode 100644 index 1f07239f8..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SubscriberConfirmMergedAction.java +++ /dev/null @@ -1,64 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.subscriber; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.core.subscribers.SyncInfo; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSSyncInfo; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.ui.sync.SyncInfoDirectionFilter; -import org.eclipse.team.ui.sync.SyncInfoFilter; -import org.eclipse.team.ui.sync.SyncInfoSet; - -/** - * This action marks the local resource as merged by updating the base - * resource revision to match the remote resource revision - */ -public class SubscriberConfirmMergedAction extends CVSSubscriberAction { - - /* (non-Javadoc) - * @see org.eclipse.team.ui.sync.SubscriberAction#getSyncInfoFilter() - */ - protected SyncInfoFilter getSyncInfoFilter() { - return new SyncInfoDirectionFilter(new int[] {SyncInfo.CONFLICTING}); - } - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.subscriber.CVSSubscriberAction#run(org.eclipse.team.ui.sync.SyncInfoSet, org.eclipse.core.runtime.IProgressMonitor) - */ - protected void run(SyncInfoSet syncSet, IProgressMonitor monitor) throws CVSException { - SyncInfo[] syncResources = syncSet.getSyncInfos(); - List needsMerge = new ArrayList(); - monitor.beginTask(null, 100 * syncResources.length); - try { - for (int i = 0; i < syncResources.length; i++) { - SyncInfo resource = syncResources[i]; - - CVSSyncInfo cvsInfo = getCVSSyncInfo(resource); - if (cvsInfo != null) { - cvsInfo.makeOutgoing(Policy.subMonitorFor(monitor, 100)); - } - - } - } catch (TeamException e) { - handle(e); - } finally { - monitor.done(); - } - } - - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SyncInfoSetDetailsDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SyncInfoSetDetailsDialog.java deleted file mode 100644 index 9fa679b23..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SyncInfoSetDetailsDialog.java +++ /dev/null @@ -1,201 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.subscriber; - -import org.eclipse.core.resources.IResource; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.viewers.CheckboxTableViewer; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.core.subscribers.SyncInfo; -import org.eclipse.team.internal.ccvs.ui.AdaptableResourceList; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ui.dialogs.DetailsDialog; -import org.eclipse.team.ui.sync.SyncInfoFilter; -import org.eclipse.team.ui.sync.SyncInfoSet; -import org.eclipse.ui.model.WorkbenchContentProvider; -import org.eclipse.ui.model.WorkbenchLabelProvider; - -/** - * DetailsDialog that has a details area which shows the SyncInfos - * in a SyncInfoSet. - */ -public abstract class SyncInfoSetDetailsDialog extends DetailsDialog { - - private static final int WIDTH_HINT = 350; - private final static int SELECTION_HEIGHT_HINT = 100; - - private CheckboxTableViewer listViewer; - - private SyncInfoSet syncSet; - private Object[] selectedResources; - - /** - * @param parentShell - * @param dialogTitle - */ - public SyncInfoSetDetailsDialog(Shell parentShell, String dialogTitle, SyncInfoSet syncSet) { - super(parentShell, dialogTitle); - this.syncSet = syncSet; - } - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.DetailsDialog#createDropDownDialogArea(org.eclipse.swt.widgets.Composite) - */ - protected Composite createDropDownDialogArea(Composite parent) { - Composite composite = createComposite(parent); - - addResourcesArea(composite); - - // TODO: set F1 help - //WorkbenchHelp.setHelp(composite, IHelpContextIds.ADD_TO_VERSION_CONTROL_DIALOG); - - return composite; - } - - /** - * @param composite - */ - private void addResourcesArea(Composite composite) { - createWrappingLabel(composite, "The following resources will be effected by the update"); - // add the selectable checkbox list - - listViewer = CheckboxTableViewer.newCheckList(composite, SWT.BORDER); - GridData data = new GridData(GridData.FILL_BOTH); - data.heightHint = SELECTION_HEIGHT_HINT; - data.widthHint = WIDTH_HINT; - listViewer.getTable().setLayoutData(data); - - // set the contents of the list - listViewer.setLabelProvider(new WorkbenchLabelProvider() { - protected String decorateText(String input, Object element) { - if (element instanceof IResource) - return ((IResource)element).getFullPath().toString(); - else - return input; - } - }); - listViewer.setContentProvider(new WorkbenchContentProvider()); - setViewerInput(); - listViewer.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - selectedResources = listViewer.getCheckedElements(); - } - }); - - addSelectionButtons(composite); - - } - - /** - * Add the selection and deselection buttons to the dialog. - * @param composite org.eclipse.swt.widgets.Composite - */ - private void addSelectionButtons(Composite composite) { - - Composite buttonComposite = new Composite(composite, SWT.RIGHT); - GridLayout layout = new GridLayout(); - layout.numColumns = 2; - buttonComposite.setLayout(layout); - GridData data = - new GridData(GridData.HORIZONTAL_ALIGN_END | GridData.GRAB_HORIZONTAL); - data.grabExcessHorizontalSpace = true; - composite.setData(data); - - Button selectButton = createButton(buttonComposite, IDialogConstants.SELECT_ALL_ID, Policy.bind("ReleaseCommentDialog.selectAll"), false); //$NON-NLS-1$ - SelectionListener listener = new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - listViewer.setAllChecked(true); - selectedResources = null; - } - }; - selectButton.addSelectionListener(listener); - - Button deselectButton = createButton(buttonComposite, IDialogConstants.DESELECT_ALL_ID, Policy.bind("ReleaseCommentDialog.deselectAll"), false); //$NON-NLS-1$ - listener = new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - listViewer.setAllChecked(false); - selectedResources = new Object[0]; - - } - }; - deselectButton.addSelectionListener(listener); - } - - protected void setViewerInput() { - if (listViewer == null || listViewer.getControl().isDisposed()) return; - listViewer.setInput(new AdaptableResourceList(getAllResources())); - if (selectedResources == null) { - listViewer.setAllChecked(true); - } else { - listViewer.setCheckedElements(selectedResources); - } - } - - protected void resetViewerInput() { - selectedResources = null; - setViewerInput(); - } - /** - * Return a list of all the resources that are currently under consideration by the dialog - */ - protected IResource[] getAllResources() { - return syncSet.getResources(); - } - - /* - * (non-Javadoc) - * @see org.eclipse.team.internal.ui.DetailsDialog#updateEnablements() - */ - protected void updateEnablements() { - } - - /** - * @return - */ - public SyncInfoSet getSyncSet() { - return syncSet; - } - - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#buttonPressed(int) - */ - protected void buttonPressed(int id) { - if (id == IDialogConstants.OK_ID) { - filterSyncSet(); - } - super.buttonPressed(id); - } - - protected void filterSyncSet() { - // Keep only the checked resources - if (selectedResources != null) { - getSyncSet().selectNodes(new SyncInfoFilter() { - public boolean select(SyncInfo info) { - IResource local = info.getLocal(); - for (int i = 0; i < selectedResources.length; i++) { - if (local.equals(selectedResources[i])) return true; - } - return false; - } - }); - } - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/UpdateDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/UpdateDialog.java deleted file mode 100644 index 5d088fcf9..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/UpdateDialog.java +++ /dev/null @@ -1,72 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.subscriber; - -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.ui.sync.SyncInfoSet; -import org.eclipse.team.internal.ccvs.ui.Policy; - -/** - * This dialog prompts for the type of update which should take place - * (i.e. update of auto-mergable files or update of all ignore local - * changes. - */ -public class UpdateDialog extends SyncInfoSetDetailsDialog { - - public static final int YES = IDialogConstants.YES_ID; - - public UpdateDialog(Shell parentShell, SyncInfoSet syncSet) { - super(parentShell, Policy.bind("UpdateDialog.overwriteTitle"), syncSet); //$NON-NLS-1$ - } - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.DetailsDialog#createMainDialogArea(org.eclipse.swt.widgets.Composite) - */ - protected void createMainDialogArea(Composite parent) { - Composite composite = new Composite(parent, SWT.NONE); - composite.setLayout(new GridLayout()); - - // TODO: set F1 help - //WorkbenchHelp.setHelp(composite, IHelpContextIds.ADD_TO_VERSION_CONTROL_DIALOG); - - createWrappingLabel(composite, Policy.bind("UpdateDialog.overwriteMessage")); //$NON-NLS-1$ - } - - protected void createButtonsForButtonBar(Composite parent) { - createButton(parent, YES, IDialogConstants.YES_LABEL, true); - createButton(parent, IDialogConstants.NO_ID, IDialogConstants.NO_LABEL, true); - super.createButtonsForButtonBar(parent); - } - - protected boolean includeOkButton() { - return false; - } - - protected boolean includeCancelButton() { - return false; - } - - protected void buttonPressed(int id) { - // hijack yes and no buttons to set the correct return - // codes. - if(id == YES || id == IDialogConstants.NO_ID) { - setReturnCode(id); - filterSyncSet(); - close(); - } else { - super.buttonPressed(id); - } - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceUpdateAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceUpdateAction.java deleted file mode 100644 index 669d2b334..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceUpdateAction.java +++ /dev/null @@ -1,94 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.subscriber; - -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.core.subscribers.SyncInfo; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.client.Command; -import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ccvs.ui.operations.ReplaceOperation; -import org.eclipse.team.ui.sync.SyncInfoSet; - -/** - * This action performs an update for the CVSWorkspaceSubscriber. - */ -public class WorkspaceUpdateAction extends SafeUpdateAction { - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.subscriber.SafeUpdateAction#runUpdateDeletions(org.eclipse.team.core.subscribers.SyncInfo[], org.eclipse.core.runtime.IProgressMonitor) - */ - protected void runUpdateDeletions(SyncInfo[] nodes, IProgressMonitor monitor) throws TeamException { - monitor.beginTask(null, nodes.length * 100); - for (int i = 0; i < nodes.length; i++) { - SyncInfo node = nodes[i]; - unmanage(node, Policy.subMonitorFor(monitor, 50)); - deleteAndKeepHistory(node.getLocal(), Policy.subMonitorFor(monitor, 50)); - } - pruneEmptyParents(nodes); - monitor.done(); - } - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.subscriber.SafeUpdateAction#runSafeUpdate(org.eclipse.team.core.subscribers.SyncInfo[], org.eclipse.core.runtime.IProgressMonitor) - */ - protected void runSafeUpdate(SyncInfo[] nodes, IProgressMonitor monitor) throws TeamException { - safeUpdate(getIResourcesFrom(nodes), new LocalOption[] { Command.DO_NOT_RECURSE }, monitor); - } - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.subscriber.SafeUpdateAction#overwriteUpdate(org.eclipse.team.ui.sync.SyncInfoSet, org.eclipse.core.runtime.IProgressMonitor) - */ - protected void overwriteUpdate(SyncInfoSet syncSet, IProgressMonitor monitor) throws TeamException { - try { - new ReplaceOperation(getShell(), syncSet.getResources(), false /* recurse */) - .run(monitor); - } catch (InvocationTargetException e) { - throw CVSException.wrapException(e); - } catch (InterruptedException e) { - Policy.cancelOperation(); - } - - } - - private void unmanage(SyncInfo element, IProgressMonitor monitor) throws CVSException { - CVSWorkspaceRoot.getCVSResourceFor(element.getLocal()).unmanage(monitor); - } - - private void deleteAndKeepHistory(IResource resource, IProgressMonitor monitor) throws CVSException { - try { - if (!resource.exists()) return; - if (resource.getType() == IResource.FILE) - ((IFile)resource).delete(false /* force */, true /* keep history */, monitor); - else if (resource.getType() == IResource.FOLDER) - ((IFolder)resource).delete(false /* force */, true /* keep history */, monitor); - } catch (CoreException e) { - throw CVSException.wrapException(e); - } - } - - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.subscriber.SafeUpdateAction#updated(org.eclipse.core.resources.IResource[]) - */ - protected void updated(IResource[] resources) throws TeamException { - // Do nothing - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/AddSyncAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/AddSyncAction.java deleted file mode 100644 index aac0b1902..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/AddSyncAction.java +++ /dev/null @@ -1,143 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.team.internal.ccvs.ui.sync; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.compare.structuremergeviewer.Differencer; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.viewers.ISelectionProvider; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.ICVSFile; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.internal.ccvs.core.resources.CVSRemoteSyncElement; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.core.syncinfo.MutableResourceSyncInfo; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ccvs.ui.repo.RepositoryManager; -import org.eclipse.team.internal.ui.sync.ITeamNode; -import org.eclipse.team.internal.ui.sync.SyncSet; -import org.eclipse.team.internal.ui.sync.TeamFile; - -/** - * This is a CVS sync view action that will - */ -public class AddSyncAction extends MergeAction { - public AddSyncAction(CVSSyncCompareInput model, ISelectionProvider sp, String label, Shell shell) { - super(model, sp, label, shell); - } - - protected SyncSet run(SyncSet syncSet, IProgressMonitor monitor) { - boolean result = saveIfNecessary(); - if (!result) return null; - - ITeamNode[] changed = syncSet.getChangedNodes(); - if (changed.length == 0) { - return syncSet; - } - List additions = new ArrayList(); - - try { - for (int i = 0; i < changed.length; i++) { - int kind = changed[i].getKind(); - // leave the added nodes in the sync view. Their sync state - // won't change but the decoration should. - IResource resource = changed[i].getResource(); - if ((kind & Differencer.DIRECTION_MASK) == ITeamNode.CONFLICTING) { - if (resource.getType() == IResource.FOLDER) { - makeInSync(changed[i]); - } else { - makeAdded(changed[i]); - } - } else { - if (resource.getType() == IResource.FILE) { - additions.add(resource); - } - } - } - - RepositoryManager manager = CVSUIPlugin.getPlugin().getRepositoryManager(); - if (additions.size() != 0) { - manager.add((IResource[])additions.toArray(new IResource[0]), monitor); - } - - // for all files ensure that parent folders are made in sync after - // the add completes. - for (int i = 0; i < changed.length; i++) { - ITeamNode node = changed[i]; - IResource resource = changed[i].getResource(); - if (resource.getType() == IResource.FILE) { - syncSet.remove(node); - } - } - } catch (final TeamException e) { - handle(e); - return null; - } - - return syncSet; - } - - protected void makeAdded(ITeamNode changed) - throws TeamException, CVSException { - // Fake the add locally since add command will fail - makeInSync(changed.getParent()); - CVSRemoteSyncElement syncElement = (CVSRemoteSyncElement)((TeamFile)changed).getMergeResource().getSyncElement(); - ICVSResource remote = (ICVSResource)syncElement.getRemote(); - MutableResourceSyncInfo info = remote.getSyncInfo().cloneMutable(); - info.setTimeStamp(null); - info.setAdded(); - ICVSFile cvsFile = CVSWorkspaceRoot.getCVSFileFor((IFile)changed.getResource()); - cvsFile.setSyncInfo(info, ICVSFile.UNKNOWN); - } - - /** - * Enabled for folders and files that aren't added. - */ - protected boolean isEnabled(ITeamNode node) { - try { - CVSSyncSet set = new CVSSyncSet(new StructuredSelection(node)); - set.removeConflictingNodes(); - return set.hasNonAddedChanges(); - } catch (CVSException e) { - CVSUIPlugin.log(e); - return false; - } - } - - /** - * Remove all nodes that aren't files and folders that need to be added. - */ - protected void removeNonApplicableNodes(SyncSet set, int syncMode) { - set.removeIncomingNodes(); - set.removeConflictingNodes(); - ((CVSSyncSet)set).removeAddedChanges(); - } - /** - * @see MergeAction#getHelpContextID() - */ - protected String getHelpContextID() { - return IHelpContextIds.SYNC_ADD_ACTION; - } - - protected String getErrorTitle() { - return Policy.bind("AddAction.addFailed"); //$NON-NLS-1$ - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSCatchupReleaseViewer.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSCatchupReleaseViewer.java deleted file mode 100644 index 0c771623e..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSCatchupReleaseViewer.java +++ /dev/null @@ -1,622 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.sync; - - -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import org.eclipse.compare.CompareConfiguration; -import org.eclipse.compare.structuremergeviewer.DiffContainer; -import org.eclipse.compare.structuremergeviewer.DiffElement; -import org.eclipse.compare.structuremergeviewer.DiffNode; -import org.eclipse.compare.structuremergeviewer.IDiffElement; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.action.Action; -import org.eclipse.jface.action.IMenuManager; -import org.eclipse.jface.action.Separator; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.viewers.IDecoration; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.graphics.ImageData; -import org.eclipse.swt.graphics.Point; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.core.RepositoryProvider; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.core.sync.ILocalSyncElement; -import org.eclipse.team.core.sync.IRemoteResource; -import org.eclipse.team.core.sync.IRemoteSyncElement; -import org.eclipse.team.core.sync.RemoteSyncElement; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; -import org.eclipse.team.internal.ccvs.core.CVSTeamProvider; -import org.eclipse.team.internal.ccvs.core.ICVSFile; -import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFile; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.internal.ccvs.core.ILogEntry; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo; -import org.eclipse.team.internal.ccvs.ui.CVSLightweightDecorator; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.HistoryView; -import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.OverlayIcon; -import org.eclipse.team.internal.ccvs.ui.OverlayIconCache; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ccvs.ui.merge.OverrideUpdateMergeAction; -import org.eclipse.team.internal.ccvs.ui.merge.UpdateMergeAction; -import org.eclipse.team.internal.ccvs.ui.merge.UpdateWithForcedJoinAction; -import org.eclipse.team.internal.ui.sync.CatchupReleaseViewer; -import org.eclipse.team.internal.ui.sync.ChangedTeamContainer; -import org.eclipse.team.internal.ui.sync.ITeamNode; -import org.eclipse.team.internal.ui.sync.MergeResource; -import org.eclipse.team.internal.ui.sync.SyncView; -import org.eclipse.team.internal.ui.sync.TeamFile; -import org.eclipse.ui.help.WorkbenchHelp; - -public class CVSCatchupReleaseViewer extends CatchupReleaseViewer { - // Actions - private UpdateSyncAction updateAction; - private ForceUpdateSyncAction forceUpdateAction; - - private CommitSyncAction commitAction; - private ForceCommitSyncAction forceCommitAction; - - private UpdateMergeAction updateMergeAction; - private UpdateWithForcedJoinAction updateWithJoinAction; - private OverrideUpdateMergeAction forceUpdateMergeAction; - - private IgnoreAction ignoreAction; - private HistoryAction showInHistory; - - private Action confirmMerge; - private AddSyncAction addAction; - - private Action selectAdditions; - private Image conflictImage; - - private static class DiffOverlayIcon extends OverlayIcon { - private static final int HEIGHT = 16; - private static final int WIDTH = 22; - public DiffOverlayIcon(Image baseImage, ImageDescriptor[] overlays, int[] locations) { - super(baseImage, overlays, locations, new Point(WIDTH, HEIGHT)); - } - protected void drawOverlays(ImageDescriptor[] overlays, int[] locations) { - Point size = getSize(); - for (int i = 0; i < overlays.length; i++) { - ImageDescriptor overlay = overlays[i]; - ImageData overlayData = overlay.getImageData(); - switch (locations[i]) { - case TOP_LEFT: - drawImage(overlayData, 0, 0); - break; - case TOP_RIGHT: - drawImage(overlayData, size.x - overlayData.width, 0); - break; - case BOTTOM_LEFT: - drawImage(overlayData, 0, size.y - overlayData.height); - break; - case BOTTOM_RIGHT: - drawImage(overlayData, size.x - overlayData.width, size.y - overlayData.height); - break; - } - } - } - } - - private static class HistoryAction extends Action implements ISelectionChangedListener { - IStructuredSelection selection; - public HistoryAction(String label) { - super(label); - } - public void run() { - if (selection.isEmpty()) { - return; - } - HistoryView view = HistoryView.openInActivePerspective(); - if (view == null) { - return; - } - ITeamNode node = (ITeamNode)selection.getFirstElement(); - IRemoteSyncElement remoteSyncElement = ((TeamFile)node).getMergeResource().getSyncElement(); - ICVSRemoteFile remoteFile = (ICVSRemoteFile)remoteSyncElement.getRemote(); - IResource local = remoteSyncElement.getLocal(); - - ICVSRemoteFile baseFile = (ICVSRemoteFile)remoteSyncElement.getBase(); - if(baseFile == null) { - try { - baseFile = (ICVSRemoteFile)CVSWorkspaceRoot.getRemoteResourceFor(local); - } catch (CVSException e) { - baseFile = null; - } - } - - if(local.exists()) { - view.showHistory(local); - }else if (baseFile != null) { - view.showHistory(baseFile); - } else if (remoteFile != null) { - view.showHistory(remoteFile); - } - } - public void selectionChanged(SelectionChangedEvent event) { - ISelection selection = event.getSelection(); - if (!(selection instanceof IStructuredSelection)) { - setEnabled(false); - return; - } - IStructuredSelection ss = (IStructuredSelection)selection; - if (ss.size() != 1) { - setEnabled(false); - return; - } - ITeamNode first = (ITeamNode)ss.getFirstElement(); - if (first instanceof TeamFile) { - // can only show history on elements that have a remote file - this.selection = ss; - IRemoteSyncElement remoteSyncElement = ((TeamFile)first).getMergeResource().getSyncElement(); - if(remoteSyncElement.getRemote() != null || remoteSyncElement.getBase() != null) { - setEnabled(true); - } else { - setEnabled(false); - } - } else { - this.selection = null; - setEnabled(false); - } - } - } - - public CVSCatchupReleaseViewer(Composite parent, CVSSyncCompareInput model) { - super(parent, model); - initializeActions(model); - initializeLabelProvider(); - // set F1 help - WorkbenchHelp.setHelp(this.getControl(), IHelpContextIds.CATCHUP_RELEASE_VIEWER); - } - - private static class Decoration implements IDecoration { - public String prefix, suffix; - public ImageDescriptor overlay; - - /** - * @see org.eclipse.jface.viewers.IDecoration#addPrefix(java.lang.String) - */ - public void addPrefix(String prefix) { - this.prefix = prefix; - } - /** - * @see org.eclipse.jface.viewers.IDecoration#addSuffix(java.lang.String) - */ - public void addSuffix(String suffix) { - this.suffix = suffix; - } - /** - * @see org.eclipse.jface.viewers.IDecoration#addOverlay(org.eclipse.jface.resource.ImageDescriptor) - */ - public void addOverlay(ImageDescriptor overlay) { - this.overlay = overlay; - } - } - - private Image getConflictImage() { - if(conflictImage != null) - return conflictImage; - final ImageDescriptor conflictDescriptor = CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_MERGEABLE_CONFLICT); - conflictImage = conflictDescriptor.createImage(); - return conflictImage; - } - - - private void initializeLabelProvider() { - final LabelProvider oldProvider = (LabelProvider)getLabelProvider(); - - - setLabelProvider(new LabelProvider() { - private OverlayIconCache iconCache = new OverlayIconCache(); - - public void dispose() { - iconCache.disposeAll(); - oldProvider.dispose(); - if(conflictImage != null) - conflictImage.dispose(); - } - - public Image getImage(Object element) { - Image image = oldProvider.getImage(element); - - if (! (element instanceof ITeamNode)) - return image; - - ITeamNode node = (ITeamNode)element; - IResource resource = node.getResource(); - - if (! resource.exists()) - return image; - - CVSTeamProvider provider = (CVSTeamProvider)RepositoryProvider.getProvider(resource.getProject(), CVSProviderPlugin.getTypeId()); - List overlays = new ArrayList(); - List locations = new ArrayList(); - - // use the default cvs image decorations - ImageDescriptor resourceOverlay = CVSLightweightDecorator.getOverlay(node.getResource(),false, provider); - - int kind = node.getKind(); - boolean conflict = (kind & IRemoteSyncElement.AUTOMERGE_CONFLICT) != 0; - - if(resourceOverlay != null) { - overlays.add(resourceOverlay); - locations.add(new Integer(OverlayIcon.BOTTOM_RIGHT)); - } - - if(conflict) { - overlays.add(CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_MERGEABLE_CONFLICT)); - locations.add(new Integer(OverlayIcon.TOP_LEFT)); - } - - if (overlays.isEmpty()) { - return image; - } - - //combine the descriptors and return the resulting image - Integer[] integers = (Integer[])locations.toArray(new Integer[locations.size()]); - int[] locs = new int[integers.length]; - for (int i = 0; i < integers.length; i++) { - locs[i] = integers[i].intValue(); - } - - return iconCache.getImageFor(new DiffOverlayIcon(image, - (ImageDescriptor[]) overlays.toArray(new ImageDescriptor[overlays.size()]), - locs)); - } - - public String getText(Object element) { - String label = oldProvider.getText(element); - if (! (element instanceof ITeamNode)) - return label; - - ITeamNode node = (ITeamNode)element; - IResource resource = node.getResource(); - - if (resource.exists()) { - // use the default text decoration preferences - Decoration decoration = new Decoration(); - CVSLightweightDecorator.decorateTextLabel(resource, decoration, false /*don't show dirty*/, false /*don't show revisions*/); - label = decoration.prefix + label + decoration.suffix; - } - - if (CVSUIPlugin.getPlugin().getPreferenceStore().getBoolean(ICVSUIConstants.PREF_SHOW_SYNCINFO_AS_TEXT)) { - int syncKind = node.getKind(); - if (syncKind != ILocalSyncElement.IN_SYNC) { - String syncKindString = RemoteSyncElement.kindToString(syncKind); - label = Policy.bind("CVSCatchupReleaseViewer.labelWithSyncKind", label, syncKindString); //$NON-NLS-1$ - } - } - return label; - } - }); - } - - protected void fillContextMenu(IMenuManager manager) { - super.fillContextMenu(manager); - if (showInHistory != null) { - manager.add(showInHistory); - } - manager.add(new Separator()); - switch (getSyncMode()) { - case SyncView.SYNC_INCOMING: - updateAction.update(SyncView.SYNC_INCOMING); - manager.add(updateAction); - forceUpdateAction.update(SyncView.SYNC_INCOMING); - manager.add(forceUpdateAction); - manager.add(new Separator()); - confirmMerge.setEnabled(confirmMerge.isEnabled()); - manager.add(confirmMerge); - break; - case SyncView.SYNC_OUTGOING: - addAction.update(SyncView.SYNC_OUTGOING); - manager.add(addAction); - commitAction.update(SyncView.SYNC_OUTGOING); - manager.add(commitAction); - forceCommitAction.update(SyncView.SYNC_OUTGOING); - manager.add(forceCommitAction); - ignoreAction.update(); - manager.add(ignoreAction); - manager.add(new Separator()); - confirmMerge.setEnabled(confirmMerge.isEnabled()); - manager.add(confirmMerge); - selectAdditions.setEnabled(selectAdditions.isEnabled()); - manager.add(selectAdditions); - break; - case SyncView.SYNC_BOTH: - addAction.update(SyncView.SYNC_BOTH); - manager.add(addAction); - commitAction.update(SyncView.SYNC_BOTH); - manager.add(commitAction); - updateAction.update(SyncView.SYNC_BOTH); - manager.add(updateAction); - ignoreAction.update(); - manager.add(ignoreAction); - manager.add(new Separator()); - forceCommitAction.update(SyncView.SYNC_BOTH); - manager.add(forceCommitAction); - forceUpdateAction.update(SyncView.SYNC_BOTH); - manager.add(forceUpdateAction); - manager.add(new Separator()); - confirmMerge.setEnabled( confirmMerge.isEnabled()); - manager.add(confirmMerge); - break; - case SyncView.SYNC_MERGE: - updateMergeAction.update(SyncView.SYNC_INCOMING); - forceUpdateMergeAction.update(SyncView.SYNC_INCOMING); - updateWithJoinAction.update(SyncView.SYNC_INCOMING); - manager.add(updateMergeAction); - manager.add(forceUpdateMergeAction); - manager.add(updateWithJoinAction); - break; - } - } - - /** - * Creates the actions for this viewer. - */ - private void initializeActions(final CVSSyncCompareInput diffModel) { - Shell shell = getControl().getShell(); - commitAction = new CommitSyncAction(diffModel, this, Policy.bind("CVSCatchupReleaseViewer.commit"), shell); //$NON-NLS-1$ - forceCommitAction = new ForceCommitSyncAction(diffModel, this, Policy.bind("CVSCatchupReleaseViewer.forceCommit"), shell); //$NON-NLS-1$ - updateAction = new UpdateSyncAction(diffModel, this, Policy.bind("CVSCatchupReleaseViewer.update"), shell); //$NON-NLS-1$ - forceUpdateAction = new ForceUpdateSyncAction(diffModel, this, Policy.bind("CVSCatchupReleaseViewer.forceUpdate"), shell); //$NON-NLS-1$ - updateMergeAction = new UpdateMergeAction(diffModel, this, Policy.bind("CVSCatchupReleaseViewer.update"), shell); //$NON-NLS-1$ - ignoreAction = new IgnoreAction(diffModel, this, Policy.bind("CVSCatchupReleaseViewer.ignore"), shell); //$NON-NLS-1$ - updateWithJoinAction = new UpdateWithForcedJoinAction(diffModel, this, Policy.bind("CVSCatchupReleaseViewer.mergeUpdate"), shell); //$NON-NLS-1$ - forceUpdateMergeAction = new OverrideUpdateMergeAction(diffModel, this, Policy.bind("CVSCatchupReleaseViewer.forceUpdate"), shell); //$NON-NLS-1$ - addAction = new AddSyncAction(diffModel, this, Policy.bind("CVSCatchupReleaseViewer.addAction"), shell); //$NON-NLS-1$ - - // Show in history view - showInHistory = new HistoryAction(Policy.bind("CVSCatchupReleaseViewer.showInHistory")); //$NON-NLS-1$ - WorkbenchHelp.setHelp(showInHistory, IHelpContextIds.SHOW_IN_RESOURCE_HISTORY); - addSelectionChangedListener(showInHistory); - - selectAdditions = new Action(Policy.bind("CVSCatchupReleaseViewer.Select_&Outgoing_Additions_1"), null) { //$NON-NLS-1$ - public boolean isEnabled() { - DiffNode node = diffModel.getDiffRoot(); - IDiffElement[] elements = node.getChildren(); - for (int i = 0; i < elements.length; i++) { - IDiffElement element = elements[i]; - if (element instanceof ITeamNode) { - CVSSyncSet set = new CVSSyncSet(new StructuredSelection(element)); - try { - if (set.hasNonAddedChanges()) return true; - } catch (CVSException e) { - // Log the error and enable the menu item - CVSUIPlugin.log(e); - return true; - } - } else { - // unanticipated situation, just enable the action - return true; - } - } - return false; - } - public void run() { - List additions = new ArrayList(); - DiffNode root = diffModel.getDiffRoot(); - visit(root, additions); - setSelection(new StructuredSelection(additions)); - } - private void visit(IDiffElement node, List additions) { - try { - if (node instanceof TeamFile) { - TeamFile file = (TeamFile)node; - if (file.getChangeDirection() == IRemoteSyncElement.OUTGOING) { - if (file.getChangeType() == IRemoteSyncElement.ADDITION) { - ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(file.getResource()); - if (cvsResource.isManaged()) return; - additions.add(node); - } - } - return; - } - if (node instanceof ChangedTeamContainer) { - ChangedTeamContainer container = (ChangedTeamContainer)node; - if (container.getChangeDirection() == IRemoteSyncElement.OUTGOING) { - if (container.getChangeType() == IRemoteSyncElement.ADDITION) { - ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(container.getResource()); - if (!((ICVSFolder)cvsResource).isCVSFolder()) { - additions.add(node); - } - } - } - - } - if (node instanceof DiffContainer) { - IDiffElement[] children = ((DiffContainer)node).getChildren(); - for (int i = 0; i < children.length; i++) { - visit(children[i], additions); - } - } - } catch (TeamException e) { - CVSUIPlugin.log(e); - } - } - }; - WorkbenchHelp.setHelp(selectAdditions, IHelpContextIds.SELECT_NEW_RESOURCES_ACTION); - - // confirm merge - confirmMerge = new Action(Policy.bind("CVSCatchupReleaseViewer.confirmMerge"), null) { //$NON-NLS-1$ - public void run() { - ISelection s = getSelection(); - if (!(s instanceof IStructuredSelection) || s.isEmpty()) { - return; - } - List needsMerge = new ArrayList(); - for (Iterator it = ((IStructuredSelection)s).iterator(); it.hasNext();) { - final Object element = it.next(); - if(element instanceof DiffElement) { - mergeRecursive((IDiffElement)element, needsMerge); - } - } - TeamFile[] files = (TeamFile[]) needsMerge.toArray(new TeamFile[needsMerge.size()]); - if(files.length != 0) { - try { - for (int i = 0; i < files.length; i++) { - TeamFile teamFile = (TeamFile)files[i]; - CVSUIPlugin.getPlugin().getRepositoryManager().merged(new IRemoteSyncElement[] {teamFile.getMergeResource().getSyncElement()}); - teamFile.merged(); - } - } catch(TeamException e) { - CVSUIPlugin.openError(getControl().getShell(), null, null, e); - } - } - refresh(); - diffModel.updateStatusLine(); - } - - public boolean isEnabled() { - ISelection s = getSelection(); - if (!(s instanceof IStructuredSelection) || s.isEmpty()) { - return false; - } - for (Iterator it = ((IStructuredSelection)s).iterator(); it.hasNext();) { - Object element = (Object) it.next(); - if(element instanceof TeamFile) { - TeamFile file = (TeamFile)element; - int direction = file.getChangeDirection(); - int type = file.getChangeType(); - if(direction == IRemoteSyncElement.INCOMING || - direction == IRemoteSyncElement.CONFLICTING) { - continue; - } - } - return false; - } - return true; - } - }; - WorkbenchHelp.setHelp(confirmMerge, IHelpContextIds.CONFIRM_MERGE_ACTION); - } - - protected void mergeRecursive(IDiffElement element, List needsMerge) { - if (element instanceof DiffContainer) { - DiffContainer container = (DiffContainer)element; - IDiffElement[] children = container.getChildren(); - for (int i = 0; i < children.length; i++) { - mergeRecursive(children[i], needsMerge); - } - } else if (element instanceof TeamFile) { - TeamFile file = (TeamFile)element; - needsMerge.add(file); - } - } - - /** - * Provide CVS-specific labels for the editors. - */ - protected void updateLabels(MergeResource resource) { - CompareConfiguration config = getCompareConfiguration(); - String name = resource.getName(); - config.setLeftLabel(Policy.bind("CVSCatchupReleaseViewer.workspaceFile", name)); //$NON-NLS-1$ - - IRemoteSyncElement syncTree = resource.getSyncElement(); - IRemoteResource remote = syncTree.getRemote(); - if (remote != null) { - try { - final ICVSRemoteFile remoteFile = (ICVSRemoteFile)remote; - String revision = remoteFile.getRevision(); - final String[] author = new String[] { "" }; //$NON-NLS-1$ - try { - CVSUIPlugin.runWithProgress(getTree().getShell(), true /*cancelable*/, - new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - try { - ILogEntry logEntry = remoteFile.getLogEntry(monitor); - if (logEntry != null) - author[0] = logEntry.getAuthor(); - } catch (TeamException e) { - throw new InvocationTargetException(e); - } - } - }); - } catch (InterruptedException e) { // ignore cancellation - } catch (InvocationTargetException e) { - Throwable t = e.getTargetException(); - if (t instanceof TeamException) { - throw (TeamException) t; - } - // should not get here - } - config.setRightLabel(Policy.bind("CVSCatchupReleaseViewer.repositoryFileRevision", new Object[] {name, revision, author[0]})); //$NON-NLS-1$ - } catch (TeamException e) { - CVSUIPlugin.openError(getControl().getShell(), null, null, e); - config.setRightLabel(Policy.bind("CVSCatchupReleaseViewer.repositoryFile", name)); //$NON-NLS-1$ - } - } else { - config.setRightLabel(Policy.bind("CVSCatchupReleaseViewer.noRepositoryFile")); //$NON-NLS-1$ - } - - IRemoteResource base = syncTree.getBase(); - if (base != null) { - try { - String revision = ((ICVSRemoteFile)base).getRevision(); - config.setAncestorLabel(Policy.bind("CVSCatchupReleaseViewer.commonFileRevision", new Object[] {name, revision} )); //$NON-NLS-1$ - } catch (TeamException e) { - CVSUIPlugin.openError(getControl().getShell(), null, null, e); - config.setRightLabel(Policy.bind("CVSCatchupReleaseViewer.commonFile", name)); //$NON-NLS-1$ - } - } else { - config.setAncestorLabel(Policy.bind("CVSCatchupReleaseViewer.noCommonFile")); //$NON-NLS-1$ - } - - IResource local = syncTree.getLocal(); - if (local != null) { - if (!local.exists()) { - config.setLeftLabel(Policy.bind("CVSCatchupReleaseViewer.No_workspace_file_1")); //$NON-NLS-1$ - } else { - ICVSFile cvsFile = CVSWorkspaceRoot.getCVSFileFor((IFile)local); - ResourceSyncInfo info = null; - try { - info = cvsFile.getSyncInfo(); - name = local.getName(); - String revision = null; - if (info != null) { - revision = info.getRevision(); - if (info.isAdded() || info.isDeleted()) { - revision = null; - } - } - if (revision != null) { - config.setLeftLabel(Policy.bind("CVSCatchupReleaseViewer.commonFileRevision", name, revision)); //$NON-NLS-1$ - } else { - config.setLeftLabel(Policy.bind("CVSCatchupReleaseViewer.commonFile", name)); //$NON-NLS-1$ - } - } catch (CVSException e) { - CVSUIPlugin.openError(getControl().getShell(), null, null, e); - config.setLeftLabel(Policy.bind("CVSCatchupReleaseViewer.commonFile", name)); //$NON-NLS-1$ - } - } - } - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSSyncCompareInput.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSSyncCompareInput.java deleted file mode 100644 index 754815e1f..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSSyncCompareInput.java +++ /dev/null @@ -1,440 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.sync; - - -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import org.eclipse.compare.structuremergeviewer.Differencer; -import org.eclipse.compare.structuremergeviewer.ICompareInput; -import org.eclipse.compare.structuremergeviewer.IDiffContainer; -import org.eclipse.compare.structuremergeviewer.IDiffElement; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.core.RepositoryProvider; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.core.sync.ILocalSyncElement; -import org.eclipse.team.core.sync.IRemoteSyncElement; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.internal.ccvs.core.ICVSRunnable; -import org.eclipse.team.internal.ccvs.core.client.Session; -import org.eclipse.team.internal.ccvs.core.resources.CVSRemoteSyncElement; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.ui.AvoidableMessageDialog; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ui.sync.CatchupReleaseViewer; -import org.eclipse.team.internal.ui.sync.ChangedTeamContainer; -import org.eclipse.team.internal.ui.sync.ITeamNode; -import org.eclipse.team.internal.ui.sync.SyncCompareInput; -import org.eclipse.team.internal.ui.sync.SyncSet; -import org.eclipse.team.internal.ui.sync.TeamFile; - -public class CVSSyncCompareInput extends SyncCompareInput { - - private IResource[] resources; - private boolean onlyOutgoing = false; - - public CVSSyncCompareInput(IResource[] resources) { - this(resources, false); - } - - protected CVSSyncCompareInput(IResource[] resources, int granularity) { - super(granularity); - this.resources = getNonOverlapping(resources); - } - - public CVSSyncCompareInput(IResource[] resources, boolean onlyOutgoing) { - super(CVSUIPlugin.getPlugin().getPreferenceStore().getBoolean(ICVSUIConstants.PREF_CONSIDER_CONTENTS) ? ILocalSyncElement.GRANULARITY_CONTENTS : ILocalSyncElement.GRANULARITY_TIMESTAMP); - this.onlyOutgoing = onlyOutgoing; - this.resources = getNonOverlapping(resources); - } - - /** - * Method getNonOverlapping ensures that a resource is not covered more than once. - * @param resources - * @return IResource[] - */ - private IResource[] getNonOverlapping(IResource[] resources) { - // Sort the resources so the shortest paths are first - List sorted = new ArrayList(); - sorted.addAll(Arrays.asList(resources)); - Collections.sort(sorted, new Comparator() { - public int compare(Object arg0, Object arg1) { - IResource resource0 = (IResource) arg0; - IResource resource1 = (IResource) arg1; - return resource0.getFullPath().segmentCount() - resource1.getFullPath().segmentCount(); - } - public boolean equals(Object arg0) { - return false; - } - }); - // Collect all non-overlapping resources - List coveredPaths = new ArrayList(); - for (Iterator iter = sorted.iterator(); iter.hasNext();) { - IResource resource = (IResource) iter.next(); - IPath resourceFullPath = resource.getFullPath(); - boolean covered = false; - for (Iterator it = coveredPaths.iterator(); it.hasNext();) { - IPath path = (IPath) it.next(); - if(path.isPrefixOf(resourceFullPath)) { - covered = true; - } - } - if (covered) { - // if the resource is covered by a parent, remove it - iter.remove(); - } else { - // if the resource is a non-covered folder, add it to the covered paths - if (resource.getType() == IResource.FOLDER) { - coveredPaths.add(resource.getFullPath()); - } - } - } - return (IResource[]) sorted.toArray(new IResource[sorted.size()]); - } - - /** - * Overridden to create a custom DiffTreeViewer in the top left pane of the CompareProvider. - * - * Subclasses must create and return a new CatchupReleaseViewer, and set the viewer - * using setViewer(). - */ - public Viewer createDiffViewer(Composite parent) { - CatchupReleaseViewer catchupReleaseViewer = new CVSCatchupReleaseViewer(parent, this); - setViewer(catchupReleaseViewer); -// catchupReleaseViewer.getTree().addMouseMoveListener(new MouseMoveListener() { -// /** -// * @see MouseMoveListener#mouseMove(MouseEvent) -// */ -// public void mouseMove(MouseEvent e) { -// final Tree tree = (Tree)e.widget; -// TreeItem item = tree.getItem(new Point(e.x, e.y)); -// final TeamFile file; -// if (item != null) { -// // Hack: this is the only way to get an item from the tree viewer -// Object o = item.getData(); -// if (o instanceof TeamFile) { -// file = (TeamFile)o; -// } else file = null; -// } else file = null; -// -// // avoid redundant updates -- identity test is good enough here -// if (file == previousTeamFile) return; -// previousTeamFile = file; -// getShell().getDisplay().asyncExec(new Runnable() { -// public void run() { -// updateToolTip(tree, file); -// } -// }); -// } -// }); - return catchupReleaseViewer; - } - -// protected void updateToolTip(Tree tree, TeamFile file) { -// String newText = null; -// if (file != null && file.getChangeDirection() != ITeamNode.OUTGOING) { -// IRemoteSyncElement element = file.getMergeResource().getSyncElement(); -// final ICVSRemoteFile remoteFile = (ICVSRemoteFile)element.getRemote(); -// final ILogEntry[] logEntry = new ILogEntry[1]; -// if (remoteFile != null) { -// try { -// CVSUIPlugin.runWithProgress(getViewer().getTree().getShell(), true /*cancelable*/, -// new IRunnableWithProgress() { -// public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { -// try { -// logEntry[0] = remoteFile.getLogEntry(monitor); -// } catch (TeamException ex) { -// throw new InvocationTargetException(ex); -// } -// } -// }); -// } catch (InterruptedException ex) { -// // ignore cancellation -// } catch (InvocationTargetException ex) { -// // ignore the exception -// } -// } -// if (logEntry[0] != null) { -// newText = logEntry[0].getComment(); -// } -// } -// if (tree.isDisposed()) return; -// String oldText = tree.getToolTipText(); -// if (newText == oldText || newText != null && newText.equals(oldText)) return; -// tree.setToolTipText(newText); -// } - - protected IRemoteSyncElement[] createSyncElements(IProgressMonitor monitor) throws TeamException { - // Ensure that the projects for all resources being synchronized exist - // Note: this could happen on a refresh view after a synced project was deleted. - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; - if (!resource.getProject().exists()) { - throw new CVSException(Policy.bind("CVSSyncCompareInput.projectDeleted", resource.getProject().getName())); //$NON-NLS-1$ - } - } - - monitor.beginTask(null, 1000 + (onlyOutgoing?10:0)); - IResource[] resourcesToSync; - if (onlyOutgoing) { - List filteredResources = Arrays.asList(resources); - filteredResources = filterOutgoingChangesSet(filteredResources, Policy.subMonitorFor(monitor, 10)); - resourcesToSync = (IResource[]) filteredResources.toArray(new IResource[filteredResources.size()]); - } else { - resourcesToSync = resources; - } - return buildSyncTrees(resourcesToSync, Policy.subMonitorFor(monitor, 1000)); - } - - private IRemoteSyncElement[] buildSyncTrees(IResource[] resourcesToSync, IProgressMonitor monitor)throws TeamException { - IRemoteSyncElement[] trees = new IRemoteSyncElement[resourcesToSync.length]; - int work = 1000 * resourcesToSync.length; - monitor.beginTask(null, work); - try { - for (int i = 0; i < trees.length; i++) { - trees[i] = CVSWorkspaceRoot.getRemoteSyncTree(resourcesToSync[i], null, Policy.subMonitorFor(monitor, 1000)); - } - } finally { - monitor.done(); - } - return trees; - } - - protected void updateView() { - // Update the view - if (getDiffRoot().hasChildren()) { - getViewer().refresh(); - } else { - getViewer().setInput(null); - } - - // Update the status line - updateStatusLine(); - } - - /** - * Overridden to mark the source as merged. - */ - protected void compareInputChanged(ICompareInput source) { - super.compareInputChanged(source); - updateView(); - - // prompt user with warning - Shell shell = getShell(); - if(shell != null) { - // prompt - if(source instanceof TeamFile) { - TeamFile file = (TeamFile)source; - int direction = file.getChangeDirection(); - int type = file.getChangeType(); - if(direction == IRemoteSyncElement.INCOMING || - direction == IRemoteSyncElement.CONFLICTING) { - promptForConfirmMerge(getShell()); - } - } - } - } - - /* - * Helper method to get cvs elements from the selection in the sync editor input - */ - public static CVSRemoteSyncElement getSyncElementFrom(Object node) { - CVSRemoteSyncElement element = null; - if (node instanceof TeamFile) { - element = (CVSRemoteSyncElement)((TeamFile)node).getMergeResource().getSyncElement(); - } else if (node instanceof ChangedTeamContainer) { - element = (CVSRemoteSyncElement)((ChangedTeamContainer)node).getMergeResource().getSyncElement(); - } - return element; - } - - /* - * Returns the resources in this input. - */ - public IResource[] getResources() { - return resources; - } - - /* - * Inform user that when changes are merged in the sync view that confirm - * merge should be called to finish the merge. - */ - private void promptForConfirmMerge(final Shell shell) { - final IPreferenceStore store = CVSUIPlugin.getPlugin().getPreferenceStore(); - if(!store.getBoolean(ICVSUIConstants.PREF_PROMPT_ON_SAVING_IN_SYNC)) { - return; - }; - shell.getDisplay().syncExec(new Runnable() { - public void run() { - AvoidableMessageDialog dialog = new AvoidableMessageDialog( - shell, - Policy.bind("CVSSyncCompareInput.confirmMergeMessageTitle"), //$NON-NLS-1$ - null, // accept the default window icon - Policy.bind("CVSSyncCompareInput.confirmMergeMessage"), //$NON-NLS-1$ - MessageDialog.INFORMATION, - new String[] {IDialogConstants.OK_LABEL}, - 0); - dialog.open(); - if(dialog.isDontShowAgain()) { - store.setValue(ICVSUIConstants.PREF_PROMPT_ON_SAVING_IN_SYNC, false); - } - } - }); - } - - /** - * Wrap the input preparation in a CVS session run so open sessions will be reused and - * file contents under the same remote root folder will be fetched using the same connection. - * - * Also run with refresh prompting if one of the resources is out of sync with the local - * file system. - */ - public Object prepareInput(IProgressMonitor pm) throws InterruptedException, InvocationTargetException { - final Object[] result = new Object[] { null }; - final Exception[] exception = new Exception[] {null}; - try { - Session.run(null, null, false, new ICVSRunnable() { - public void run(IProgressMonitor monitor) throws CVSException { - try { - CVSUIPlugin.runWithRefresh(getShell(), resources, new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - result[0] = CVSSyncCompareInput.super.prepareInput(monitor); - } - }, monitor); - } catch (InterruptedException e) { - exception[0] = e; - } catch (InvocationTargetException e) { - exception[0] = e; - } - } - }, pm); - } catch (CVSException e) { - throw new InvocationTargetException(e); - } - - if (exception[0] != null) { - if (exception[0] instanceof InvocationTargetException) { - throw (InvocationTargetException)exception[0]; - } else { - throw (InterruptedException)exception[0]; - } - } - - if (hasDifferences(result[0])) { - return result[0]; - } else { - return null; - } - } - - /** - * The given object has differences if it is an IDiffElement with a change - * or it is an IDiffContainer that contains differences. - * - * @param object - * @return boolean - */ - private boolean hasDifferences(Object object) { - if (object instanceof IDiffElement) { - IDiffElement element = (IDiffElement)object; - if (element.getKind() != Differencer.NO_CHANGE) return true; - if (object instanceof IDiffContainer) { - IDiffContainer container = (IDiffContainer) object; - if (container.hasChildren()) { - IDiffElement[] children = container.getChildren(); - for (int i = 0; i < children.length; i++) { - IDiffElement child = children[i]; - if (hasDifferences(child)) return true; - } - } - } - } - return false; - } - - private boolean hasIncomingChanges(ChangedTeamContainer container) { - IDiffElement[] children = container.getChildren(); - for (int i = 0; i < children.length; i++) { - IDiffElement element = children[i]; - int direction = element.getKind() & Differencer.DIRECTION_MASK; - if (direction == ITeamNode.CONFLICTING || direction == ITeamNode.INCOMING) { - return true; - } - if (element instanceof ChangedTeamContainer) { - boolean hasIncomingChanges = hasIncomingChanges((ChangedTeamContainer)element); - if (hasIncomingChanges) return true; - } - } - return false; - } - - /* - * Method copied from TeamAction. It should be put in a common place - */ - protected Map getProviderMapping(IResource[] resources) { - Map result = new HashMap(); - for (int i = 0; i < resources.length; i++) { - RepositoryProvider provider = RepositoryProvider.getProvider(resources[i].getProject()); - List list = (List)result.get(provider); - if (list == null) { - list = new ArrayList(); - result.put(provider, list); - } - list.add(resources[i]); - } - return result; - } - - protected SyncSet getSyncSet(IStructuredSelection selection) { - return new CVSSyncSet(selection); - } - - /* - * Return the resources from the original list that are modified. - */ - private List filterOutgoingChangesSet(List resources, IProgressMonitor monitor) throws CVSException { - try { - monitor.beginTask(null, 100 * resources.size()); - monitor.subTask(Policy.bind("CVSSyncCompareInput.filteringOutgoingChanges")); //$NON-NLS-1$ - List result = new ArrayList(); - for (Iterator iter = resources.iterator(); iter.hasNext();) { - IResource resource = (IResource) iter.next(); - ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource); - if (!cvsResource.isIgnored() && cvsResource.isModified(Policy.subMonitorFor(monitor, 100))) - result.add(resource); - } - return result; - } finally { - monitor.done(); - } - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSSyncCompareUnsharedInput.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSSyncCompareUnsharedInput.java deleted file mode 100644 index 7d81f80d3..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSSyncCompareUnsharedInput.java +++ /dev/null @@ -1,50 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.sync; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.core.sync.IRemoteSyncElement; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.ui.Policy; - -public class CVSSyncCompareUnsharedInput extends CVSSyncCompareInput { - - private ICVSRepositoryLocation location; - private String moduleName; - private CVSTag tag; - - public CVSSyncCompareUnsharedInput(IProject project, ICVSRepositoryLocation location, String moduleName, CVSTag tag) { - super(new IResource[] { project }); - this.location = location; - this.moduleName = moduleName; - this.tag = tag; - } - - protected IRemoteSyncElement[] createSyncElements(IProgressMonitor monitor) throws TeamException { - IResource[] resources = getResources(); - IRemoteSyncElement[] trees = new IRemoteSyncElement[resources.length]; - int work = 1000 * resources.length; - monitor.beginTask(null, work); - try { - for (int i = 0; i < trees.length; i++) { - trees[i] = CVSWorkspaceRoot.getRemoteSyncTree((IProject)resources[i], location, moduleName, tag, Policy.subMonitorFor(monitor, 1000)); - } - } finally { - monitor.done(); - } - return trees; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSSyncSet.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSSyncSet.java deleted file mode 100644 index aec6b7a32..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSSyncSet.java +++ /dev/null @@ -1,209 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.sync; - - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import org.eclipse.core.resources.IResource; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.team.core.sync.IRemoteSyncElement; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ui.sync.ITeamNode; -import org.eclipse.team.internal.ui.sync.SyncSet; - -/** - * This class contains a set of CVS resources that are slated to be - * synchronized. This adds CVS specific handling to the common sync set - * class, specifically to deal with non-added outgoing changes. - */ -public class CVSSyncSet extends SyncSet { - - /** - * Creates a new sync set on the nodes in the given selection. - */ - public CVSSyncSet(IStructuredSelection nodeSelection) { - super(nodeSelection); - } - - public ITeamNode[] getNonAddedNodes() throws CVSException { - List result = new ArrayList(); - ITeamNode[] changedNodes = getChangedNodes(); - for (int i = 0; i < changedNodes.length; i++) { - ITeamNode node = changedNodes[i]; - ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(node.getResource()); - if (cvsResource.isFolder()) { - if (!((ICVSFolder)cvsResource).isCVSFolder()) { - result.add(node); - } - } else if (!cvsResource.isManaged()) { - result.add(node); - } - } - return (ITeamNode[])result.toArray(new ITeamNode[result.size()]); - } - - public boolean hasNonAddedChanges() throws CVSException { - ITeamNode[] changedNodes = getChangedNodes(); - for (int i = 0; i < changedNodes.length; i++) { - ITeamNode node = changedNodes[i]; - ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(node.getResource()); - if (cvsResource.exists()) { - if (cvsResource.isFolder()) { - if (!((ICVSFolder)cvsResource).isCVSFolder()) { - return true; - } - } else if (!cvsResource.isManaged()) { - return true; - } - } - } - return false; - } - - public boolean removeNonAddedChanges() { - for (Iterator it = getSyncSet().iterator(); it.hasNext();) { - try { - ITeamNode node = (ITeamNode)it.next(); - ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(node.getResource()); - if (cvsResource.exists()) { - if(cvsResource.isFolder()) { - if(!((ICVSFolder)cvsResource).isCVSFolder()) { - it.remove(); - } - } else { - if(!cvsResource.isManaged()) { - it.remove(); - } - } - } - } catch (CVSException e) { - // isManaged or isCVSFolder threw an exception - // Log it and continue - CVSUIPlugin.log(e); - } - } - return false; - } - - public boolean removeNonAddedResources(IResource[] remove) { - for (Iterator it = getSyncSet().iterator(); it.hasNext();) { - ITeamNode node = (ITeamNode)it.next(); - IResource resource = node.getResource(); - boolean included = false; - for (int j = 0; j < remove.length; j++) { - IResource resourceToRemove = remove[j]; - if (resource.equals(resourceToRemove)) { - included = true; - break; - } - } - if (included) - it.remove(); - } - return false; - } - - public boolean removeAddedChanges() { - for (Iterator it = getSyncSet().iterator(); it.hasNext();) { - try { - ITeamNode node = (ITeamNode)it.next(); - ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(node.getResource()); - if(cvsResource.isFolder()) { - if(((ICVSFolder)cvsResource).isCVSFolder()) { - it.remove(); - } - } else { - if(cvsResource.isManaged()) { - it.remove(); - } - } - } catch (CVSException e) { - // isManaged or isCVSFolder threw an exception - // Log it and continue - CVSUIPlugin.log(e); - } - } - return false; - } - - /** - * Returns a message for the status line describing this sync set. - * - * Override the method in SyncSet to add information about new resources - */ - public String getStatusLineMessage() { - int incoming = 0; - int outgoing = 0; - int conflicts = 0; - int newResources = 0; - ITeamNode[] nodes = getChangedNodes(); - for (int i = 0; i < nodes.length; i++) { - ITeamNode next = nodes[i]; - switch (next.getChangeDirection()) { - case IRemoteSyncElement.INCOMING: - incoming++; - break; - case IRemoteSyncElement.OUTGOING: - outgoing++; - ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(next.getResource()); - try { - if (cvsResource.exists()) { - if (cvsResource.isFolder()) { - if (!((ICVSFolder)cvsResource).isCVSFolder()) { - newResources++; - } - } else if (!cvsResource.isManaged()) { - newResources++; - } - } - } catch (CVSException e) { - CVSUIPlugin.log(e); - } - break; - case IRemoteSyncElement.CONFLICTING: - conflicts++; - break; - } - } - StringBuffer result = new StringBuffer(); - - if (conflicts == 0) { - result.append(Policy.bind("CVSSyncSet.noConflicts")); //$NON-NLS-1$ - } else { - result.append(Policy.bind("CVSSyncSet.conflicts", new Object[] {Integer.toString(conflicts)} )); //$NON-NLS-1$ - } - if (incoming == 0) { - result.append(Policy.bind("CVSSyncSet.noIncomings")); //$NON-NLS-1$ - } else { - result.append(Policy.bind("CVSSyncSet.incomings", new Object[] {Integer.toString(incoming)} )); //$NON-NLS-1$ - } - if (outgoing == 0) { - result.append(Policy.bind("CVSSyncSet.noOutgoings")); //$NON-NLS-1$ - } else { - result.append(Policy.bind("CVSSyncSet.outgoings", new Object[] {Integer.toString(outgoing)} )); //$NON-NLS-1$ - } - if (newResources == 0) { - result.append(Policy.bind("CVSSyncSet.noNew")); //$NON-NLS-1$ - } else { - result.append(Policy.bind("CVSSyncSet.new", new Object[] {Integer.toString(newResources)} )); //$NON-NLS-1$ - } - - return result.toString(); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CommitSyncAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CommitSyncAction.java deleted file mode 100644 index 08703dd84..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CommitSyncAction.java +++ /dev/null @@ -1,46 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.team.internal.ccvs.ui.sync; - -import org.eclipse.jface.viewers.ISelectionProvider; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ui.sync.ITeamNode; -import org.eclipse.team.internal.ui.sync.SyncSet; - -/** - * Override ForceCommitSyncAction to only work on outgoing nodes - */ -public class CommitSyncAction extends ForceCommitSyncAction { - public CommitSyncAction(CVSSyncCompareInput model, ISelectionProvider sp, String label, Shell shell) { - super(model, sp, label, shell); - } - - protected boolean isEnabled(ITeamNode node) { - // The commit action is enabled only for non-conflicting outgoing changes - CVSSyncSet set = new CVSSyncSet(new StructuredSelection(node)); - return set.hasOutgoingChanges(); - } - - protected void removeNonApplicableNodes(SyncSet set, int syncMode) { - set.removeConflictingNodes(); - set.removeIncomingNodes(); - } - /** - * @see MergeAction#getHelpContextID() - */ - protected String getHelpContextID() { - return IHelpContextIds.SYNC_COMMIT_ACTION; - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/ForceCommitSyncAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/ForceCommitSyncAction.java deleted file mode 100644 index c4bd759b3..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/ForceCommitSyncAction.java +++ /dev/null @@ -1,366 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.team.internal.ccvs.ui.sync; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - -import org.eclipse.compare.structuremergeviewer.Differencer; -import org.eclipse.compare.structuremergeviewer.IDiffContainer; -import org.eclipse.compare.structuremergeviewer.IDiffElement; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.viewers.ISelectionProvider; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.core.sync.IRemoteSyncElement; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.ICVSRunnable; -import org.eclipse.team.internal.ccvs.core.resources.CVSRemoteSyncElement; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ccvs.ui.repo.RepositoryManager; -import org.eclipse.team.internal.ui.sync.ChangedTeamContainer; -import org.eclipse.team.internal.ui.sync.ITeamNode; -import org.eclipse.team.internal.ui.sync.SyncSet; -import org.eclipse.team.internal.ui.sync.SyncView; -import org.eclipse.team.internal.ui.sync.TeamFile; - -public class ForceCommitSyncAction extends MergeAction { - public ForceCommitSyncAction(CVSSyncCompareInput model, ISelectionProvider sp, String label, Shell shell) { - super(model, sp, label, shell); - } - - protected SyncSet run(SyncSet syncSet, IProgressMonitor monitor) { - boolean result = saveIfNecessary(); - if (!result) return null; - - // If there is a conflict in the syncSet, we need to prompt the user before proceeding. - if (syncSet.hasConflicts() || syncSet.hasIncomingChanges()) { - switch (promptForConflicts(syncSet)) { - case 0: - // Yes, synchronize conflicts as well - break; - case 1: - // No, only synchronize non-conflicting changes. - syncSet.removeConflictingNodes(); - syncSet.removeIncomingNodes(); - break; - case 2: - default: - // Cancel - return null; - } - } - ITeamNode[] changed = syncSet.getChangedNodes(); - if (changed.length == 0) { - return syncSet; - } - - // accumulate any resources that are not under version control - IResource[] unadded = null; - if (syncSet instanceof CVSSyncSet) { - CVSSyncSet cvsSyncSet = (CVSSyncSet)syncSet; - try { - if (cvsSyncSet.hasNonAddedChanges()) { - ITeamNode[] nodes = cvsSyncSet.getNonAddedNodes(); - unadded = new IResource[nodes.length]; - for (int i = 0; i < nodes.length; i++) { - unadded[i] = nodes[i].getResource(); - } - } - } catch (CVSException e) { - CVSUIPlugin.log(e); - } - } - - // prompt to get comment and any resources to be added to version control - final RepositoryManager manager = CVSUIPlugin.getPlugin().getRepositoryManager(); - IResource[] toBeAdded = promptForResourcesToBeAdded(manager, unadded); - if (toBeAdded == null) return null; // User cancelled. - final String comment = promptForComment(manager, syncSet.getResources()); - if (comment == null) return null; // User cancelled. - - // remove unshared resources that were not selected by the user - if (unadded != null && unadded.length > 0) { - List resourcesToRemove = new ArrayList(unadded.length); - for (int i = 0; i < unadded.length; i++) { - IResource unaddedResource = unadded[i]; - boolean included = false; - for (int j = 0; j < toBeAdded.length; j++) { - IResource resourceToAdd = toBeAdded[j]; - if (unaddedResource.equals(resourceToAdd)) { - included = true; - break; - } - } - if (!included) - resourcesToRemove.add(unaddedResource); - } - CVSSyncSet cvsSyncSet = (CVSSyncSet)syncSet; - cvsSyncSet.removeNonAddedResources((IResource[]) resourcesToRemove.toArray(new IResource[resourcesToRemove.size()])); - changed = syncSet.getChangedNodes(); - if (changed.length == 0) { - return syncSet; - } - } - - final List commits = new ArrayList(); - final List additions = new ArrayList(); - final List deletions = new ArrayList(); - final List toMerge = new ArrayList(); - final List incoming = new ArrayList(); - - // A list of diff elements in the sync set which are incoming folder additions - final List parentCreationElements = new ArrayList(); - // A list of diff elements in the sync set which are folder conflicts - final List parentConflictElements = new ArrayList(); - - for (int i = 0; i < changed.length; i++) { - int kind = changed[i].getKind(); - IResource resource = changed[i].getResource(); - if (resource.getType() == IResource.FILE) { - commits.add(resource); - } - IDiffContainer parent = changed[i].getParent(); - if (parent != null) { - int parentKind = changed[i].getParent().getKind(); - if (((parentKind & Differencer.CHANGE_TYPE_MASK) == Differencer.ADDITION) && - ((parentKind & Differencer.DIRECTION_MASK) == ITeamNode.INCOMING)) { - parentCreationElements.add(parent); - } else if ((parentKind & Differencer.DIRECTION_MASK) == ITeamNode.CONFLICTING) { - parentConflictElements.add(parent); - } - } - switch (kind & Differencer.DIRECTION_MASK) { - case ITeamNode.INCOMING: - // Incoming change. Make it outgoing before committing. - incoming.add(changed[i]); - break; - case ITeamNode.OUTGOING: - switch (kind & Differencer.CHANGE_TYPE_MASK) { - case Differencer.ADDITION: - // Outgoing addition. 'add' it before committing. - additions.add(resource); - break; - case Differencer.DELETION: - // Outgoing deletion. 'delete' it before committing. - deletions.add(resource); - break; - case Differencer.CHANGE: - // Outgoing change. Just commit it. - break; - } - break; - case ITeamNode.CONFLICTING: - if (changed[i] instanceof TeamFile) { - toMerge.add(((TeamFile)changed[i]).getMergeResource().getSyncElement()); - } - break; - } - } - try { - // execute the operations in a single CVS runnable so sync changes are batched - CVSWorkspaceRoot.getCVSFolderFor(ResourcesPlugin.getWorkspace().getRoot()).run( - new ICVSRunnable() { - public void run(IProgressMonitor monitor) throws CVSException { - try { - if (parentCreationElements.size() > 0) { - // If a node has a parent that is an incoming folder creation, we have to - // create that folder locally and set its sync info before we can get the - // node itself. We must do this for all incoming folder creations (recursively) - // in the case where there are multiple levels of incoming folder creations. - Iterator it = parentCreationElements.iterator(); - while (it.hasNext()) { - makeInSync((IDiffElement)it.next()); - } - } - if (parentConflictElements.size() > 0) { - // If a node has a parent that is a folder conflict, that means that the folder - // exists locally but has no sync info. In order to get the node, we have to - // create the sync info for the folder (and any applicable parents) before we - // get the node itself. - Iterator it = parentConflictElements.iterator(); - while (it.hasNext()) { - makeInSync((IDiffElement)it.next()); - } - } - - // Handle any real incomming deletions by unmanaging them before adding - Iterator it = incoming.iterator(); - Set incomingDeletions = new HashSet(incoming.size()); - while (it.hasNext()) { - ITeamNode node = (ITeamNode)it.next(); - collectIncomingDeletions(node, incomingDeletions, monitor); - if ((node instanceof TeamFile) && !additions.contains(node)) { - CVSRemoteSyncElement element = (CVSRemoteSyncElement)((TeamFile)node).getMergeResource().getSyncElement(); - element.makeOutgoing(monitor); - } - } - it = incomingDeletions.iterator(); - while (it.hasNext()) { - ITeamNode node = (ITeamNode)it.next(); - CVSRemoteSyncElement syncElement; - if (node instanceof TeamFile) { - syncElement = (CVSRemoteSyncElement)((TeamFile)node).getMergeResource().getSyncElement(); - } else { - syncElement = (CVSRemoteSyncElement)((ChangedTeamContainer)node).getMergeResource().getSyncElement(); - } - additions.add(syncElement.getLocal()); - CVSWorkspaceRoot.getCVSResourceFor(syncElement.getLocal()).unmanage(null); - } - - if (additions.size() != 0) { - manager.add((IResource[])additions.toArray(new IResource[0]), monitor); - } - if (deletions.size() != 0) { - manager.delete((IResource[])deletions.toArray(new IResource[0]), monitor); - } - if (toMerge.size() != 0) { - manager.merged((IRemoteSyncElement[])toMerge.toArray(new IRemoteSyncElement[0])); - } - manager.commit((IResource[])commits.toArray(new IResource[commits.size()]), comment, monitor); - } catch (TeamException e) { - throw CVSException.wrapException(e); - } - } - }, monitor); - } catch (CVSException e) { - handle(e); - return null; - } - - return syncSet; - } - - protected boolean isEnabled(ITeamNode node) { - // The force commit action is enabled only for conflicting and incoming changes - CVSSyncSet set = new CVSSyncSet(new StructuredSelection(node)); - if (syncMode == SyncView.SYNC_OUTGOING) { - return (set.hasConflicts() && hasRealChanges(node, new int[] { ITeamNode.CONFLICTING })); - } else { - return ((set.hasIncomingChanges() || set.hasConflicts()) && hasRealChanges(node, new int[] { ITeamNode.CONFLICTING, ITeamNode.INCOMING })); - } - } - - /** - * Prompts the user to determine how conflicting changes should be handled. - * Note: This method is designed to be overridden by test cases. - * @return 0 to sync conflicts, 1 to sync all non-conflicts, 2 to cancel - */ - protected int promptForConflicts(SyncSet syncSet) { - String[] buttons = new String[] {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL}; - String question = Policy.bind("CommitSyncAction.questionRelease"); //$NON-NLS-1$ - String title = Policy.bind("CommitSyncAction.titleRelease"); //$NON-NLS-1$ - String[] tips = new String[] { - Policy.bind("CommitSyncAction.releaseAll"), //$NON-NLS-1$ - Policy.bind("CommitSyncAction.releasePart"), //$NON-NLS-1$ - Policy.bind("CommitSyncAction.cancelRelease") //$NON-NLS-1$ - }; - Shell shell = getShell(); - final ToolTipMessageDialog dialog = new ToolTipMessageDialog(shell, title, null, question, MessageDialog.QUESTION, buttons, tips, 0); - shell.getDisplay().syncExec(new Runnable() { - public void run() { - dialog.open(); - } - }); - return dialog.getReturnCode(); - } - - /** - * Prompts the user for a release comment. - * Note: This method is designed to be overridden by test cases. - * @return the comment, or null to cancel - */ - protected String promptForComment(RepositoryManager manager, IResource[] resourcesToCommit) { - return manager.promptForComment(getShell(), resourcesToCommit); - } - - protected IResource[] promptForResourcesToBeAdded(RepositoryManager manager, IResource[] unadded) { - return manager.promptForResourcesToBeAdded(getShell(), unadded); - } - - protected void removeNonApplicableNodes(SyncSet set, int syncMode) { - set.removeOutgoingNodes(); - if (syncMode != SyncView.SYNC_BOTH) { - set.removeIncomingNodes(); - } - } - - /* - * Handle incoming folder deletion. - * - * Special handling is required in the case were a folder has been deleted remotely - * (i.e using "rm -rf" on the server). - * - * We need to determine if there is a remote folder corresponding to this folder - * If there isn't, we need to unmanage the local resource and then add the folder - * Unfortunately, unmanaging may effect the state of the children which are also incoming deletions - */ - private void collectIncomingDeletions(ITeamNode node, Set additions, IProgressMonitor monitor) throws TeamException { - if (isIncomingDeletion(node) && ! additions.contains(node) && ! existsRemotely(node, monitor)) { - - // Make sure that the parent is handled - IDiffContainer parent = node.getParent(); - if (isIncomingDeletion((ITeamNode)parent)) { - collectIncomingDeletions((ITeamNode)parent, additions, monitor); - } - - // Add the node to the list - additions.add(node); - } - } - - private boolean isIncomingDeletion(ITeamNode node) { - return (node.getChangeDirection() == ITeamNode.INCOMING && node.getChangeType() == Differencer.DELETION); - } - - /* - * For files, use the remote of the sync element to determine whether there is a remote or not. - * For folders, if there is no remote in the tree check remotely in case the folder was pruned - */ - private boolean existsRemotely(ITeamNode node, IProgressMonitor monitor) throws TeamException { - - CVSRemoteSyncElement syncElement; - if (node instanceof TeamFile) { - syncElement = (CVSRemoteSyncElement)((TeamFile)node).getMergeResource().getSyncElement(); - } else { - syncElement = (CVSRemoteSyncElement)((ChangedTeamContainer)node).getMergeResource().getSyncElement(); - } - if (syncElement.getRemote() != null) { - return true; - } - if (syncElement.getLocal().getType() == IResource.FILE) { - return false; - } - return CVSWorkspaceRoot.getRemoteResourceFor(syncElement.getLocal()).exists(monitor); - } - /** - * @see MergeAction#getHelpContextID() - */ - protected String getHelpContextID() { - return IHelpContextIds.SYNC_FORCED_COMMIT_ACTION; - } - - protected String getErrorTitle() { - return Policy.bind("CommitAction.commitFailed"); //$NON-NLS-1$ - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/ForceUpdateSyncAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/ForceUpdateSyncAction.java deleted file mode 100644 index bd3b02042..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/ForceUpdateSyncAction.java +++ /dev/null @@ -1,51 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.sync; - -import org.eclipse.jface.viewers.ISelectionProvider; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ui.sync.ITeamNode; -import org.eclipse.team.internal.ui.sync.SyncSet; -import org.eclipse.team.internal.ui.sync.SyncView; - -public class ForceUpdateSyncAction extends UpdateSyncAction { - - public ForceUpdateSyncAction(CVSSyncCompareInput model, ISelectionProvider sp, String label, Shell shell) { - super(model, sp, label, shell); - } - - protected boolean isEnabled(ITeamNode node) { - // The force update action is enabled only for conflicting and outgoing changes - SyncSet set = new SyncSet(new StructuredSelection(node)); - if (syncMode == SyncView.SYNC_INCOMING) { - return (set.hasConflicts() && hasRealChanges(node, new int[] { ITeamNode.CONFLICTING })); - } else { - return ((set.hasOutgoingChanges() || set.hasConflicts()) && hasRealChanges(node, new int[] { ITeamNode.CONFLICTING, ITeamNode.OUTGOING })); - } - } - - protected void removeNonApplicableNodes(SyncSet set, int syncMode) { - set.removeIncomingNodes(); - if (syncMode != SyncView.SYNC_BOTH) { - set.removeOutgoingNodes(); - } - } - - /** - * @see MergeAction#getHelpContextID() - */ - protected String getHelpContextID() { - return IHelpContextIds.SYNC_FORCED_UPDATE_ACTION; - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/IgnoreAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/IgnoreAction.java deleted file mode 100644 index 61036eca1..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/IgnoreAction.java +++ /dev/null @@ -1,134 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.sync; - - -import org.eclipse.compare.structuremergeviewer.IDiffContainer; -import org.eclipse.compare.structuremergeviewer.IDiffElement; -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IResource; -import org.eclipse.jface.action.Action; -import org.eclipse.jface.viewers.ISelectionProvider; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.core.sync.IRemoteSyncElement; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.IgnoreResourcesDialog; -import org.eclipse.team.internal.ui.sync.ChangedTeamContainer; -import org.eclipse.team.internal.ui.sync.ITeamNode; -import org.eclipse.team.internal.ui.sync.SyncSet; -import org.eclipse.team.internal.ui.sync.TeamFile; -import org.eclipse.team.internal.ui.sync.UnchangedTeamContainer; -import org.eclipse.ui.help.WorkbenchHelp; - -public class IgnoreAction extends Action { - Shell shell; - private CVSSyncCompareInput diffModel; - private ISelectionProvider selectionProvider; - - public IgnoreAction(CVSSyncCompareInput model, ISelectionProvider sp, String label, Shell shell) { - super(label); - this.shell = shell; - this.diffModel = model; - this.selectionProvider = sp; - WorkbenchHelp.setHelp(this, IHelpContextIds.SYNC_IGNORE_ACTION); - } - public void run() { - IStructuredSelection selection = (IStructuredSelection)selectionProvider.getSelection(); - if (selection.isEmpty()) return; - // Do the update - Object first = selection.getFirstElement(); - ICVSResource cvsResource = null; - IResource resource = null; - if (first instanceof TeamFile) { - resource = ((TeamFile)first).getMergeResource().getResource(); - cvsResource = CVSWorkspaceRoot.getCVSFileFor((IFile) resource); - } else if (first instanceof ChangedTeamContainer) { - resource = ((ChangedTeamContainer)first).getMergeResource().getResource(); - cvsResource = CVSWorkspaceRoot.getCVSFolderFor((IContainer) resource); - } - if (resource != null) { - try { - IgnoreResourcesDialog dialog = new IgnoreResourcesDialog(shell, new IResource[] {resource}); - if (dialog.open() != IgnoreResourcesDialog.OK) return; - String pattern = dialog.getIgnorePatternFor(resource); - cvsResource.setIgnoredAs(pattern); - } catch (CVSException e) { - CVSUIPlugin.openError(shell, null, null, e); - return; - } - removeNodes(new SyncSet(selection).getChangedNodes()); - diffModel.refresh(); - } - } - /** - * Enabled if only one item is selected and it is an outgoing addition. - * - * This may be a folder or a single file, which will be handled differently. - */ - protected boolean isEnabled(Object[] nodes) { - if (nodes.length != 1) return false; - if (!(nodes[0] instanceof ITeamNode)) return false; - ITeamNode node = (ITeamNode)nodes[0]; - if (node.getKind() != (ITeamNode.OUTGOING | IRemoteSyncElement.ADDITION)) return false; - IResource resource = node.getResource(); - ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource); - try { - if (cvsResource.isManaged()) return false; - if (cvsResource.isIgnored()) return false; - } catch (CVSException e) { - CVSUIPlugin.log(e); - return false; - } - return true; - } - public void update() { - IStructuredSelection selection = (IStructuredSelection)selectionProvider.getSelection(); - setEnabled(isEnabled(selection.toArray())); - } - /** - * The given nodes have been synchronized. Remove them from - * the sync set. - */ - private void removeNodes(final ITeamNode[] nodes) { - // Update the model - for (int i = 0; i < nodes.length; i++) { - if (nodes[i].getClass() == UnchangedTeamContainer.class) { - // Unchanged containers get removed automatically when all - // children are removed - continue; - } - if (nodes[i].getClass() == ChangedTeamContainer.class) { - // If this node still has children, convert to an - // unchanged container, then it will disappear when - // all children have been removed. - ChangedTeamContainer container = (ChangedTeamContainer)nodes[i]; - IDiffElement[] children = container.getChildren(); - if (children.length > 0) { - IDiffContainer parent = container.getParent(); - UnchangedTeamContainer unchanged = new UnchangedTeamContainer(parent, container.getResource()); - for (int j = 0; j < children.length; j++) { - unchanged.add(children[j]); - } - parent.removeToRoot(container); - continue; - } - // No children, it will get removed below. - } - nodes[i].getParent().removeToRoot(nodes[i]); - } - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/MergeAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/MergeAction.java deleted file mode 100644 index ec67075f3..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/MergeAction.java +++ /dev/null @@ -1,369 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.sync; - - -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Set; - -import org.eclipse.compare.ITypedElement; -import org.eclipse.compare.structuremergeviewer.Differencer; -import org.eclipse.compare.structuremergeviewer.IDiffContainer; -import org.eclipse.compare.structuremergeviewer.IDiffElement; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.action.Action; -import org.eclipse.jface.dialogs.ProgressMonitorDialog; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.ISelectionProvider; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.core.sync.IRemoteSyncElement; -import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.team.internal.ccvs.core.resources.CVSRemoteSyncElement; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ui.sync.ChangedTeamContainer; -import org.eclipse.team.internal.ui.sync.ITeamNode; -import org.eclipse.team.internal.ui.sync.SyncSet; -import org.eclipse.team.internal.ui.sync.UnchangedTeamContainer; -import org.eclipse.ui.actions.WorkspaceModifyOperation; -import org.eclipse.ui.help.WorkbenchHelp; - -/** - * Applies merge related actions to the selected ITeamNodes. - */ -abstract class MergeAction extends Action { - public static final int CHECKIN = 0; - public static final int GET = 1; - public static final int DELETE_REMOTE = 2; - public static final int DELETE_LOCAL = 3; - - private CVSSyncCompareInput diffModel; - private ISelectionProvider selectionProvider; - - protected int syncMode; - private Shell shell; - - /** - * Creates a MergeAction which works on selection and doesn't commit changes. - */ - public MergeAction(CVSSyncCompareInput model, ISelectionProvider sp, String label, Shell shell) { - super(label); - this.diffModel = model; - this.selectionProvider = sp; - this.shell = shell; - String helpContextId = getHelpContextID(); - if (helpContextId != null) { - WorkbenchHelp.setHelp(this, helpContextId); - } - } - - /** - * Method getHelpContextID. - * @return String - */ - protected String getHelpContextID() { - return null; - } - - protected Shell getShell() { - return shell; - } - - protected CVSSyncCompareInput getDiffModel() { - return diffModel; - } - - /** - * Returns true if at least one node can perform the specified action. - */ - private boolean isEnabled(Object[] nodes) { - for (int i = 0; i < nodes.length; i++) { - if (nodes[i] instanceof ITeamNode) { - ITeamNode node = (ITeamNode)nodes[i]; - if (isEnabled(node)) { - return true; - } - } else { - if (nodes[i] instanceof IDiffContainer) - if (isEnabled(((IDiffContainer)nodes[i]).getChildren())) - return true; - } - } - return false; - } - - protected abstract boolean isEnabled(ITeamNode node); - - /** - * Perform the sychronization operation. - */ - public void run() { - ISelection s = selectionProvider.getSelection(); - if (!(s instanceof IStructuredSelection) || s.isEmpty()) { - return; - } - final SyncSet set = new CVSSyncSet((IStructuredSelection)s); - removeNonApplicableNodes(set, syncMode); - final SyncSet[] result = new SyncSet[1]; - WorkspaceModifyOperation op = new WorkspaceModifyOperation() { - public void execute(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - result[0] = MergeAction.this.run(set, monitor); - } - }; - try { - run(op); - } catch (InterruptedException e) { - } - if (result[0] != null) { - // all returned nodes that have a changed sync kind are assumed - // to have been operated on and will be removed from the diff tree. - removeNodes(result[0].getChangedNodes()); - - // any node that claims that it's IN_SYNC will be automatically - // filtered from the diff tree - see DiffElement.setKind(). - diffModel.updateView(); - } - } - - protected abstract void removeNonApplicableNodes(SyncSet set, int syncMode); - - /** - * The given nodes have been synchronized. Remove them from - * the sync set. - * - * For folders that are outgoing deletions, we may need to leave the - * folder as is or adjust the sync kind depending on the sync kind of - * the folder's children. - * - * @see CVSSyncCompareInput#collectResourceChanges(IDiffContainer, IRemoteSyncElement, IProgressMonitor) - */ - private void removeNodes(final ITeamNode[] nodes) { - // Update the model - Set outgoingFolderDeletions = new HashSet(); - for (int i = 0; i < nodes.length; i++) { - if (nodes[i].getClass() == UnchangedTeamContainer.class) { - // Unchanged containers get removed automatically when all - // children are removed - continue; - } - if (nodes[i].getClass() == ChangedTeamContainer.class) { - // If this node still has children, convert to an - // unchanged container, then it will disappear when - // all children have been removed. - ChangedTeamContainer container = (ChangedTeamContainer)nodes[i]; - IDiffElement[] children = container.getChildren(); - if (children.length > 0) { - if (isLocallyDeletedFolder(container)) { - // For locally deleted folders, we postpone the handling until all other children are removed - outgoingFolderDeletions.add(container); - } else { - IDiffContainer parent = container.getParent(); - UnchangedTeamContainer unchanged = new UnchangedTeamContainer(parent, container.getResource()); - for (int j = 0; j < children.length; j++) { - unchanged.add(children[j]); - } - parent.removeToRoot(container); - } - continue; - } - // No children, it will get removed below. - } else if (nodes[i].getParent().getClass() == ChangedTeamContainer.class) { - // If the parent is a locally deleted folder, we may want to update it's sync state as well - if (isLocallyDeletedFolder(nodes[i].getParent())) { - outgoingFolderDeletions.add(nodes[i].getParent()); - } - } - nodes[i].getParent().removeToRoot(nodes[i]); - } - // Remove any locally deleted folders from the sync tree as appropriate - for (Iterator iter = outgoingFolderDeletions.iterator(); iter.hasNext();) { - removeLocallyDeletedFolder((ChangedTeamContainer)iter.next()); - } - } - - /** - * Updates the action with the latest selection, setting enablement - * as necessary. - */ - public void update(int syncMode) { - this.syncMode = syncMode; - IStructuredSelection selection = (IStructuredSelection)selectionProvider.getSelection(); - setEnabled(isEnabled(selection.toArray())); - } - - /** - * Subclasses must implement this method, which performs action-specific code. - * - * It may return the sync set which was passed in, or null. - */ - protected abstract SyncSet run(SyncSet syncSet, IProgressMonitor monitor); - - /** - * Helper method to run a runnable in a progress monitor dialog, and display any errors. - */ - protected void run(IRunnableWithProgress op) throws InterruptedException { - ProgressMonitorDialog dialog = new ProgressMonitorDialog(getShell()); - try { - dialog.run(true, true, op); - } catch (InvocationTargetException e) { - handle(e); - } - } - - /** - * Helper method. Check if a save is necessary. If it is, prompt the user to save. - * Return true if all necessary saves have been performed, false otherwise. - */ - protected boolean saveIfNecessary() { - return getDiffModel().saveIfNecessary(); - } - - /** - * Answer true if the given diff element represents a locally deleted CVS folder. - * The sync state of locally deleted CVS folders is either outgoing deletion or - * conflicting change. - */ - protected boolean isLocallyDeletedFolder(IDiffElement element) { - if ( ! (element.getType() == IDiffElement.FOLDER_TYPE)) return false; - int kind = element.getKind(); - return (((kind & Differencer.CHANGE_TYPE_MASK) == Differencer.DELETION) && - ((kind & Differencer.DIRECTION_MASK) == ITeamNode.OUTGOING)) - || (((kind & Differencer.CHANGE_TYPE_MASK) == Differencer.CHANGE) && - ((kind & Differencer.DIRECTION_MASK) == ITeamNode.CONFLICTING)); - } - - /** - * Recreate any parents that are outgoing folder deletions - */ - protected void recreateLocallyDeletedFolder(IDiffElement element) throws TeamException { - // Recursively make the parent element (and its parents) in sync. - // Walk up and find the parents which need to be made in sync too. (For - // each parent that doesn't already have sync info). - if (element == null) return; - if (element instanceof ChangedTeamContainer) { - CVSRemoteSyncElement syncElement = (CVSRemoteSyncElement)((ChangedTeamContainer)element).getMergeResource().getSyncElement(); - // recreate the folder - ICVSFolder cvsFolder = (ICVSFolder) CVSWorkspaceRoot.getCVSResourceFor(syncElement.getLocal()); - if (! cvsFolder.exists()) { - recreateLocallyDeletedFolder(element.getParent()); - cvsFolder.mkdir(); - syncElement.makeInSync(Policy.monitorFor(null)); - ((ChangedTeamContainer)element).makeInSync(); - } - } - } - - /** - * Adjust the sync kind of the locally deleted folder and remove - * the folder if it doesn't contain any real changes - */ - private void removeLocallyDeletedFolder(ChangedTeamContainer container) { - boolean hasIncoming = hasRealChanges(container, new int[] { ITeamNode.INCOMING }); - boolean hasOutgoing = hasRealChanges(container, new int[] { ITeamNode.OUTGOING }); - boolean hasConflicting = hasRealChanges(container, new int[] { ITeamNode.CONFLICTING }); - IDiffContainer parent = container.getParent(); - if (hasConflicting || (hasOutgoing && hasIncoming)) { - // Leave as a conflict - return; - } else if (hasOutgoing) { - // Convert to an outgoing deletion - container.setKind(ITeamNode.OUTGOING | Differencer.DELETION); - } else if (hasIncoming) { - container.setKind(ITeamNode.INCOMING | Differencer.ADDITION); - } else { - // The folder is empty, remove it - if (parent != null) { - parent.removeToRoot(container); - } - } - // The parent may need adjusting as well - if (parent != null && isLocallyDeletedFolder(parent)) { - removeLocallyDeletedFolder((ChangedTeamContainer)parent); - } - } - - /** - * Look for real changes of the given type. Real changes are those that - * are not locally deleted folders that are persisted as phantoms - * to report local file deletions to the server. - */ - protected boolean hasRealChanges(IDiffElement node, int[] changeDirections) { - // For regular nodes (i.e. not local folder deletions), check the sync kind of the node - if ( ! isLocallyDeletedFolder(node)) { - int direction = node.getKind() & Differencer.DIRECTION_MASK; - for (int i = 0; i < changeDirections.length; i++) { - if (direction == changeDirections[i]) { - return true; - } - } - } - // For folders, check their children (if we didn't get a match above) - if (node.getType() == ITypedElement.FOLDER_TYPE) { - IDiffElement[] children = ((IDiffContainer)node).getChildren(); - for (int i = 0; i < children.length; i++) { - if (hasRealChanges(children[i], changeDirections)) { - return true; - } - } - } - // If no matches occured above, we don't have any "real" changes in the given directions - return false; - } - - /** - * Recursively make the parent element (and its parents) in sync. - * Walk up and find the parents which need to be made in sync too. (For - * each parent that doesn't already have sync info). - */ - protected void makeInSync(IDiffElement parentElement) throws TeamException { - ArrayList v = new ArrayList(); - int parentKind = parentElement.getKind(); - int direction = parentKind & Differencer.DIRECTION_MASK; - int change = parentKind & Differencer.CHANGE_TYPE_MASK; - while ((change == Differencer.ADDITION) && - ((direction == ITeamNode.INCOMING) || (direction == ITeamNode.CONFLICTING))) { - v.add(0, parentElement); - parentElement = parentElement.getParent(); - parentKind = parentElement == null ? 0 : parentElement.getKind(); - direction = parentKind & Differencer.DIRECTION_MASK; - change = parentKind & Differencer.CHANGE_TYPE_MASK; - } - Iterator parentIt = v.iterator(); - while (parentIt.hasNext()) { - IDiffElement next = (IDiffElement)parentIt.next(); - if (next instanceof ChangedTeamContainer) { - CVSRemoteSyncElement syncElement = (CVSRemoteSyncElement)((ChangedTeamContainer)next).getMergeResource().getSyncElement(); - // Create the sync info - syncElement.makeInSync(Policy.monitorFor(null)); - ((ChangedTeamContainer)next).setKind(IRemoteSyncElement.IN_SYNC); - } - } - } - - /** - * Sycn actions seem to need to be sync-execed to work - * @param t - */ - protected void handle(Throwable t) { - CVSUIPlugin.openError(getShell(), getErrorTitle(), null, t, CVSUIPlugin.PERFORM_SYNC_EXEC | CVSUIPlugin.LOG_NONTEAM_EXCEPTIONS); - } - - protected String getErrorTitle() { - return null; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/ToolTipMessageDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/ToolTipMessageDialog.java deleted file mode 100644 index 1e06ab5e6..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/ToolTipMessageDialog.java +++ /dev/null @@ -1,40 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.sync; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Shell; -/** - * A class that adds tool-tips to the buttons of a standard message dialog. - */ -public class ToolTipMessageDialog extends MessageDialog { - private String[] buttonToolTips; - /** - * Same as the MessageDialog constructor, with the addition of a button tooltip - * argument. The number of button tool tips must match the number of button labels. - */ - public ToolTipMessageDialog(Shell parentShell, String dialogTitle, Image dialogTitleImage, String dialogMessage, int dialogImageType, String[] dialogButtonLabels, String[] buttonToolTips, int defaultIndex) { - super(parentShell, dialogTitle, dialogTitleImage, dialogMessage, dialogImageType, dialogButtonLabels, defaultIndex); - this.buttonToolTips = buttonToolTips; - } - /** - * Method declared on MessageDialog. - */ - protected void createButtonsForButtonBar(Composite parent) { - super.createButtonsForButtonBar(parent); - if (buttonToolTips != null) { - for (int i = 0; i < buttonToolTips.length; i++) { - getButton(i).setToolTipText(buttonToolTips[i]); - } - } - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/UpdateSyncAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/UpdateSyncAction.java deleted file mode 100644 index b21efeb22..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/UpdateSyncAction.java +++ /dev/null @@ -1,430 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.sync; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - -import org.eclipse.compare.structuremergeviewer.Differencer; -import org.eclipse.compare.structuremergeviewer.IDiffContainer; -import org.eclipse.compare.structuremergeviewer.IDiffElement; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.viewers.ISelectionProvider; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.core.sync.IRemoteSyncElement; -import org.eclipse.team.internal.ccvs.core.client.Command; -import org.eclipse.team.internal.ccvs.core.client.Update; -import org.eclipse.team.internal.ccvs.core.resources.CVSRemoteSyncElement; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ccvs.ui.repo.RepositoryManager; -import org.eclipse.team.internal.ui.sync.ITeamNode; -import org.eclipse.team.internal.ui.sync.SyncSet; -import org.eclipse.team.internal.ui.sync.TeamFile; - -/** - * UpdateSyncAction is run on a set of sync nodes when the "Update" menu item is performed - * in the Synchronize view. - * - * This class is also used as the super class of the merge update actions for regular and forced - * update. - */ -public class UpdateSyncAction extends MergeAction { - public static class ConfirmDialog extends MessageDialog { - - private boolean autoMerge = true; - private Button radio1; - private Button radio2; - - public ConfirmDialog(Shell parentShell) { - super( - parentShell, - Policy.bind("UpdateSyncAction.Conflicting_changes_found_1"), //$NON-NLS-1$ - null, // accept the default window icon - Policy.bind("UpdateSyncAction.You_have_local_changes_you_are_about_to_overwrite_2"), //$NON-NLS-1$ - MessageDialog.QUESTION, - new String[] {IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL}, - 0); // yes is the default - } - - protected Control createCustomArea(Composite parent) { - Composite composite = new Composite(parent, SWT.NONE); - composite.setLayout(new GridLayout()); - radio1 = new Button(composite, SWT.RADIO); - radio1.addSelectionListener(selectionListener); - - radio1.setText(Policy.bind("UpdateSyncAction.Only_update_resources_that_can_be_automatically_merged_3")); //$NON-NLS-1$ - - radio2 = new Button(composite, SWT.RADIO); - radio2.addSelectionListener(selectionListener); - - radio2.setText(Policy.bind("UpdateSyncAction.Update_all_resources,_overwriting_local_changes_with_remote_contents_4")); //$NON-NLS-1$ - - // set initial state - radio1.setSelection(autoMerge); - radio2.setSelection(!autoMerge); - - return composite; - } - - private SelectionListener selectionListener = new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - Button button = (Button)e.widget; - if (button.getSelection()) { - autoMerge = (button == radio1); - } - } - }; - - public boolean getAutomerge() { - return autoMerge; - } - } - - public UpdateSyncAction(CVSSyncCompareInput model, ISelectionProvider sp, String label, Shell shell) { - super(model, sp, label, shell); - } - - protected SyncSet run(final SyncSet syncSet, IProgressMonitor monitor) { - boolean result = saveIfNecessary(); - if (!result) return null; - - // If there are conflicts or outgoing changes in the syncSet, we need to warn the user. - boolean onlyUpdateAutomergeable = false; - if (syncSet.hasConflicts() || syncSet.hasOutgoingChanges()) { - if (syncSet.hasAutoMergeableConflicts()) { - switch (promptForMergeableConflicts()) { - case 0: // cancel - return null; - case 1: // only update auto-mergeable conflicts - onlyUpdateAutomergeable = true; - syncSet.removeNonMergeableNodes(); - break; - case 2: // update all conflicts - onlyUpdateAutomergeable = false; - break; - } - } else { - if (! promptForConflicts()) return null; - } - } - - ITeamNode[] changed = syncSet.getChangedNodes(); - if (changed.length == 0) { - return syncSet; - } - - List updateIgnoreLocalShallow = new ArrayList(); - List updateDeep = new ArrayList(); - List updateShallow = new ArrayList(); - - // A list of diff elements in the sync set which are incoming folder additions - Set parentCreationElements = new HashSet(); - // A list of diff elements in the sync set which are folder conflicts - Set parentConflictElements = new HashSet(); - // A list of diff elements in the sync set which are outgoing folder deletions - Set parentDeletionElements = new HashSet(); - // A list of the team nodes that we need to perform makeIncoming on - List makeIncoming = new ArrayList(); - // A list of diff elements that are incoming deletions. - // We do these first to avoid case conflicts - List updateDeletions = new ArrayList(); - // A list of diff elements that need to be unmanaged and locally deleted - List deletions = new ArrayList(); - - for (int i = 0; i < changed.length; i++) { - IDiffContainer parent = changed[i].getParent(); - if (parent != null) { - int parentKind = changed[i].getParent().getKind(); - if (((parentKind & Differencer.CHANGE_TYPE_MASK) == Differencer.ADDITION) && - ((parentKind & Differencer.DIRECTION_MASK) == ITeamNode.INCOMING)) { - parentCreationElements.add(parent); - } else if (isLocallyDeletedFolder(parent)) { - parentDeletionElements.add(parent); - } else if ((parentKind & Differencer.DIRECTION_MASK) == ITeamNode.CONFLICTING) { - parentConflictElements.add(parent); - } - } - ITeamNode changedNode = changed[i]; - IResource resource = changedNode.getResource(); - int kind = changedNode.getKind(); - switch (kind & Differencer.DIRECTION_MASK) { - case ITeamNode.INCOMING: - switch (kind & Differencer.CHANGE_TYPE_MASK) { - case Differencer.ADDITION: - updateIgnoreLocalShallow.add(changedNode); - break; - case Differencer.DELETION: - updateDeletions.add(changedNode); - break; - case Differencer.CHANGE: - updateDeep.add(changedNode); - break; - } - break; - case ITeamNode.OUTGOING: - switch (kind & Differencer.CHANGE_TYPE_MASK) { - case Differencer.ADDITION: - // Unmanage the file if necessary and delete it. - deletions.add(changedNode); - break; - case Differencer.DELETION: - if (resource.getType() == IResource.FILE) { - makeIncoming.add(changedNode); - updateDeep.add(changedNode); - } - break; - case Differencer.CHANGE: - updateIgnoreLocalShallow.add(changedNode); - break; - } - break; - case ITeamNode.CONFLICTING: - switch (kind & Differencer.CHANGE_TYPE_MASK) { - case Differencer.ADDITION: - if(changedNode instanceof IDiffContainer) { - parentConflictElements.add(changedNode); - } else { - makeIncoming.add(changedNode); - deletions.add(changedNode); - updateIgnoreLocalShallow.add(changedNode); - } - break; - case Differencer.DELETION: - // Doesn't happen, these nodes don't appear in the tree. - break; - case Differencer.CHANGE: - if (resource.getType() == IResource.FILE) { - // Depends on the flag. - if (onlyUpdateAutomergeable && (changedNode.getKind() & IRemoteSyncElement.AUTOMERGE_CONFLICT) != 0) { - updateShallow.add(changedNode); - } else { - // Check to see if there is a remote - if (((TeamFile)changedNode).getMergeResource().getSyncElement().getRemote() == null) { - // If a locally modified file has no remote, "update -C" will fail. - // We must unmanage and delete the file ourselves - deletions.add(changedNode); - } else { - updateIgnoreLocalShallow.add(changedNode); - // If the resource doesn't exist remotely, we must ensure the sync info will allow the above update. - if (!resource.exists()) { - makeIncoming.add(changedNode); - } - } - } - } else { - // Conflicting change on a folder only occurs if the folder has been deleted locally - // The folder should only be recreated if there were children in the changed set. - // Such folders would have been added to the parentDeletionElements set above - } - break; - } - break; - } - } - try { - // Calculate the total amount of work needed - int work = (makeIncoming.size() + deletions.size() + updateDeletions.size() + updateShallow.size() + updateIgnoreLocalShallow.size() + updateDeep.size()) * 100; - monitor.beginTask(null, work); - - RepositoryManager manager = CVSUIPlugin.getPlugin().getRepositoryManager(); - if (parentDeletionElements.size() > 0) { - // If a node has a parent that is an outgoing folder deletion, we have to - // recreate that folder locally (it's sync info already exists locally). - // We must do this for all outgoing folder deletions (recursively) - // in the case where there are multiple levels of outgoing folder deletions. - Iterator it = parentDeletionElements.iterator(); - while (it.hasNext()) { - recreateLocallyDeletedFolder((IDiffElement)it.next()); - } - } - if (parentCreationElements.size() > 0) { - // If a node has a parent that is an incoming folder creation, we have to - // create that folder locally and set its sync info before we can get the - // node itself. We must do this for all incoming folder creations (recursively) - // in the case where there are multiple levels of incoming folder creations. - Iterator it = parentCreationElements.iterator(); - while (it.hasNext()) { - IDiffElement element = (IDiffElement)it.next(); - makeInSync(element); - // Remove the folder from the update shallow list since we have it locally now - updateIgnoreLocalShallow.remove(element); - } - } - if (parentConflictElements.size() > 0) { - // If a node has a parent that is a folder conflict, that means that the folder - // exists locally but has no sync info. In order to get the node, we have to - // create the sync info for the folder (and any applicable parents) before we - // get the node itself. - Iterator it = parentConflictElements.iterator(); - while (it.hasNext()) { - makeInSync((IDiffElement)it.next()); - } - } - // Make any outgoing changes or deletions into incoming changes before updating. - Iterator it = makeIncoming.iterator(); - while (it.hasNext()) { - ITeamNode node = (ITeamNode)it.next(); - CVSRemoteSyncElement element = CVSSyncCompareInput.getSyncElementFrom(node); - element.makeIncoming(Policy.subMonitorFor(monitor, 100)); - } - - // Outgoing additions or conflicts with incoming deletions must be unmanaged and locally deleted. - if (deletions.size() > 0) { - runLocalDeletions((ITeamNode[])deletions.toArray(new ITeamNode[deletions.size()]), manager, Policy.subMonitorFor(monitor, deletions.size() * 100)); - } - - if (updateDeletions.size() > 0) { - runUpdateDeletions((ITeamNode[])updateDeletions.toArray(new ITeamNode[updateDeletions.size()]), manager, Policy.subMonitorFor(monitor, updateDeletions.size() * 100)); - } - if (updateShallow.size() > 0) { - runUpdateShallow((ITeamNode[])updateShallow.toArray(new ITeamNode[updateShallow.size()]), manager, Policy.subMonitorFor(monitor, updateShallow.size() * 100)); - } - if (updateIgnoreLocalShallow.size() > 0) { - runUpdateIgnoreLocalShallow((ITeamNode[])updateIgnoreLocalShallow.toArray(new ITeamNode[updateIgnoreLocalShallow.size()]), manager, Policy.subMonitorFor(monitor, updateIgnoreLocalShallow.size() * 100)); - } - if (updateDeep.size() > 0) { - runUpdateDeep((ITeamNode[])updateDeep.toArray(new ITeamNode[updateDeep.size()]), manager, Policy.subMonitorFor(monitor, updateDeep.size() * 100)); - } - } catch (final TeamException e) { - handle(e); - return null; - } catch (final CoreException e) { - handle(e); - return null; - } finally { - monitor.done(); - } - return syncSet; - } - - /** - * Method deleteAndKeepHistory. - * @param iResource - * @param iProgressMonitor - */ - protected void deleteAndKeepHistory(IResource resource, IProgressMonitor monitor) throws CoreException { - if (resource.getType() == IResource.FILE) - ((IFile)resource).delete(false /* force */, true /* keep history */, monitor); - else - resource.delete(false /* force */, monitor); - } - - protected void runLocalDeletions(ITeamNode[] nodes, RepositoryManager manager, IProgressMonitor monitor) throws TeamException, CoreException { - monitor.beginTask(null, nodes.length * 100); - for (int i = 0; i < nodes.length; i++) { - ITeamNode node = nodes[i]; - CVSRemoteSyncElement element = CVSSyncCompareInput.getSyncElementFrom(node); - element.makeIncoming(Policy.subMonitorFor(monitor, 50)); - deleteAndKeepHistory(element.getLocal(), Policy.subMonitorFor(monitor, 50)); - } - monitor.done(); - } - - protected void runUpdateDeletions(ITeamNode[] nodes, RepositoryManager manager, IProgressMonitor monitor) throws TeamException { - manager.update(getIResourcesFrom(nodes), new Command.LocalOption[] { Command.DO_NOT_RECURSE }, false, monitor); - } - - protected void runUpdateDeep(ITeamNode[] nodes, RepositoryManager manager, IProgressMonitor monitor) throws TeamException { - manager.update(getIResourcesFrom(nodes), Command.NO_LOCAL_OPTIONS, false, monitor); - } - - protected void runUpdateIgnoreLocalShallow(ITeamNode[] nodes, RepositoryManager manager, IProgressMonitor monitor) throws TeamException { - manager.update(getIResourcesFrom(nodes), new Command.LocalOption[] { Update.IGNORE_LOCAL_CHANGES, Command.DO_NOT_RECURSE }, false, monitor); - } - - protected void runUpdateShallow(ITeamNode[] nodes, RepositoryManager manager, IProgressMonitor monitor) throws TeamException { - manager.update(getIResourcesFrom(nodes), new Command.LocalOption[] { Command.DO_NOT_RECURSE }, false, monitor); - } - - protected IResource[] getIResourcesFrom(ITeamNode[] nodes) { - List resources = new ArrayList(nodes.length); - for (int i = 0; i < nodes.length; i++) { - resources.add(nodes[i].getResource()); - } - return (IResource[]) resources.toArray(new IResource[resources.size()]); - } - - protected boolean isEnabled(ITeamNode node) { - // The update action is enabled only for non-conflicting incoming changes - return new SyncSet(new StructuredSelection(node)).hasIncomingChanges(); - } - - /** - * Prompt for mergeable conflicts. - * Note: This method is designed to be overridden by test cases. - * @return 0 to cancel, 1 to only update mergeable conflicts, 2 to overwrite if unmergeable - */ - protected int promptForMergeableConflicts() { - final boolean doAutomerge[] = new boolean[] {false}; - final int[] result = new int[] {Dialog.CANCEL}; - final Shell shell = getShell(); - shell.getDisplay().syncExec(new Runnable() { - public void run() { - ConfirmDialog dialog = new ConfirmDialog(shell); - result[0] = dialog.open(); - doAutomerge[0] = dialog.getAutomerge(); - } - }); - if (result[0] == Dialog.CANCEL) return 0; - return doAutomerge[0] ? 1 : 2; - } - - /** - * Prompt for non-automergeable conflicts. - * Note: This method is designed to be overridden by test cases. - * @return false to cancel, true to overwrite local changes - */ - protected boolean promptForConflicts() { - final boolean[] result = new boolean[] { false }; - final Shell shell = getShell(); - shell.getDisplay().syncExec(new Runnable() { - public void run() { - result[0] = MessageDialog.openQuestion(shell, Policy.bind("UpdateSyncAction.Overwrite_local_changes__5"), Policy.bind("UpdateSyncAction.You_have_local_changes_you_are_about_to_overwrite._Do_you_wish_to_continue__6")); //$NON-NLS-1$ //$NON-NLS-2$ - } - }); - return result[0]; - } - protected void removeNonApplicableNodes(SyncSet set, int syncMode) { - set.removeConflictingNodes(); - set.removeOutgoingNodes(); - } - /** - * @see MergeAction#getHelpContextID() - */ - protected String getHelpContextID() { - return IHelpContextIds.SYNC_UPDATE_ACTION; - } - - protected String getErrorTitle() { - return Policy.bind("UpdateAction.update"); //$NON-NLS-1$ - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CVSWizardPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CVSWizardPage.java deleted file mode 100644 index b884271cd..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CVSWizardPage.java +++ /dev/null @@ -1,343 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.wizards; - - -import java.util.ArrayList; - -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.viewers.DecoratingLabelProvider; -import org.eclipse.jface.viewers.IStructuredContentProvider; -import org.eclipse.jface.viewers.ITreeContentProvider; -import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jface.viewers.ListViewer; -import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Combo; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Text; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.repo.RepositoryManager; -import org.eclipse.ui.model.WorkbenchContentProvider; -import org.eclipse.ui.model.WorkbenchLabelProvider; -import org.eclipse.ui.model.WorkbenchViewerSorter; -import org.eclipse.ui.views.navigator.ResourceSorter; - -/** - * Common superclass for CVS wizard pages. Provides convenience methods - * for widget creation. - */ -public abstract class CVSWizardPage extends WizardPage { - protected static final int LABEL_WIDTH_HINT = 400; - protected static final int LABEL_INDENT_WIDTH = 32; - protected static final int LIST_HEIGHT_HINT = 100; - protected static final int SPACER_HEIGHT = 8; - - /** - * CVSWizardPage constructor comment. - * @param pageName the name of the page - */ - public CVSWizardPage(String pageName) { - super(pageName); - } - /** - * CVSWizardPage constructor comment. - * @param pageName the name of the page - * @param title the title of the page - * @param titleImage the image for the page - */ - public CVSWizardPage(String pageName, String title, ImageDescriptor titleImage) { - super(pageName, title, titleImage); - } - /** - * CVSWizardPage constructor comment. - * @param pageName the name of the page - * @param title the title of the page - * @param titleImage the image for the page - * @param description the description of the page - */ - public CVSWizardPage(String pageName, String title, ImageDescriptor titleImage, String description) { - super(pageName, title, titleImage); - setDescription(description); - } - /** - * Creates a new checkbox instance and sets the default layout data. - * - * @param group the composite in which to create the checkbox - * @param label the string to set into the checkbox - * @return the new checkbox - */ - protected Button createCheckBox(Composite group, String label) { - Button button = new Button(group, SWT.CHECK | SWT.LEFT); - button.setText(label); - GridData data = new GridData(); - data.horizontalSpan = 2; - button.setLayoutData(data); - return button; - } - /** - * Utility method that creates a combo box - * - * @param parent the parent for the new label - * @return the new widget - */ - protected Combo createCombo(Composite parent) { - Combo combo = new Combo(parent, SWT.READ_ONLY); - GridData data = new GridData(GridData.FILL_HORIZONTAL); - data.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH; - combo.setLayoutData(data); - return combo; - } - /** - * Creates composite control and sets the default layout data. - * - * @param parent the parent of the new composite - * @param numColumns the number of columns for the new composite - * @return the newly-created coposite - */ - protected Composite createComposite(Composite parent, int numColumns) { - Composite composite = new Composite(parent, SWT.NULL); - - // GridLayout - GridLayout layout = new GridLayout(); - layout.numColumns = numColumns; - composite.setLayout(layout); - - // GridData - GridData data = new GridData(); - data.verticalAlignment = GridData.FILL; - data.horizontalAlignment = GridData.FILL; - composite.setLayoutData(data); - return composite; - } - /** - * Utility method that creates a label instance - * and sets the default layout data. - * - * @param parent the parent for the new label - * @param text the text for the new label - * @return the new label - */ - public static Label createLabel(Composite parent, String text) { - return createIndentedLabel(parent, text, 0); - } - /** - * Utility method that creates a label instance indented by the specified - * number of pixels and sets the default layout data. - * - * @param parent the parent for the new label - * @param text the text for the new label - * @param indent the indent in pixels, or 0 for none - * @return the new label - */ - public static Label createIndentedLabel(Composite parent, String text, int indent) { - Label label = new Label(parent, SWT.LEFT); - label.setText(text); - GridData data = new GridData(); - data.horizontalSpan = 1; - data.horizontalAlignment = GridData.FILL; - data.horizontalIndent = indent; - label.setLayoutData(data); - return label; - } - /** - * Utility method that creates a label instance with word wrap and sets - * the default layout data. - * - * @param parent the parent for the new label - * @param text the text for the new label - * @param indent the indent in pixels, or 0 for none - * @param widthHint the nominal width of the label - * @return the new label - */ - protected Label createWrappingLabel(Composite parent, String text, int indent) { - return createWrappingLabel(parent, text, indent, 1); - } - - protected Label createWrappingLabel(Composite parent, String text, int indent, int horizontalSpan) { - Label label = new Label(parent, SWT.LEFT | SWT.WRAP); - label.setText(text); - GridData data = new GridData(); - data.horizontalSpan = horizontalSpan; - data.horizontalAlignment = GridData.FILL; - data.horizontalIndent = indent; - data.grabExcessHorizontalSpace = true; - data.widthHint = LABEL_WIDTH_HINT; - label.setLayoutData(data); - return label; - } - - /** - * Create a text field specific for this application - * - * @param parent the parent of the new text field - * @return the new text field - */ - static public Text createTextField(Composite parent) { - Text text = new Text(parent, SWT.SINGLE | SWT.BORDER); - return layoutTextField(text); - } - /** - * Create a password field specific for this application - * - * @param parent the parent of the new text field - * @return the new text field - */ - static public Text createPasswordField(Composite parent) { - Text text = new Text(parent, SWT.SINGLE | SWT.BORDER | SWT.PASSWORD); - return layoutTextField(text); - } - /** - * Layout a text or password field specific for this application - * - * @param parent the parent of the new text field - * @return the new text field - */ - static public Text layoutTextField(Text text) { - GridData data = new GridData(GridData.FILL_HORIZONTAL); - data.verticalAlignment = GridData.CENTER; - data.grabExcessVerticalSpace = false; - data.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH; - text.setLayoutData(data); - return text; - } - - /** - * Utility method to create a radio button - * - * @param parent the parent of the radio button - * @param label the label of the radio button - * @param span the number of columns to span - * @return the created radio button - */ - protected Button createRadioButton(Composite parent, String label, int span) { - Button button = new Button(parent, SWT.RADIO); - button.setText(label); - GridData data = new GridData(); - data.horizontalSpan = span; - button.setLayoutData(data); - return button; - } - /** - * Utility method to create a full width separator preceeded by a blank space - * - * @param parent the parent of the separator - * @param verticalSpace the vertical whitespace to insert before the label - */ - protected void createSeparator(Composite parent, int verticalSpace) { - // space - Label label = new Label(parent, SWT.NONE); - GridData data = new GridData(); - data.heightHint = verticalSpace; - label.setLayoutData(data); - // separator - label = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL); - data = new GridData(GridData.FILL_HORIZONTAL); - label.setLayoutData(data); - } - - /** - * Creates a ListViewer whose input is an array of IFiles. - * - * @param parent the parent of the viewer - * @param title the text for the title label - * @param heightHint the nominal height of the list - * @return the created list viewer - */ - public ListViewer createFileListViewer(Composite parent, String title, int heightHint) { - createLabel(parent, title); - ListViewer listViewer = new ListViewer(parent, SWT.READ_ONLY | SWT.V_SCROLL | SWT.H_SCROLL | SWT.BORDER); - listViewer.setContentProvider(new IStructuredContentProvider() { - public Object[] getElements(Object inputElement) { - return (Object[]) inputElement; - } - public void dispose() { - } - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - } - }); - listViewer.setLabelProvider(new LabelProvider() { - public String getText(Object element) { - return ((IFile) element).getFullPath().toString(); - } - }); - listViewer.setSorter(new WorkbenchViewerSorter()); - - GridData data = new GridData(GridData.FILL_BOTH); - data.heightHint = heightHint; - listViewer.getList().setLayoutData(data); - return listViewer; - } - - protected TreeViewer createResourceSelectionTree(Composite composite, int types, int span) { - TreeViewer tree = new TreeViewer(composite, SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER); - tree.setUseHashlookup(true); - tree.setContentProvider(getResourceProvider(types)); - tree.setLabelProvider( - new DecoratingLabelProvider( - new WorkbenchLabelProvider(), - CVSUIPlugin.getPlugin().getWorkbench().getDecoratorManager().getLabelDecorator())); - tree.setSorter(new ResourceSorter(ResourceSorter.NAME)); - - GridData data = new GridData(GridData.FILL_BOTH | GridData.GRAB_VERTICAL); - data.heightHint = LIST_HEIGHT_HINT; - data.horizontalSpan = span; - tree.getControl().setLayoutData(data); - return tree; - } - - /** - * Returns a content provider for <code>IResource</code>s that returns - * only children of the given resource type. - */ - protected ITreeContentProvider getResourceProvider(final int resourceType) { - return new WorkbenchContentProvider() { - public Object[] getChildren(Object o) { - if (o instanceof IContainer) { - IResource[] members = null; - try { - members = ((IContainer)o).members(); - } catch (CoreException e) { - //just return an empty set of children - return new Object[0]; - } - - //filter out the desired resource types - ArrayList results = new ArrayList(); - for (int i = 0; i < members.length; i++) { - //And the test bits with the resource types to see if they are what we want - if ((members[i].getType() & resourceType) > 0) { - results.add(members[i]); - } - } - return results.toArray(); - } else { - return super.getChildren(o); - } - } - }; - } - - protected RepositoryManager getRepositoryManager() { - return CVSUIPlugin.getPlugin().getRepositoryManager(); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsLocationSelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsLocationSelectionPage.java deleted file mode 100644 index cceabd7ae..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsLocationSelectionPage.java +++ /dev/null @@ -1,316 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.wizards; - -import java.io.File; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Platform; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.DirectoryDialog; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Text; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder; -import org.eclipse.team.internal.ccvs.ui.Policy; - -/** - * @author Administrator - * - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ -public class CheckoutAsLocationSelectionPage extends CVSWizardPage { - - public static final String NAME = "CheckoutAsLocationSelectionPage"; - - private Button browseButton; - private Text locationPathField; - private Label locationLabel; - private boolean useDefaults = true; - private ICVSRemoteFolder[] remoteFolders; - private String targetLocation; - private IProject singleProject; - - // constants - private static final int SIZING_TEXT_FIELD_WIDTH = 250; - - /** - * @param pageName - * @param title - * @param titleImage - * @param description - */ - public CheckoutAsLocationSelectionPage(ImageDescriptor titleImage, ICVSRemoteFolder[] remoteFolders) { - super(NAME, Policy.bind("CheckoutAsLocationSelectionPage.title"), titleImage, Policy.bind("CheckoutAsLocationSelectionPage.description")); - this.remoteFolders = remoteFolders; - } - - /** - * @return - */ - private boolean isSingleFolder() { - return remoteFolders.length == 1; - } - - /** - * @param string - */ - public void setProject(IProject project) { - singleProject = project; - } - - /** - * @param string - */ - public void setProjectName(String string) { - if (string == null) return; - if (singleProject != null && singleProject.getName().equals(string)) return; - setProject(ResourcesPlugin.getWorkspace().getRoot().getProject(string)); - } - - private IProject getSingleProject() { - if (singleProject == null) { - setProjectName(remoteFolders[0].getName()); - } - return singleProject; - } - - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) - */ - public void createControl(Composite parent) { - Composite composite= createComposite(parent, 1); - setControl(composite); - // required in order to use setButtonLayoutData - initializeDialogUnits(composite); - - // WorkbenchHelp.setHelp(composite, IHelpContextIds.CHECKOUT_INTO_RESOURCE_SELECTION_PAGE); - - final Button useDefaultsButton = - new Button(composite, SWT.CHECK | SWT.RIGHT); - useDefaultsButton.setText(Policy.bind("CheckoutAsLocationSelectionPage.useDefaultLabel")); //$NON-NLS-1$ - useDefaultsButton.setSelection(this.useDefaults); - - createUserSpecifiedProjectLocationGroup(composite, !this.useDefaults); - - SelectionListener listener = new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - useDefaults = useDefaultsButton.getSelection(); - browseButton.setEnabled(!useDefaults); - locationPathField.setEnabled(!useDefaults); - locationLabel.setEnabled(!useDefaults); - setLocationForSelection(true); - setErrorMessage(useDefaults ? null : checkValidLocation()); - } - }; - useDefaultsButton.addSelectionListener(listener); - } - - /** - * Creates the project location specification controls. - * - * @return the parent of the widgets created - * @param projectGroup the parent composite - * @param enabled - sets the initial enabled state of the widgets - */ - private Composite createUserSpecifiedProjectLocationGroup(Composite parent, boolean enabled) { - - // This group needs 3 columns - Composite projectGroup = createComposite(parent, 3); - - // location label - locationLabel = new Label(projectGroup, SWT.NONE); - if (isSingleFolder()) { - locationLabel.setText(Policy.bind("CheckoutAsLocationSelectionPage.locationLabel")); //$NON-NLS-1$ - } else { - locationLabel.setText(Policy.bind("CheckoutAsLocationSelectionPage.parentDirectoryLabel")); //$NON-NLS-1$ - } - locationLabel.setEnabled(enabled); - - // project location entry field - locationPathField = new Text(projectGroup, SWT.BORDER); - GridData data = new GridData(GridData.FILL_HORIZONTAL); - data.widthHint = SIZING_TEXT_FIELD_WIDTH; - locationPathField.setLayoutData(data); - locationPathField.setEnabled(enabled); - - // browse button - this.browseButton = new Button(projectGroup, SWT.PUSH); - this.browseButton.setText(Policy.bind("CheckoutAsLocationSelectionPage.browseLabel")); //$NON-NLS-1$ - this.browseButton.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent event) { - handleLocationBrowseButtonPressed(); - } - }); - this.browseButton.setEnabled(enabled); - setButtonLayoutData(this.browseButton); - - // Set the initial value first before listener - // to avoid handling an event during the creation. - setLocationForSelection(true); - locationPathField.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - setErrorMessage(checkValidLocation()); - } - }); - return projectGroup; - } - - /** - * Check if the entry in the widget location is valid. If it is valid return null. Otherwise - * return a string that indicates the problem. - */ - private String checkValidLocation() { - - if (useDefaults) { - targetLocation = null; - return null; - } else { - targetLocation = locationPathField.getText(); - if (targetLocation.equals("")) {//$NON-NLS-1$ - return(Policy.bind("CheckoutAsLocationSelectionPage.locationEmpty")); //$NON-NLS-1$ - } - else{ - IPath path = new Path("");//$NON-NLS-1$ - if (!path.isValidPath(targetLocation)) { - return Policy.bind("CheckoutAsLocationSelectionPage.invalidLocation"); //$NON-NLS-1$ - } - } - - if (isSingleFolder()) { - IStatus locationStatus = - ResourcesPlugin.getWorkspace().validateProjectLocation( - getSingleProject(), - new Path(targetLocation)); - - if (!locationStatus.isOK()) - return locationStatus.getMessage(); - } else { - for (int i = 0; i < remoteFolders.length; i++) { - String projectName = remoteFolders[i].getName(); - IStatus locationStatus = ResourcesPlugin.getWorkspace().validateProjectLocation( - ResourcesPlugin.getWorkspace().getRoot().getProject(projectName), - new Path(targetLocation).append(projectName)); - if (!locationStatus.isOK()) - return locationStatus.getMessage(); - } - } - - return null; - } - } - - /** - * Set the location to the default location if we are set to useDefaults. - */ - private void setLocationForSelection(boolean changed) { - if (useDefaults) { - IPath defaultPath = null; - if (isSingleFolder()) { - try { - defaultPath = getSingleProject().getDescription().getLocation(); - } catch (CoreException e) { - // ignore - } - if (defaultPath == null) { - defaultPath = Platform.getLocation().append(getSingleProject().getName()); - } - } else { - defaultPath = Platform.getLocation(); - } - locationPathField.setText(defaultPath.toOSString()); - targetLocation = null; - } else if (changed) { - IPath location = null; - try { - location = ResourcesPlugin.getWorkspace().getRoot().getProject(remoteFolders[0].getName()).getDescription().getLocation(); - } catch (CoreException e) { - // ignore the exception - } - if (location == null) { - targetLocation = null; - locationPathField.setText(""); //$NON-NLS-1$ - } else { - if (isSingleFolder()) { - targetLocation = location.toOSString(); - } else { - targetLocation = location.removeLastSegments(1).toOSString(); - } - locationPathField.setText(targetLocation); - } - } - } - - /** - * Open an appropriate directory browser - */ - private void handleLocationBrowseButtonPressed() { - DirectoryDialog dialog = new DirectoryDialog(locationPathField.getShell()); - if (isSingleFolder()) { - dialog.setMessage(Policy.bind("CheckoutAsLocationSelectionPage.messageForSingle", getSingleProject().getName())); //$NON-NLS-1$ - } else { - dialog.setMessage(Policy.bind("CheckoutAsLocationSelectionPage.messageForMulti", new Integer(remoteFolders.length).toString())); //$NON-NLS-1$ - } - - String dirName = locationPathField.getText(); - if (!dirName.equals("")) {//$NON-NLS-1$ - File path = new File(dirName); - if (path.exists()) - dialog.setFilterPath(dirName); - } - - String selectedDirectory = dialog.open(); - if (selectedDirectory != null) { - if (isSingleFolder()) { - locationPathField.setText(new Path(selectedDirectory).append(getSingleProject().getName()).toOSString()); - } else { - locationPathField.setText(new Path(selectedDirectory).toOSString()); - } - } - targetLocation = locationPathField.getText(); - } - - /** - * Return the custom location for a single project. In this case, the specified - * location is used as the location of the project. - * - * @param project - * @return - */ - public String getTargetLocation() { - if (isCustomLocationSpecified()) - return targetLocation; - else - return null; - } - - /** - * @return - */ - private boolean isCustomLocationSpecified() { - return !useDefaults; - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsMainPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsMainPage.java deleted file mode 100644 index 6d2305e92..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsMainPage.java +++ /dev/null @@ -1,229 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.wizards; - -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IWorkspace; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Text; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder; -import org.eclipse.team.internal.ccvs.ui.Policy; - -/** - * This is the main page of the Check Out As wizard. It allows the user to specify - * whether they want to check out the remote folder(s) as project(s) or into an - * existing project. For single project checkout, the page will also allow the user to - * choose whether to configure the new project (if it is missing a .project file). - */ -public class CheckoutAsMainPage extends CVSWizardPage { - - private String newProjectName; - private boolean allowProjectConfiguration; - private Button intoProjectButton; - private Button simpleProjectButton; - private Button configuredProjectButton; - private Text projectNameField; - private ICVSRemoteFolder[] folders; - - public static final String NAME = "CheckoutAsMainPage"; - - /** - * @param pageName - * @param title - * @param titleImage - * @param description - */ - public CheckoutAsMainPage(ImageDescriptor titleImage, ICVSRemoteFolder[] folders, boolean allowProjectConfiguration) { - super(NAME, Policy.bind("CheckoutAsMainPage.title"), titleImage, Policy.bind("CheckoutAsMainPage.description")); //$NON-NLS-1$ - this.folders = folders; - this.allowProjectConfiguration = allowProjectConfiguration; - } - - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) - */ - public void createControl(Composite parent) { - - Composite composite = createComposite(parent, 1); - setControl(composite); - - // WorkbenchHelp.setHelp(composite, IHelpContextIds.CHECKOUT_AS_MAIN_PAGE); - - if (isSingleFolder()) { - createSingleFolderArea(composite); - } else { - createMultipleFoldersArea(composite); - } - - updateEnablements(); - } - - /* - * Is the input to the wizard a single folder or multiple folders - */ - private boolean isSingleFolder() { - return folders.length == 1; - } - - /* - * For the single folder case, return the name of the folder - */ - private String getFolderName() { - return folders[0].getName(); - } - - /* - * Create the page contents for a single folder checkout - */ - private void createSingleFolderArea(Composite composite) { - createLabel(composite, Policy.bind("CheckoutAsMainPage.singleFolder", getFolderName())); //$NON-NLS-1$ - if (allowProjectConfiguration) { - configuredProjectButton = createRadioButton(composite, Policy.bind("CheckoutAsMainPage.asConfiguredProject"), 1); //$NON-NLS-1$ - } - createCheckoutAsProjectRadioArea(composite); - createCheckoutIntoRadioArea(composite); - if (allowProjectConfiguration) { - configuredProjectButton.setSelection(true); - } else { - simpleProjectButton.setSelection(true); - } - } - - /* - * Create the page contents for a multiple folder checkout - */ - private void createMultipleFoldersArea(Composite composite) { - createLabel(composite, Policy.bind("CheckoutAsMainPage.multipleFolders", new Integer(folders.length).toString())); //$NON-NLS-1$ - createCheckoutAsProjectRadioArea(composite); - createCheckoutIntoRadioArea(composite); - simpleProjectButton.setSelection(true); - } - - /** - * @param composite - */ - private void createCheckoutAsProjectRadioArea(Composite composite) { - if (isSingleFolder()) { - simpleProjectButton = createRadioButton(composite, Policy.bind("CheckoutAsMainPage.asSimpleProject"), 1); //$NON-NLS-1$ - createProjectNameGroup(composite); - } else { - simpleProjectButton = createRadioButton(composite, Policy.bind("CheckoutAsMainPage.asProjects"), 1); //$NON-NLS-1$ - } - } - - /** - * @param composite - */ - private void createCheckoutIntoRadioArea(Composite composite) { - intoProjectButton = createRadioButton(composite, Policy.bind("CheckoutAsMainPage.intoProject"), 1); //$NON-NLS-1$ - } - - /** - * Creates the project name specification controls. - * - * @param parent the parent composite - */ - private void createProjectNameGroup(Composite parent) { - // project specification group - Composite projectGroup = new Composite(parent,SWT.NONE); - GridLayout layout = new GridLayout(); - layout.numColumns = 2; - projectGroup.setLayout(layout); - projectGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - - // new project label - Label projectLabel = new Label(projectGroup,SWT.NONE); - projectLabel.setText(Policy.bind("CheckoutAsMainPage.projectNameLabel")); //$NON-NLS-1$ - - // new project name entry field - projectNameField = new Text(projectGroup, SWT.BORDER); - GridData data = new GridData(GridData.FILL_HORIZONTAL); - projectNameField.setLayoutData(data); - - // Set the initial value first before listener - // to avoid handling an event during the creation. - newProjectName = getFolderName(); - projectNameField.setText(newProjectName); - projectNameField.selectAll(); - - // Set the listener to capture modify events - projectNameField.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - updateEnablements(); - } - }); - } - - /** - * Check if the entries in the widget are valid. If they are return null otherwise - * return a string that indicates the problem. - */ - private void updateEnablements() { - - if (projectNameField != null) { - projectNameField.setEnabled(simpleProjectButton.getSelection()); - if (projectNameField.isEnabled()) { - newProjectName = this.projectNameField.getText(); - IWorkspace workspace = ResourcesPlugin.getWorkspace(); - IStatus nameStatus = workspace.validateName(newProjectName, IResource.PROJECT); - if (!nameStatus.isOK()) { - setErrorMessage(nameStatus.getMessage()); - setPageComplete(false); - } - } - } - setErrorMessage(null); - setPageComplete(true); - } - - public String getProjectName() { - if (isSingleFolder() && simpleProjectButton.getSelection()) return newProjectName; - return null; - } - - public boolean isPerformConfigure() { - if (configuredProjectButton == null) return false; - return configuredProjectButton.getSelection(); - } - - public boolean isPerformCheckoutInto() { - return intoProjectButton.getSelection(); - } - - public boolean isPerformCheckoutAs() { - return simpleProjectButton.getSelection(); - } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.wizards.CVSWizardPage#createRadioButton(org.eclipse.swt.widgets.Composite, java.lang.String, int) - */ - protected Button createRadioButton(Composite parent, String label, int span) { - Button radio = super.createRadioButton(parent, label, span); - radio.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - updateEnablements(); - } - }); - return radio; - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsProjectSelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsProjectSelectionPage.java deleted file mode 100644 index 7566de25e..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsProjectSelectionPage.java +++ /dev/null @@ -1,286 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.wizards; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.Path; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Combo; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Text; -import org.eclipse.team.core.RepositoryProvider; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; -import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo; -import org.eclipse.team.internal.ccvs.ui.AdaptableResourceList; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.Policy; - -/** - * This page allows the user to select the target parent container for - * the folders being checked out. - */ -public class CheckoutAsProjectSelectionPage extends CVSWizardPage { - - public static final String NAME = "CheckoutAsProjectSelectionPage"; - - private TreeViewer tree; - private Text nameField; - private Combo filterList; - private Button recurseCheck; - - private IResource[] resources; - private IResource selection; - private ICVSRemoteFolder[] remoteFolders; - private String folderName; - private boolean recurse; - private int filter; - - /** - * Constructor for CheckoutIntoProjectSelectionPage. - * @param pageName - * @param title - * @param titleImage - */ - public CheckoutAsProjectSelectionPage(ImageDescriptor titleImage, ICVSRemoteFolder[] remoteFolders) { - super(NAME, Policy.bind("CheckoutAsProjectSelectionPage.title"), titleImage, Policy.bind("CheckoutAsProjectSelectionPage.description")); - this.remoteFolders = remoteFolders; - } - - /** - * @return - */ - private boolean isSingleFolder() { - return remoteFolders.length == 1; - } - - /* - * For the single folder case, return the name of the folder - */ - private String getInputFolderName() { - return remoteFolders[0].getName(); - } - - private String getRepository() throws CVSException { - return remoteFolders[0].getFolderSyncInfo().getRoot(); - } - - /** - * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) - */ - public void createControl(Composite parent) { - Composite composite= createComposite(parent, 2); - setControl(composite); - - // WorkbenchHelp.setHelp(composite, IHelpContextIds.CHECKOUT_INTO_RESOURCE_SELECTION_PAGE); - - if (isSingleFolder()) { - createLabel(composite, Policy.bind("CheckoutAsProjectSelectionPage.name")); //$NON-NLS-1$ - nameField = createTextField(composite); - nameField.addListener(SWT.Modify, new Listener() { - public void handleEvent(Event event) { - folderName = nameField.getText(); - updateWidgetEnablements(); - } - }); - } - - createWrappingLabel(composite, Policy.bind("CheckoutAsProjectSelectionPage.treeLabel"), 0, 2); //$NON-NLS-1$ - - tree = createResourceSelectionTree(composite, IResource.PROJECT | IResource.FOLDER, 2 /* horizontal span */); - tree.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - handleResourceSelection(event); - } - }); - - Composite filterComposite = createComposite(composite, 2); - GridData data = new GridData(); - data.verticalAlignment = GridData.FILL; - data.horizontalAlignment = GridData.FILL; - data.horizontalSpan = 2; - filterComposite.setLayoutData(data); - createLabel(filterComposite, Policy.bind("CheckoutAsProjectSelectionPage.showLabel")); //$NON-NLS-1$ - filterList = createCombo(filterComposite); - filterList.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - handleFilterSelection(); - } - }); - - createWrappingLabel(composite, "", 0, 2); //$NON-NLS-1$ - - // Should subfolders of the folder be checked out? - recurseCheck = createCheckBox(composite, Policy.bind("CheckoutAsProjectSelectionPage.recurse")); //$NON-NLS-1$ - recurseCheck.addListener(SWT.Selection, new Listener() { - public void handleEvent(Event event) { - recurse = recurseCheck.getSelection(); - updateWidgetEnablements(); - } - }); - - initializeValues(); - updateWidgetEnablements(); - tree.getControl().setFocus(); - } - - /** - * Method initializeValues. - */ - private void initializeValues() { - if (isSingleFolder()) { - nameField.setText(getInputFolderName()); - } - tree.setInput(ResourcesPlugin.getWorkspace().getRoot()); - recurse = true; - recurseCheck.setSelection(recurse); - filter = 0; - updateTreeContents(filter); - filterList.add(Policy.bind("CheckoutAsProjectSelectionPage.showAll")); //$NON-NLS-1$ - filterList.add(Policy.bind("CheckoutAsProjectSelectionPage.showUnshared")); //$NON-NLS-1$ - filterList.add(Policy.bind("CheckoutAsProjectSelectionPage.showSameRepo")); //$NON-NLS-1$ - filterList.select(filter); - } - - private void handleResourceSelection(SelectionChangedEvent event) { - ISelection sel = event.getSelection(); - if (sel.isEmpty()) { - this.selection = null; - } else if (sel instanceof IStructuredSelection) { - this.selection = (IResource)((IStructuredSelection)sel).getFirstElement(); - } - updateWidgetEnablements(); - } - - /** - * Method updateWidgetEnablement. - */ - private void updateWidgetEnablements() { - if (isSingleFolder() && !Path.EMPTY.isValidSegment(folderName)) { - setPageComplete(false); - setErrorMessage(Policy.bind("CheckoutAsProjectSelectionPage.invalidFolderName", folderName)); //$NON-NLS-1$ - return; - } - boolean complete = selection != null && selection.getType() != IResource.FILE; - setErrorMessage(null); - setPageComplete(complete); - } - - /** - * Returns the selection. - * @return IResource - */ - public IResource getSelection() { - return selection; - } - - /** - * Returns the folderName. - * @return String - */ - public String getFolderName() { - return folderName; - } - - private void updateTreeContents(int selected) { - try { - if (selected == 0) { - tree.setInput(new AdaptableResourceList(getProjects(getRepository(), true))); - } else if (selected == 1) { - tree.setInput(new AdaptableResourceList(getProjects(null, true))); - } else if (selected == 2) { - tree.setInput(new AdaptableResourceList(getProjects(getRepository(), false))); - } - } catch (CVSException e) { - CVSUIPlugin.log(e); - } - } - - /** - * Method getValidTargetProjects returns the et of projects that match the provided criteria. - * @return IResource - */ - private IProject[] getProjects(String root, boolean unshared) throws CVSException { - List validTargets = new ArrayList(); - try { - IResource[] projects = ResourcesPlugin.getWorkspace().getRoot().members(); - for (int i = 0; i < projects.length; i++) { - IResource resource = projects[i]; - if (resource instanceof IProject) { - IProject project = (IProject) resource; - if (project.isAccessible()) { - RepositoryProvider provider = RepositoryProvider.getProvider(project); - if (provider == null && unshared) { - validTargets.add(project); - } else if (provider != null && provider.getID().equals(CVSProviderPlugin.getTypeId())) { - ICVSFolder cvsFolder = CVSWorkspaceRoot.getCVSFolderFor(project); - FolderSyncInfo info = cvsFolder.getFolderSyncInfo(); - if (root != null && root.equals(info.getRoot())) { - validTargets.add(project); - } - } - } - } - } - } catch (CoreException e) { - throw CVSException.wrapException(e); - } - return (IProject[]) validTargets.toArray(new IProject[validTargets.size()]); - } - - public IContainer getLocalFolder() { - if (Path.EMPTY.isValidSegment(folderName)) { - return ((IContainer)getSelection()).getFolder(new Path(folderName)); - } else { - return null; - } - } - - public IContainer getParentFolder() { - return ((IContainer)getSelection()); - } - - /** - * Returns the recurse. - * @return boolean - */ - public boolean isRecurse() { - return recurse; - } - - private void handleFilterSelection() { - filter = filterList.getSelectionIndex(); - updateTreeContents(filter); - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsWizard.java deleted file mode 100644 index d09eea3ab..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsWizard.java +++ /dev/null @@ -1,232 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.wizards; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IResourceChangeEvent; -import org.eclipse.core.resources.IResourceChangeListener; -import org.eclipse.core.resources.IResourceDelta; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.wizard.IWizardPage; -import org.eclipse.jface.wizard.Wizard; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ccvs.ui.operations.CheckoutIntoOperation; -import org.eclipse.team.internal.ccvs.ui.operations.CheckoutMultipleProjectsOperation; -import org.eclipse.team.internal.ccvs.ui.operations.CheckoutSingleProjectOperation; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.actions.NewProjectAction; - -/** - * @author Administrator - * - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ -public class CheckoutAsWizard extends Wizard { - - private ICVSRemoteFolder[] remoteFolders; - private boolean allowProjectConfiguration; - - private CheckoutAsMainPage mainPage; - private CheckoutAsProjectSelectionPage projectSelectionPage; - private CheckoutAsLocationSelectionPage locationSelectionPage; - - class NewProjectListener implements IResourceChangeListener { - private IProject newProject = null; - /** - * @see IResourceChangeListener#resourceChanged(IResourceChangeEvent) - */ - public void resourceChanged(IResourceChangeEvent event) { - IResourceDelta root = event.getDelta(); - IResourceDelta[] projectDeltas = root.getAffectedChildren(); - for (int i = 0; i < projectDeltas.length; i++) { - IResourceDelta delta = projectDeltas[i]; - IResource resource = delta.getResource(); - if (delta.getKind() == IResourceDelta.ADDED) { - newProject = (IProject)resource; - } - } - } - /** - * Gets the newProject. - * @return Returns a IProject - */ - public IProject getNewProject() { - return newProject; - } - } - - public CheckoutAsWizard(ICVSRemoteFolder[] remoteFolders, boolean allowProjectConfiguration) { - super(); - this.remoteFolders = remoteFolders; - setWindowTitle(Policy.bind("CheckoutAsWizard.title")); //$NON-NLS-1$ - this.allowProjectConfiguration = allowProjectConfiguration; - } - - /** - * @see org.eclipse.jface.wizard.IWizard#addPages() - */ - public void addPages() { - setNeedsProgressMonitor(true); - ImageDescriptor substImage = CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_CHECKOUT); - - mainPage = new CheckoutAsMainPage(substImage, remoteFolders, allowProjectConfiguration); - addPage(mainPage); - - projectSelectionPage = new CheckoutAsProjectSelectionPage(substImage, remoteFolders); - addPage(projectSelectionPage); - - locationSelectionPage = new CheckoutAsLocationSelectionPage(substImage, remoteFolders); - addPage(locationSelectionPage); - } - - /* (non-Javadoc) - * @see org.eclipse.jface.wizard.IWizard#performFinish() - */ - public boolean performFinish() { - try { - if (mainPage.isPerformConfigure()) { - return performConfigureAndCheckout(); - } else if (mainPage.isPerformCheckoutAs()) { - if (isSingleFolder()) { - return performSingleCheckoutAs(); - } else { - return performMultipleCheckoutAs(); - } - } else if (mainPage.isPerformCheckoutInto()) { - return performCheckoutInto(); - } - } catch (CVSException e) { - handle(e); - // drop through - } catch (InterruptedException e) { - // drop through - } - return false; - } - - /** - * @return - */ - private boolean isSingleFolder() { - return remoteFolders.length == 1; - } - - /* (non-Javadoc) - * @see org.eclipse.jface.wizard.IWizard#canFinish() - */ - public boolean canFinish() { - return (mainPage.isPageComplete() - && (mainPage.isPerformConfigure() - || (mainPage.isPerformCheckoutInto() && projectSelectionPage.isPageComplete()) - || (mainPage.isPerformCheckoutAs() && locationSelectionPage.isPageComplete()))); - } - - /* (non-Javadoc) - * @see org.eclipse.jface.wizard.IWizard#getNextPage(org.eclipse.jface.wizard.IWizardPage) - */ - public IWizardPage getNextPage(IWizardPage page) { - if (page == mainPage) { - if (mainPage.isPerformConfigure()) return null; - if (mainPage.isPerformCheckoutInto()) return projectSelectionPage; - if (mainPage.isPerformCheckoutAs()) { - if (isSingleFolder()) { - locationSelectionPage.setProjectName(mainPage.getProjectName()); - } else { - locationSelectionPage.setProject(null); - } - return locationSelectionPage; - } - } - return null; - } - - /* (non-Javadoc) - * @see org.eclipse.jface.wizard.IWizard#getPreviousPage(org.eclipse.jface.wizard.IWizardPage) - */ - public IWizardPage getPreviousPage(IWizardPage page) { - if (page == mainPage) return null; - return mainPage; - } - - private void handle(Throwable e) { - CVSUIPlugin.openError(getShell(), Policy.bind("CheckoutAsWizard.error"), null, e); //$NON-NLS-1$ - } - - /* - * Configure a local project and checkout the selected remote folder into the project. - * This only occurs for single folders. - */ - private boolean performConfigureAndCheckout() throws CVSException, InterruptedException { - IProject newProject = getNewProject(); - if (newProject == null) return false; - new CheckoutSingleProjectOperation(getShell(), remoteFolders[0], newProject, null, true) - .runInContext(getContainer()); - return true; - } - - /** - * - */ - private boolean performSingleCheckoutAs() throws CVSException, InterruptedException { - IProject newProject = ResourcesPlugin.getWorkspace().getRoot().getProject(mainPage.getProjectName()); - String targetLocation = locationSelectionPage.getTargetLocation(); - new CheckoutSingleProjectOperation(getShell(), remoteFolders[0], newProject, targetLocation, false) - .runInContext(getContainer()); - return true; - } - - /** - * Check out multiple folders to the workspace using a custom location if one is - * specified. - */ - private boolean performMultipleCheckoutAs() throws CVSException, InterruptedException { - String targetLocation = locationSelectionPage.getTargetLocation(); - new CheckoutMultipleProjectsOperation(getShell(), remoteFolders, targetLocation) - .runInContext(getContainer()); - return true; - } - - /** - * @return - */ - private boolean performCheckoutInto() throws CVSException, InterruptedException { - CheckoutIntoOperation operation; - boolean recursive = projectSelectionPage.isRecurse(); - if (isSingleFolder()) { - operation = new CheckoutIntoOperation(getShell(), remoteFolders[0] , projectSelectionPage.getLocalFolder(), recursive); - } else { - operation = new CheckoutIntoOperation(getShell(), remoteFolders, projectSelectionPage.getParentFolder(), recursive); - } - operation.runInContext(getContainer()); - return true; - } - - /** - * Get a new project that is configured by the new project wizard. - * This is currently the only way to do this. - */ - private IProject getNewProject() { - NewProjectListener listener = new NewProjectListener(); - ResourcesPlugin.getWorkspace().addResourceChangeListener(listener, IResourceChangeEvent.POST_CHANGE); - (new NewProjectAction(PlatformUI.getWorkbench().getActiveWorkbenchWindow())).run(); - ResourcesPlugin.getWorkspace().removeResourceChangeListener(listener); - IProject project = listener.getNewProject(); - return project; - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardAutoconnectPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardAutoconnectPage.java deleted file mode 100644 index 3170b7265..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardAutoconnectPage.java +++ /dev/null @@ -1,148 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.wizards; - - -import org.eclipse.core.resources.IProject; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.core.connection.CVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.ui.help.WorkbenchHelp; - -/** - * This configuration page explains to the user that CVS/ directories already exists and - * it will attach the selected project to the repository that is specified in the CVS/ files. - * - * This is useful for people who have checked out a project using command-line tools. - */ -public class ConfigurationWizardAutoconnectPage extends CVSWizardPage { - private boolean validate = true; - private FolderSyncInfo info; - ICVSRepositoryLocation location; - - public ConfigurationWizardAutoconnectPage(String pageName, String title, ImageDescriptor titleImage) { - super(pageName, title, titleImage); - } - - /* - * @see IDialogPage#createControl(Composite) - */ - public void createControl(Composite parent) { - Composite composite = createComposite(parent, 2); - setControl(composite); - - // set F1 help - WorkbenchHelp.setHelp(composite, IHelpContextIds.SHARING_AUTOCONNECT_PAGE); - - Label description = new Label(composite, SWT.WRAP); - GridData data = new GridData(); - data.horizontalSpan = 2; - data.widthHint = 350; - description.setLayoutData(data); - description.setText(Policy.bind("ConfigurationWizardAutoconnectPage.description")); //$NON-NLS-1$ - - if (location == null) return; - - // Spacer - createLabel(composite, ""); //$NON-NLS-1$ - createLabel(composite, ""); //$NON-NLS-1$ - - createLabel(composite, Policy.bind("ConfigurationWizardAutoconnectPage.user")); //$NON-NLS-1$ - createLabel(composite, location.getUsername()); - createLabel(composite, Policy.bind("ConfigurationWizardAutoconnectPage.host")); //$NON-NLS-1$ - createLabel(composite, location.getHost()); - createLabel(composite, Policy.bind("ConfigurationWizardAutoconnectPage.port")); //$NON-NLS-1$ - int port = location.getPort(); - if (port == ICVSRepositoryLocation.USE_DEFAULT_PORT) { - createLabel(composite, Policy.bind("ConfigurationWizardAutoconnectPage.default")); //$NON-NLS-1$ - } else { - createLabel(composite, "" + port); //$NON-NLS-1$ - } - createLabel(composite, Policy.bind("ConfigurationWizardAutoconnectPage.connectionType")); //$NON-NLS-1$ - createLabel(composite, location.getMethod().getName()); - createLabel(composite, Policy.bind("ConfigurationWizardAutoconnectPage.repositoryPath")); //$NON-NLS-1$ - createLabel(composite, location.getRootDirectory()); - createLabel(composite, Policy.bind("ConfigurationWizardAutoconnectPage.module")); //$NON-NLS-1$ - createLabel(composite, info.getRepository()); - - // Spacer - createLabel(composite, ""); //$NON-NLS-1$ - createLabel(composite, ""); //$NON-NLS-1$ - - final Button check = new Button(composite, SWT.CHECK); - data = new GridData(); - data.horizontalSpan = 2; - check.setText(Policy.bind("ConfigurationWizardAutoconnectPage.validate")); //$NON-NLS-1$ - check.addListener(SWT.Selection, new Listener() { - public void handleEvent(Event event) { - validate = check.getSelection(); - } - }); - check.setSelection(true); - } - - public FolderSyncInfo getFolderSyncInfo() { - return info; - } - public boolean getValidate() { - return validate; - } - public void setProject(IProject project) { - try { - ICVSFolder folder = (ICVSFolder)CVSWorkspaceRoot.getCVSResourceFor(project); - info = folder.getFolderSyncInfo(); - if (info == null) { - // This should never happen - CVSUIPlugin.openError(null, Policy.bind("ConfigurationWizardAutoconnectPage.noSyncInfo"), Policy.bind("ConfigurationWizardAutoconnectPage.noCVSDirectory"), null); //$NON-NLS-1$ //$NON-NLS-2$ - return; - } - location = CVSRepositoryLocation.fromString(info.getRoot()); - } catch (TeamException e) { - CVSUIPlugin.openError(null, null, null, e); - } - } - - public void setSharing(FolderSyncInfo info) { - this.info = info; - try { - this. location = CVSRepositoryLocation.fromString(info.getRoot()); - } catch (CVSException e) { - CVSUIPlugin.openError(null, null, null, e); - } - } - - public FolderSyncInfo getSharing() { - return info; - } - /** - * Gets the location. - * @return Returns a ICVSRepositoryLocation - */ - public ICVSRepositoryLocation getLocation() { - return location; - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardMainPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardMainPage.java deleted file mode 100644 index 289364c37..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardMainPage.java +++ /dev/null @@ -1,491 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.wizards; - - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Properties; - -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.Path; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.dialogs.IDialogSettings; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.FillLayout; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Combo; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Group; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Text; -import org.eclipse.team.internal.ccvs.core.IConnectionMethod; -import org.eclipse.team.internal.ccvs.core.connection.CVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.ui.help.WorkbenchHelp; - -/** - * Wizard page for entering information about a CVS repository location. - */ -public class ConfigurationWizardMainPage extends CVSWizardPage { - private boolean showValidate; - private boolean validate; - - // Widgets - - // Connection Method - private Combo connectionMethodCombo; - // User - private Combo userCombo; - // Password - private Text passwordText; - // Port - private Text portText; - private Button useDefaultPort; - private Button useCustomPort; - // Host - private Combo hostCombo; - // Repository Path - private Combo repositoryPathCombo; - // Validation - private Button validateButton; - - private static final int COMBO_HISTORY_LENGTH = 5; - - private Properties properties = null; - - // Dialog store id constants - private static final String STORE_USERNAME_ID = - "ConfigurationWizardMainPage.STORE_USERNAME_ID";//$NON-NLS-1$ - private static final String STORE_HOSTNAME_ID = - "ConfigurationWizardMainPage.STORE_HOSTNAME_ID";//$NON-NLS-1$ - private static final String STORE_PATH_ID = - "ConfigurationWizardMainPage.STORE_PATH_ID";//$NON-NLS-1$ - private static final String STORE_DONT_VALIDATE_ID = - "ConfigurationWizardMainPage.STORE_DONT_VALIDATE_ID";//$NON-NLS-1$ - - // In case the page was launched from a different wizard - private IDialogSettings settings; - - /** - * ConfigurationWizardMainPage constructor. - * - * @param pageName the name of the page - * @param title the title of the page - * @param titleImage the image for the page - */ - public ConfigurationWizardMainPage(String pageName, String title, ImageDescriptor titleImage) { - super(pageName, title, titleImage); - } - /** - * Adds an entry to a history, while taking care of duplicate history items - * and excessively long histories. The assumption is made that all histories - * should be of length <code>ConfigurationWizardMainPage.COMBO_HISTORY_LENGTH</code>. - * - * @param history the current history - * @param newEntry the entry to add to the history - * @return the history with the new entry appended - */ - private String[] addToHistory(String[] history, String newEntry) { - ArrayList l = new ArrayList(Arrays.asList(history)); - addToHistory(l, newEntry); - String[] r = new String[l.size()]; - l.toArray(r); - return r; - } - protected IDialogSettings getDialogSettings() { - return settings; - } - protected void setDialogSettings(IDialogSettings settings) { - this.settings = settings; - } - /** - * Adds an entry to a history, while taking care of duplicate history items - * and excessively long histories. The assumption is made that all histories - * should be of length <code>ConfigurationWizardMainPage.COMBO_HISTORY_LENGTH</code>. - * - * @param history the current history - * @param newEntry the entry to add to the history - */ - private void addToHistory(List history, String newEntry) { - history.remove(newEntry); - history.add(0,newEntry); - - // since only one new item was added, we can be over the limit - // by at most one item - if (history.size() > COMBO_HISTORY_LENGTH) - history.remove(COMBO_HISTORY_LENGTH); - } - /** - * Creates the UI part of the page. - * - * @param parent the parent of the created widgets - */ - public void createControl(Composite parent) { - Composite composite = createComposite(parent, 2); - // set F1 help - WorkbenchHelp.setHelp(composite, IHelpContextIds.SHARING_NEW_REPOSITORY_PAGE); - - Listener listener = new Listener() { - public void handleEvent(Event event) { - updateWidgetEnablements(); - } - }; - - Group g = createGroup(composite, Policy.bind("ConfigurationWizardMainPage.Location_1")); //$NON-NLS-1$ - - // Host name - createLabel(g, Policy.bind("ConfigurationWizardMainPage.host")); //$NON-NLS-1$ - hostCombo = createEditableCombo(g); - hostCombo.addListener(SWT.Selection, listener); - hostCombo.addListener(SWT.Modify, listener); - - // Repository Path - createLabel(g, Policy.bind("ConfigurationWizardMainPage.repositoryPath")); //$NON-NLS-1$ - repositoryPathCombo = createEditableCombo(g); - repositoryPathCombo.addListener(SWT.Selection, listener); - repositoryPathCombo.addListener(SWT.Modify, listener); - - g = createGroup(composite, Policy.bind("ConfigurationWizardMainPage.Authentication_2")); //$NON-NLS-1$ - - // User name - createLabel(g, Policy.bind("ConfigurationWizardMainPage.userName")); //$NON-NLS-1$ - userCombo = createEditableCombo(g); - userCombo.addListener(SWT.Selection, listener); - userCombo.addListener(SWT.Modify, listener); - - // Password - createLabel(g, Policy.bind("ConfigurationWizardMainPage.password")); //$NON-NLS-1$ - passwordText = createPasswordField(g); - - g = createGroup(composite, Policy.bind("ConfigurationWizardMainPage.Connection_3")); //$NON-NLS-1$ - - // Connection type - createLabel(g, Policy.bind("ConfigurationWizardMainPage.connection")); //$NON-NLS-1$ - connectionMethodCombo = createCombo(g); - - // Port number - // create a composite to ensure the radio buttons come in the correct order - Composite portGroup = new Composite(g, SWT.NONE); - GridData data = new GridData(); - data.horizontalSpan = 2; - portGroup.setLayoutData(data); - GridLayout layout = new GridLayout(); - layout.numColumns = 2; - layout.marginHeight = 0; - layout.marginWidth = 0; - portGroup.setLayout(layout); - useDefaultPort = createRadioButton(portGroup, Policy.bind("ConfigurationWizardMainPage.useDefaultPort"), 2); //$NON-NLS-1$ - useCustomPort = createRadioButton(portGroup, Policy.bind("ConfigurationWizardMainPage.usePort"), 1); //$NON-NLS-1$ - useCustomPort.addListener(SWT.Selection, listener); - portText = createTextField(portGroup); - portText.addListener(SWT.Modify, listener); - - // create a composite to ensure the validate button is in its own tab group - if (showValidate) { - Composite validateButtonTabGroup = new Composite(composite, SWT.NONE); - data = new GridData(); - data.horizontalSpan = 2; - validateButtonTabGroup.setLayoutData(data); - validateButtonTabGroup.setLayout(new FillLayout()); - - validateButton = new Button(validateButtonTabGroup, SWT.CHECK); - validateButton.setText(Policy.bind("ConfigurationWizardAutoconnectPage.validate")); //$NON-NLS-1$ - validateButton.addListener(SWT.Selection, new Listener() { - public void handleEvent(Event e) { - validate = validateButton.getSelection(); - } - }); - } - - initializeValues(); - updateWidgetEnablements(); - hostCombo.setFocus(); - - setControl(composite); - } - /** - * Utility method to create an editable combo box - * - * @param parent the parent of the combo box - * @return the created combo - */ - protected Combo createEditableCombo(Composite parent) { - Combo combo = new Combo(parent, SWT.NULL); - GridData data = new GridData(GridData.FILL_HORIZONTAL); - data.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH; - combo.setLayoutData(data); - return combo; - } - - protected Group createGroup(Composite parent, String text) { - Group group = new Group(parent, SWT.NULL); - group.setText(text); - GridData data = new GridData(GridData.FILL_HORIZONTAL); - data.horizontalSpan = 2; - //data.widthHint = GROUP_WIDTH; - - group.setLayoutData(data); - GridLayout layout = new GridLayout(); - layout.numColumns = 2; - group.setLayout(layout); - return group; - } - - /** - * @see CVSWizardPage#finish - */ - public boolean finish(IProgressMonitor monitor) { - // Set the result to be the current values - Properties result = new Properties(); - result.setProperty("connection", connectionMethodCombo.getText()); //$NON-NLS-1$ - result.setProperty("user", userCombo.getText()); //$NON-NLS-1$ - result.setProperty("password", passwordText.getText()); //$NON-NLS-1$ - result.setProperty("host", hostCombo.getText()); //$NON-NLS-1$ - if (useCustomPort.getSelection()) { - result.setProperty("port", portText.getText()); //$NON-NLS-1$ - } - result.setProperty("root", repositoryPathCombo.getText()); //$NON-NLS-1$ - this.properties = result; - - saveWidgetValues(); - - return true; - } - /** - * Returns the properties for the repository connection - * - * @return the properties or null - */ - public Properties getProperties() { - return properties; - } - /** - * Initializes states of the controls. - */ - private void initializeValues() { - // Set remembered values - IDialogSettings settings = getDialogSettings(); - if (settings != null) { - String[] hostNames = settings.getArray(STORE_HOSTNAME_ID); - if (hostNames != null) { - for (int i = 0; i < hostNames.length; i++) { - hostCombo.add(hostNames[i]); - } - } - String[] paths = settings.getArray(STORE_PATH_ID); - if (paths != null) { - for (int i = 0; i < paths.length; i++) { - repositoryPathCombo.add(paths[i]); - } - } - String[] userNames = settings.getArray(STORE_USERNAME_ID); - if (userNames != null) { - for (int i = 0; i < userNames.length; i++) { - userCombo.add(userNames[i]); - } - } - if (showValidate) { - validate = !settings.getBoolean(STORE_DONT_VALIDATE_ID); - validateButton.setSelection(validate); - } - } - - // Initialize other values and widget states - IConnectionMethod[] methods = CVSRepositoryLocation.getPluggedInConnectionMethods(); - for (int i = 0; i < methods.length; i++) { - connectionMethodCombo.add(methods[i].getName()); - } - - connectionMethodCombo.select(0); - useDefaultPort.setSelection(true); - - if(properties != null) { - String method = (String)properties.getProperty("connection"); //$NON-NLS-1$ - if (method == null) { - connectionMethodCombo.select(0); - } else { - connectionMethodCombo.select(connectionMethodCombo.indexOf(method)); - } - - String user = (String)properties.getProperty("user"); //$NON-NLS-1$ - if (user != null) { - userCombo.setText(user); - } - - String password = (String)properties.getProperty("password"); //$NON-NLS-1$ - if (password != null) { - passwordText.setText(password); - } - - String host = (String)properties.getProperty("host"); //$NON-NLS-1$ - if (host != null) { - hostCombo.setText(host); - } - - String port = (String)properties.getProperty("port"); //$NON-NLS-1$ - if (port != null) { - useCustomPort.setSelection(true); - portText.setText(port); - } - - String repositoryPath = (String)properties.getProperty("root"); //$NON-NLS-1$ - if (repositoryPath != null) { - repositoryPathCombo.setText(repositoryPath); - } - } - } - /** - * Saves the widget values - */ - private void saveWidgetValues() { - // Update history - IDialogSettings settings = getDialogSettings(); - if (settings != null) { - String[] userNames = settings.getArray(STORE_USERNAME_ID); - if (userNames == null) userNames = new String[0]; - userNames = addToHistory(userNames, userCombo.getText()); - settings.put(STORE_USERNAME_ID, userNames); - - String[] hostNames = settings.getArray(STORE_HOSTNAME_ID); - if (hostNames == null) hostNames = new String[0]; - hostNames = addToHistory(hostNames, hostCombo.getText()); - settings.put(STORE_HOSTNAME_ID, hostNames); - - String[] paths = settings.getArray(STORE_PATH_ID); - if (paths == null) paths = new String[0]; - paths = addToHistory(paths, repositoryPathCombo.getText()); - settings.put(STORE_PATH_ID, paths); - - if (showValidate) { - settings.put(STORE_DONT_VALIDATE_ID, !validate); - } - } - } - - public void setShowValidate(boolean showValidate) { - this.showValidate = showValidate; - } - - /** - * Sets the properties for the repository connection - * - * @param properties the properties or null - */ - public void setProperties(Properties properties) { - this.properties = properties; - } - - /** - * Updates widget enablements and sets error message if appropriate. - */ - protected void updateWidgetEnablements() { - if (useDefaultPort.getSelection()) { - portText.setEnabled(false); - } else { - portText.setEnabled(true); - } - - validateFields(); - } - /** - * Validates the contents of the editable fields and set page completion - * and error messages appropriately. - */ - private void validateFields() { - String user = userCombo.getText(); - if (user.length() == 0) { - setErrorMessage(null); - setPageComplete(false); - return; - } - if ((user.indexOf('@') != -1) || (user.indexOf(':') != -1)) { - setErrorMessage(Policy.bind("ConfigurationWizardMainPage.invalidUserName")); //$NON-NLS-1$ - setPageComplete(false); - return; - } - - String host = hostCombo.getText(); - if (host.length() == 0) { - setErrorMessage(null); - setPageComplete(false); - return; - } - if (host.indexOf(':') != -1) { - setErrorMessage(Policy.bind("ConfigurationWizardMainPage.invalidHostName")); //$NON-NLS-1$ - setPageComplete(false); - return; - } - - if (portText.isEnabled()) { - if (portText.getText().length() == 0) { - setErrorMessage(null); - setPageComplete(false); - return; - } - try { - Integer.parseInt(portText.getText()); - } catch (NumberFormatException e) { - setErrorMessage(Policy.bind("ConfigurationWizardMainPage.invalidPort")); //$NON-NLS-1$ - setPageComplete(false); - return; - } - } - - if (repositoryPathCombo.getText().length() == 0) { - setErrorMessage(null); - setPageComplete(false); - return; - } else { - String pathString = repositoryPathCombo.getText(); - IPath path = new Path(pathString); - String[] segments = path.segments(); - for (int i = 0; i < segments.length; i++) { - String string = segments[i]; - if (string.charAt(0) == ' ' || string.charAt(string.length() -1) == ' ') { - setErrorMessage(Policy.bind("ConfigurationWizardMainPage.invalidPathWithSpaces")); //$NON-NLS-1$ - setPageComplete(false); - return; - } - } - // look for // and inform the user that we support use of C:\cvs\root instead of /c//cvs/root - if (pathString.indexOf("//") != -1) { //$NON-NLS-1$ - if (pathString.indexOf("//") == 2) { //$NON-NLS-1$ - // The user is probably trying to specify a CVSNT path - setErrorMessage(Policy.bind("ConfigurationWizardMainPage.useNTFormat")); //$NON-NLS-1$ - } else { - setErrorMessage(Policy.bind("ConfigurationWizardMainPage.invalidPathWithSlashes")); //$NON-NLS-1$ - } - setPageComplete(false); - return; - } - } - setErrorMessage(null); - setPageComplete(true); - } - - public boolean getValidate() { - return validate; - } - public void setVisible(boolean visible) { - super.setVisible(visible); - if (visible) { - hostCombo.setFocus(); - } - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileOperation.java deleted file mode 100644 index 3ee427545..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileOperation.java +++ /dev/null @@ -1,126 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.wizards; - - -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.io.PrintStream; -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.SubProgressMonitor; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.swt.dnd.Clipboard; -import org.eclipse.swt.dnd.TextTransfer; -import org.eclipse.swt.dnd.Transfer; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.core.RepositoryProvider; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; -import org.eclipse.team.internal.ccvs.core.CVSTeamProvider; -import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.Policy; - -/** - * An operation to run the CVS diff operation on a set of resources. The result - * of the diff is written to a file. If there are no differences found, the - * user is notified and the output file is not created. - */ -public class GenerateDiffFileOperation implements IRunnableWithProgress { - - private File outputFile; - private IResource resource; - private Shell shell; - private LocalOption[] options; - private boolean toClipboard; - - GenerateDiffFileOperation(IResource resource, File file, boolean toClipboard, LocalOption[] options, Shell shell) { - this.resource = resource; - this.outputFile = file; - this.shell = shell; - this.options = options; - this.toClipboard = toClipboard; - } - - /** - * @see IRunnableWithProgress#run(IProgressMonitor) - */ - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - try { - monitor.beginTask("", 500); //$NON-NLS-1$ - monitor.setTaskName( - Policy.bind("GenerateCVSDiff.working")); //$NON-NLS-1$ - - OutputStream os; - if(toClipboard) { - os = new ByteArrayOutputStream(); - } else { - os = new FileOutputStream(outputFile); - } - try { - CVSTeamProvider provider = (CVSTeamProvider)RepositoryProvider.getProvider(resource.getProject(), CVSProviderPlugin.getTypeId()); - provider.diff(resource, options, new PrintStream(os), new SubProgressMonitor(monitor, 500)); - } finally { - os.close(); - } - - boolean emptyDiff = false; - - if(toClipboard) { - final ByteArrayOutputStream baos = (ByteArrayOutputStream)os; - if(baos.size() == 0) { - emptyDiff = true; - } else { - shell.getDisplay().syncExec(new Runnable() { - public void run() { - TextTransfer plainTextTransfer = TextTransfer.getInstance(); - Clipboard clipboard = new Clipboard(shell.getDisplay()); - clipboard.setContents( - new String[]{baos.toString()}, - new Transfer[]{plainTextTransfer}); - clipboard.dispose(); - } - }); - } - } else { - if(outputFile.length() == 0) { - emptyDiff = true; - outputFile.delete(); - } - } - - //check for empty diff and report - if (emptyDiff) { - CVSUIPlugin.openDialog(shell, new CVSUIPlugin.IOpenableInShell() { - public void open(Shell shell) { - MessageDialog.openInformation( - shell, - Policy.bind("GenerateCVSDiff.noDiffsFoundTitle"), //$NON-NLS-1$ - Policy.bind("GenerateCVSDiff.noDiffsFoundMsg")); //$NON-NLS-1$ - } - }, CVSUIPlugin.PERFORM_SYNC_EXEC); - } - } catch (TeamException e) { - throw new InvocationTargetException(e); - } catch(IOException e) { - throw new InvocationTargetException(e); - } finally { - monitor.done(); - } - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java deleted file mode 100644 index 6614fac76..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java +++ /dev/null @@ -1,567 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.wizards; - - -import java.io.File; -import java.lang.reflect.InvocationTargetException; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.Path; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.viewers.DoubleClickEvent; -import org.eclipse.jface.viewers.IDoubleClickListener; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.jface.wizard.Wizard; -import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.FileDialog; -import org.eclipse.swt.widgets.Group; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Text; -import org.eclipse.team.internal.ccvs.core.client.Diff; -import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.help.WorkbenchHelp; -import org.eclipse.ui.internal.misc.ContainerContentProvider; -import org.eclipse.ui.internal.misc.ResourceAndContainerGroup; -import org.eclipse.ui.model.WorkbenchLabelProvider; - -/** - * A wizard for creating a patch file by running the CVS diff command. - */ -public class GenerateDiffFileWizard extends Wizard { - - private PatchFileSelectionPage mainPage; - private PatchFileCreationOptionsPage optionsPage; - - private IStructuredSelection selection; - private IResource resource; - - /** - * Page to select a patch file. Overriding validatePage was necessary to allow - * entering a file name that already exists. - */ - private class PatchFileSelectionPage extends WizardPage { - - private IStructuredSelection currentSelection; - private ResourceAndContainerGroup resourceGroup; - private Text filenameCombo; - private Button browseButton; - - private TreeViewer treeViewer; - private IContainer selectedContainer; - private Text workspaceFilename; - private Button saveInFilesystem; - private Button saveInWorkspace; - private Button saveToClipboard; - - public final int CLIPBOARD = 1; - public final int FILESYSTEM = 2; - public final int WORKSPACE = 3; - - // sizing constants - private static final int SIZING_SELECTION_PANE_HEIGHT = 125; - private static final int SIZING_SELECTION_PANE_WIDTH = 200; - - PatchFileSelectionPage(String pageName, String title, ImageDescriptor image, IStructuredSelection selection) { - super(pageName, title, image); - this.currentSelection = selection; - setPageComplete(false); - } - - /** - * Allow the user to finish if a valid file has been entered. - */ - protected boolean validatePage() { - boolean valid = false; - - switch (getSaveType()) { - case WORKSPACE: - if (selectedContainer != null && getWorkspaceFile() != null) { - valid = true; - } - break; - case FILESYSTEM: - File file = new File(getFilesystemFile()); - valid = isValidFile(file); - break; - case CLIPBOARD: - valid = true; - break; - } - - // Avoid draw flicker by clearing error message - // if all is valid. - if (valid) { - setMessage(null); - setErrorMessage(null); - } else { - setErrorMessage(Policy.bind("Enter_a_valid_file_name_or_select_the_clipboard_option_1")); //$NON-NLS-1$ - } - setPageComplete(valid); - return valid; - } - - private boolean isValidFile(File file) { - if (!file.isAbsolute()) return false; - if (file.isDirectory()) return false; - File parent = file.getParentFile(); - if (parent==null) return false; - if (!parent.exists()) return false; - if (!parent.isDirectory()) return false; - return true; - } - /** - * Answers a full path to a file system file or <code>null</code> if the user - * selected to save the patch in the workspace. - */ - public String getFilesystemFile() { - if(saveInFilesystem.getSelection()) { - return filenameCombo.getText(); - } - return null; - } - - /** - * Answers a workspace file or <code>null</code> if the user selected to save - * the patch outside of the workspace. - */ - public IFile getWorkspaceFile() { - if(saveInWorkspace.getSelection() && selectedContainer !=null) { - String filename = workspaceFilename.getText(); - if(filename==null || filename.length() == 0) { - return null; - } - return selectedContainer.getFile(new Path(workspaceFilename.getText())); - } - return null; - } - - /** - * Allow the user to chose to save the patch to the workspace or outside - * of the workspace. - */ - public void createControl(Composite parent) { - - Composite composite= new Composite(parent, SWT.NULL); - GridLayout layout= new GridLayout(); - composite.setLayout(layout); - composite.setLayoutData(new GridData()); - setControl(composite); - initializeDialogUnits(composite); - - // set F1 help - WorkbenchHelp.setHelp(composite, IHelpContextIds.PATCH_SELECTION_PAGE); - - // Clipboard - saveToClipboard= new Button(composite, SWT.RADIO); - saveToClipboard.setText(Policy.bind("Save_To_Clipboard_2")); //$NON-NLS-1$ - saveToClipboard.addListener(SWT.Selection, new Listener() { - public void handleEvent(Event event) { - validatePage(); - updateEnablements(); - } - }); - - // File System - saveInFilesystem= new Button(composite, SWT.RADIO); - saveInFilesystem.setText(Policy.bind("Save_In_File_System_3")); //$NON-NLS-1$ - saveInFilesystem.addListener(SWT.Selection, new Listener() { - public void handleEvent(Event event) { - validatePage(); - updateEnablements(); - } - }); - - Composite nameGroup = new Composite(composite,SWT.NONE); - layout = new GridLayout(); - layout.numColumns = 2; - layout.marginWidth = 0; - nameGroup.setLayout(layout); - GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL); - nameGroup.setLayoutData(data); - - filenameCombo= new Text(nameGroup, SWT.BORDER); - GridData gd= new GridData(GridData.FILL_HORIZONTAL); - filenameCombo.setLayoutData(gd); - filenameCombo.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - validatePage(); - } - }); - - browseButton = new Button(nameGroup, SWT.NULL); - browseButton.setText(Policy.bind("Browse..._4")); //$NON-NLS-1$ - data = new GridData(GridData.HORIZONTAL_ALIGN_END); - data.heightHint = convertVerticalDLUsToPixels(IDialogConstants.BUTTON_HEIGHT); - data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH); - browseButton.setLayoutData(data); - browseButton.addListener(SWT.Selection, new Listener() { - public void handleEvent(Event event) { - FileDialog d = new FileDialog(getShell(), SWT.PRIMARY_MODAL | SWT.SAVE); - d.setText(Policy.bind("Save_Patch_As_5")); //$NON-NLS-1$ - d.setFileName(Policy.bind("patch.txt_6")); //$NON-NLS-1$ - String file = d.open(); - if(file!=null) { - IPath path = new Path(file); - setFilesystemFilename(path.toOSString()); - } - } - }); - - // Workspace - saveInWorkspace= new Button(composite, SWT.RADIO); - saveInWorkspace.setText(Policy.bind("Save_In_Workspace_7")); //$NON-NLS-1$ - saveInWorkspace.addListener(SWT.Selection, new Listener() { - public void handleEvent(Event event) { - validatePage(); - updateEnablements(); - } - }); - - createTreeViewer(composite); - saveToClipboard.setSelection(true); - validatePage(); - updateEnablements(); - } - - /** - * Sets the file name in the file system text. - */ - protected void setFilesystemFilename(String filename) { - filenameCombo.setText(filename); - } - - /** - * Create the tree viewer that shows the container available in the workspace. The user - * can then enter a filename in the text box below the viewer. - */ - protected void createTreeViewer(Composite parent) { - // Create tree viewer inside drill down. - new Label(parent, SWT.LEFT).setText(Policy.bind("Select_a_folder_then_type_in_the_file_name__8")); //$NON-NLS-1$ - - treeViewer = new TreeViewer(parent, SWT.BORDER); - ContainerContentProvider cp = new ContainerContentProvider(); - cp.showClosedProjects(false); - GridData data = new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL | - GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL); - - data.widthHint = SIZING_SELECTION_PANE_WIDTH; - data.heightHint = SIZING_SELECTION_PANE_HEIGHT; - - treeViewer.getTree().setLayoutData(data); - treeViewer.setContentProvider(cp); - treeViewer.setLabelProvider(new WorkbenchLabelProvider()); - treeViewer.addSelectionChangedListener( - new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - IStructuredSelection selection = (IStructuredSelection)event.getSelection(); - containerSelectionChanged((IContainer) selection.getFirstElement()); // allow null - validatePage(); - } - }); - - treeViewer.addDoubleClickListener( - new IDoubleClickListener() { - public void doubleClick(DoubleClickEvent event) { - ISelection selection = event.getSelection(); - if (selection instanceof IStructuredSelection) { - Object item = ((IStructuredSelection)selection).getFirstElement(); - if (treeViewer.getExpandedState(item)) - treeViewer.collapseToLevel(item, 1); - else - treeViewer.expandToLevel(item, 1); - } - } - }); - - // This has to be done after the viewer has been laid out - treeViewer.setInput(ResourcesPlugin.getWorkspace()); - - // name group - Composite nameGroup = new Composite(parent,SWT.NONE); - GridLayout layout = new GridLayout(); - layout.numColumns = 2; - layout.marginWidth = 0; - nameGroup.setLayout(layout); - data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL); - nameGroup.setLayoutData(data); - - Label label = new Label(nameGroup,SWT.NONE); - label.setText(Policy.bind("Fi&le_name__9")); //$NON-NLS-1$ - - // resource name entry field - workspaceFilename = new Text(nameGroup,SWT.BORDER); - data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL); - workspaceFilename.setLayoutData(data); - workspaceFilename.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - validatePage(); - } - }); - } - - /** - * Enable and disable controls based on the selected radio button. - */ - protected void updateEnablements() { - int type = getSaveType(); - - browseButton.setEnabled(type==FILESYSTEM); - filenameCombo.setEnabled(type==FILESYSTEM); - treeViewer.getTree().setEnabled(type==WORKSPACE); - workspaceFilename.setEnabled(type==WORKSPACE); - } - - /** - * Answers the type of the patch file destination. - */ - public int getSaveType() { - if(saveInFilesystem.getSelection()) { - return FILESYSTEM; - } else if(saveToClipboard.getSelection()) { - return CLIPBOARD; - } else { - return WORKSPACE; - } - } - - /** - * Remember the container selected in the tree viewer. - */ - public void containerSelectionChanged(IContainer container) { - selectedContainer = container; - } - } - // end of PatchFileSelectionPage - - /** - * Page to select the options for creating the patch. - */ - public class PatchFileCreationOptionsPage extends WizardPage { - - private Button recurseOption; - private Button contextDiffOption; - private Button unifiedDiffOption; - private Button regularDiffOption; - private Button includeNewFilesOptions; - - /** - * Constructor for PatchFileCreationOptionsPage. - */ - protected PatchFileCreationOptionsPage(String pageName) { - super(pageName); - } - - /** - * Constructor for PatchFileCreationOptionsPage. - */ - protected PatchFileCreationOptionsPage(String pageName, String title, ImageDescriptor titleImage) { - super(pageName, title, titleImage); - } - - /* - * @see IDialogPage#createControl(Composite) - */ - public void createControl(Composite parent) { - Composite composite= new Composite(parent, SWT.NULL); - GridLayout layout= new GridLayout(); - composite.setLayout(layout); - composite.setLayoutData(new GridData()); - setControl(composite); - - // set F1 help - WorkbenchHelp.setHelp(composite, IHelpContextIds.PATCH_OPTIONS_PAGE); - - recurseOption = new Button(composite, SWT.CHECK); - recurseOption.setText(Policy.bind("Do_not_recurse_into_sub-folders_10")); //$NON-NLS-1$ - recurseOption.setSelection(true); - - includeNewFilesOptions = new Button(composite, SWT.CHECK); - includeNewFilesOptions.setText(Policy.bind("Do_not_include_new_files_in_patch_11")); //$NON-NLS-1$ - includeNewFilesOptions.setSelection(true); - - Group diffTypeGroup = new Group(composite, SWT.NONE); - layout = new GridLayout(); - layout.marginHeight = 0; - diffTypeGroup.setLayout(layout); - GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL); - diffTypeGroup.setLayoutData(data); - diffTypeGroup.setText(Policy.bind("Diff_output_format_12")); //$NON-NLS-1$ - - unifiedDiffOption = new Button(diffTypeGroup, SWT.RADIO); - unifiedDiffOption.setText(Policy.bind("Unified_(format_required_by_Compare_With_Patch_feature)_13")); //$NON-NLS-1$ - unifiedDiffOption.setSelection(true); - contextDiffOption = new Button(diffTypeGroup, SWT.RADIO); - contextDiffOption.setText(Policy.bind("Context_14")); //$NON-NLS-1$ - regularDiffOption = new Button(diffTypeGroup, SWT.RADIO); - regularDiffOption.setText(Policy.bind("Standard_15")); //$NON-NLS-1$ - } - - /** - * Answers if the difference operation should be run recursively. - */ - public boolean isRecursive() { - return !recurseOption.getSelection(); - } - - /** - * Return the list of Diff command options configured on this page. - */ - public LocalOption[] getOptions() { - List options = new ArrayList(5); - if(includeNewFilesOptions.getSelection()) { - options.add(Diff.INCLUDE_NEWFILES); - } - if(!recurseOption.getSelection()) { - options.add(Diff.DO_NOT_RECURSE); - } - if(unifiedDiffOption.getSelection()) { - options.add(Diff.UNIFIED_FORMAT); - } else if(contextDiffOption.getSelection()) { - options.add(Diff.CONTEXT_FORMAT); - } - return (LocalOption[]) options.toArray(new LocalOption[options.size()]); - } - public void setVisible(boolean visible) { - super.setVisible(visible); - if (visible) { - recurseOption.setFocus(); - } - } - } - // end of PatchFileCreationOptionsPage - - public GenerateDiffFileWizard(IStructuredSelection selection, IResource resource) { - super(); - this.selection = selection; - this.resource = resource; - setWindowTitle(Policy.bind("GenerateCVSDiff.title")); //$NON-NLS-1$ - initializeDefaultPageImageDescriptor(); - } - - public void addPages() { - String pageTitle = Policy.bind("GenerateCVSDiff.pageTitle"); //$NON-NLS-1$ - String pageDescription = Policy.bind("GenerateCVSDiff.pageDescription"); //$NON-NLS-1$ - mainPage = new PatchFileSelectionPage(pageTitle, pageTitle, CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_DIFF), selection); - mainPage.setDescription(pageDescription); - addPage(mainPage); - - pageTitle = Policy.bind("Advanced_options_19"); //$NON-NLS-1$ - pageDescription = Policy.bind("Configure_the_options_used_for_the_CVS_diff_command_20"); //$NON-NLS-1$ - optionsPage = new PatchFileCreationOptionsPage(pageTitle, pageTitle, CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_DIFF)); - optionsPage.setDescription(pageDescription); - addPage(optionsPage); - } - - /** - * Initializes this creation wizard using the passed workbench and - * object selection. - * - * @param workbench the current workbench - * @param selection the current object selection - */ - public void init(IWorkbench workbench, IStructuredSelection selection) { - } - /** - * Declares the wizard banner iamge descriptor - */ - protected void initializeDefaultPageImageDescriptor() { - String iconPath; - iconPath = "icons/full/"; //$NON-NLS-1$ - try { - URL installURL = CVSUIPlugin.getPlugin().getDescriptor().getInstallURL(); - URL url = new URL(installURL, iconPath + "wizards/newconnect_wiz.gif"); //$NON-NLS-1$ - ImageDescriptor desc = ImageDescriptor.createFromURL(url); - setDefaultPageImageDescriptor(desc); - } catch (MalformedURLException e) { - // Should not happen. Ignore. - } - } - - /* (Non-javadoc) - * Method declared on IWizard. - */ - public boolean needsProgressMonitor() { - return true; - } - /** - * Completes processing of the wizard. If this method returns <code> - * true</code>, the wizard will close; otherwise, it will stay active. - */ - public boolean performFinish() { - String fs = mainPage.getFilesystemFile(); - IFile ws = mainPage.getWorkspaceFile(); - int type = mainPage.getSaveType(); - - try { - if(type != mainPage.CLIPBOARD) { - File file = new File(fs!=null ? fs : ws.getLocation().toOSString()); - if (file.exists()) { - // prompt then delete - String title = Policy.bind("GenerateCVSDiff.overwriteTitle"); //$NON-NLS-1$ - String msg = Policy.bind("GenerateCVSDiff.overwriteMsg"); //$NON-NLS-1$ - final MessageDialog dialog = new MessageDialog(getShell(), title, null, msg, MessageDialog.QUESTION, new String[] { IDialogConstants.YES_LABEL, IDialogConstants.CANCEL_LABEL }, 0); - - dialog.open(); - - if (dialog.getReturnCode() != 0) { - // cancel - return false; - } - } - getContainer().run(true, true, new GenerateDiffFileOperation(resource, file, false, optionsPage.getOptions(), getShell())); - if(type==mainPage.WORKSPACE) { - ws.getParent().refreshLocal(IResource.DEPTH_ONE, null); - } - } else { - getContainer().run(true, true, new GenerateDiffFileOperation(resource, null, true, optionsPage.getOptions(), getShell())); - } - return true; - } catch (InterruptedException e1) { - return true; - } catch(CoreException e) { - CVSUIPlugin.openError(getShell(), Policy.bind("GenerateCVSDiff.error"), null, e); //$NON-NLS-1$ - return false; - } catch (InvocationTargetException e2) { - CVSUIPlugin.openError(getShell(), Policy.bind("GenerateCVSDiff.error"), null, e2); //$NON-NLS-1$ - return false; - } - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizard.java deleted file mode 100644 index 1c1a96c98..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizard.java +++ /dev/null @@ -1,418 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.wizards; - - -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IResourceVisitor; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.MultiStatus; -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.wizard.IWizardPage; -import org.eclipse.jface.wizard.Wizard; -import org.eclipse.swt.custom.BusyIndicator; -import org.eclipse.team.core.RepositoryProvider; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; -import org.eclipse.team.internal.ccvs.core.CVSStatus; -import org.eclipse.team.internal.ccvs.core.CVSTeamProvider; -import org.eclipse.team.internal.ccvs.core.ICVSFile; -import org.eclipse.team.internal.ccvs.core.client.Command.KSubstOption; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.Policy; - -/** - * A wizard for changing the keyword substitution mode of files. - * - * 1. Ask the user select to select the desired keyword substitution mode. - * 2. Compute the set of possibly affected resources - * 3. If the affected resources include existing committed files, warn the user - * and provide an option to include them in the operation anyways. - * 4. If the affected resources include dirty files, warn the user and provide - * an option to include them in the operation anyways. - * 5. Perform the operation on Finish. - */ -public class KSubstWizard extends Wizard { - private KSubstOption defaultKSubst; - - private final IResource[] resources; - private final int depth; - private List changeList = null; - private KSubstOption changeOption = null; - - private KSubstWizardSelectionPage mainPage; - private KSubstWizardSummaryPage summaryPage; - private KSubstWizardSharedFilesPage sharedFilesPage; - private KSubstWizardDirtyFilesPage dirtyFilesPage; - - private Dialog parentDialog; - - private KSubstWizardCommitCommentPage commitCommentPage; - - public class KSubstChangeElement { - public static final int ADDED_FILE = 1; - public static final int CHANGED_FILE = 2; - public static final int UNCHANGED_FILE = 4; - - private IFile file; - private int classification; - private boolean excluded; - private KSubstOption fromKSubst; - private KSubstOption toKSubst; - - private KSubstChangeElement(IFile file, int classification, boolean excluded, KSubstOption fromKSubst, KSubstOption toKSubst) { - this.file = file; - this.classification = classification; - this.excluded = excluded; - this.fromKSubst = fromKSubst; - this.toKSubst = toKSubst; - } - public boolean matchesFilter(int filter) { - return (classification & filter) != 0; - } - public boolean isExcluded() { - return excluded; - } - public void setExcluded(boolean excluded) { - this.excluded = excluded; - } - public boolean isNewKSubstMode() { - return ! fromKSubst.equals(toKSubst); - } - public void setKSubst(KSubstOption toKSubst) { - this.toKSubst = toKSubst; - } - public KSubstOption getKSubst() { - return toKSubst; - } - public IFile getFile() { - return file; - } - } - - /** - * Creates a wizard to set the keyword substitution mode for the specified resources. - * - * @param resources the resources to alter - * @param depth the recursion depth - * @param defaultOption the keyword substitution option to select by default - */ - public KSubstWizard(IResource[] resources, int depth, KSubstOption defaultOption) { - super(); - this.defaultKSubst = defaultOption; - this.resources = resources; - this.depth = depth; - setWindowTitle(Policy.bind("KSubstWizard.title")); //$NON-NLS-1$ - } - - /** - * Returns the keyword substitution option that was selected at the time - * the Finish button was pressed. - */ - public KSubstOption getKSubstOption() { - return defaultKSubst; - } - - public void addPages() { - ImageDescriptor substImage = CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_KEYWORD); - - // add main page - String pageTitle = Policy.bind("KSubstWizardSelectionPage.pageTitle"); //$NON-NLS-1$ - String pageDescription = Policy.bind("KSubstWizardSelectionPage.pageDescription"); //$NON-NLS-1$ - mainPage = new KSubstWizardSelectionPage(pageTitle, pageTitle, substImage, defaultKSubst); - mainPage.setDescription(pageDescription); - mainPage.setTitle(pageTitle); - addPage(mainPage); - - // add summary page - pageTitle = Policy.bind("KSubstWizardSummaryPage.pageTitle"); //$NON-NLS-1$ - pageDescription = Policy.bind("KSubstWizardSummaryPage.pageDescription"); //$NON-NLS-1$ - summaryPage = new KSubstWizardSummaryPage(pageTitle, pageTitle, substImage, false); - summaryPage.setDescription(pageDescription); - addPage(summaryPage); - - // add shared files warning page - pageTitle = Policy.bind("KSubstWizardSharedFilesPage.pageTitle"); //$NON-NLS-1$ - pageDescription = Policy.bind("KSubstWizardSharedFilesPage.pageDescription"); //$NON-NLS-1$ - sharedFilesPage = new KSubstWizardSharedFilesPage(pageTitle, pageTitle, substImage, false); - sharedFilesPage.setDescription(pageDescription); - addPage(sharedFilesPage); - - // add changed files warning page - pageTitle = Policy.bind("KSubstWizardDirtyFilesPage.pageTitle"); //$NON-NLS-1$ - pageDescription = Policy.bind("KSubstWizardDirtyFilesPage.pageDescription"); //$NON-NLS-1$ - dirtyFilesPage = new KSubstWizardDirtyFilesPage(pageTitle, pageTitle, substImage, false); - dirtyFilesPage.setDescription(pageDescription); - addPage(dirtyFilesPage); - - // add commit comment page - pageTitle = Policy.bind("KSubstWizardCommitCommentPage.pageTitle"); //$NON-NLS-1$ - pageDescription = Policy.bind("KSubstWizardCommitCommentPage.pageDescription"); //$NON-NLS-1$ - commitCommentPage = new KSubstWizardCommitCommentPage(parentDialog, pageTitle, pageTitle, substImage, pageDescription); - addPage(commitCommentPage); - } - - public IWizardPage getNextPage(IWizardPage page) { - if (page == mainPage) { - if (prepareSharedFilesPage()) return sharedFilesPage; - } else if (page == sharedFilesPage) { - if (sharedFilesPage.includeSharedFiles() && prepareDirtyFilesPage()) return dirtyFilesPage; - } else if (page == summaryPage) { - return null; - } - prepareSummaryPage(); - if (page != commitCommentPage) return commitCommentPage; - return summaryPage; - } - - public IWizardPage getPreviousPage(IWizardPage page) { - if (page == summaryPage) { - return commitCommentPage; - } else if (page == commitCommentPage) { - if (sharedFilesPage.includeSharedFiles() && prepareDirtyFilesPage()) return dirtyFilesPage; - if (prepareSharedFilesPage()) return sharedFilesPage; - return mainPage; - } else if (page == dirtyFilesPage) { - if (prepareSharedFilesPage()) return sharedFilesPage; - return mainPage; - } else if (page == sharedFilesPage) { - return mainPage; - } - return null; - } - - /* (Non-javadoc) - * Method declared on IWizard. - */ - public boolean needsProgressMonitor() { - return true; - } - - /* (Non-javadoc) - * Method declared on IWizard. - */ - public boolean needsPreviousAndNextButtons() { - return true; - } - - /* (Non-javadoc) - * Method declared on IWizard. - */ - public boolean performFinish() { - try { - defaultKSubst = mainPage.getKSubstOption(); - final List messages = new ArrayList(); - getContainer().run(false /*fork*/, true /*cancelable*/, new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - try { - monitor.beginTask("", 10000); //$NON-NLS-1$ - monitor.setTaskName(Policy.bind("KSubstWizard.working")); //$NON-NLS-1$ - computeChangeList(mainPage.getKSubstOption()); - Map table = getProviderMapping(); - - int workPerProvider = 10000 / (table.size() + 1); - monitor.worked(workPerProvider); - for (Iterator it = table.entrySet().iterator(); it.hasNext();) { - Map.Entry entry = (Map.Entry) it.next(); - CVSTeamProvider provider = (CVSTeamProvider) entry.getKey(); - Map providerFiles = (Map) entry.getValue(); - - String comment = commitCommentPage.getComment(); - IStatus status = provider.setKeywordSubstitution(providerFiles, comment, - Policy.subMonitorFor(monitor, workPerProvider)); - if (status.getCode() != CVSStatus.OK) { - messages.add(status); - } - } - } catch (TeamException e) { - throw new InvocationTargetException(e); - } finally { - monitor.done(); - } - } - }); - // Check for any status messages and display them - if ( ! messages.isEmpty()) { - boolean error = false; - MultiStatus combinedStatus = new MultiStatus(CVSUIPlugin.ID, 0, - Policy.bind("KSubstWizard.problemsMessage"), null); //$NON-NLS-1$ - for (int i = 0; i < messages.size(); i++) { - IStatus status = (IStatus)messages.get(i); - if (status.getSeverity() == IStatus.ERROR || status.getCode() == CVSStatus.SERVER_ERROR) { - error = true; - } - combinedStatus.merge(status); - } - String message = null; - IStatus statusToDisplay; - if (combinedStatus.getChildren().length == 1) { - message = combinedStatus.getMessage(); - statusToDisplay = combinedStatus.getChildren()[0]; - } else { - statusToDisplay = combinedStatus; - } - String title; - if (error) { - title = Policy.bind("KSubstWizard.errorTitle"); //$NON-NLS-1$ - } else { - title = Policy.bind("KSubstWizard.warningTitle"); //$NON-NLS-1$ - } - CVSUIPlugin.openError(getShell(), title, message, new CVSException(statusToDisplay)); - } - return true; - } catch (InterruptedException e1) { - return true; - } catch (InvocationTargetException e2) { - CVSUIPlugin.openError(getShell(), Policy.bind("KSubstWizard.problemsMessage"), null, e2); //$NON-NLS-1$ - return false; - } - } - - private boolean prepareDirtyFilesPage() { - BusyIndicator.showWhile(getContainer().getShell().getDisplay(), new Runnable() { - public void run() { - computeChangeList(mainPage.getKSubstOption()); - dirtyFilesPage.setChangeList(changeList); - } - }); - return ! dirtyFilesPage.isListEmpty(); - } - - private boolean prepareSharedFilesPage() { - BusyIndicator.showWhile(getContainer().getShell().getDisplay(), new Runnable() { - public void run() { - computeChangeList(mainPage.getKSubstOption()); - sharedFilesPage.setChangeList(changeList); - } - }); - return ! sharedFilesPage.isListEmpty(); - } - - private void prepareSummaryPage() { - BusyIndicator.showWhile(getContainer().getShell().getDisplay(), new Runnable() { - public void run() { - computeChangeList(mainPage.getKSubstOption()); - summaryPage.setChangeList(changeList, getFilters()); - } - }); - } - - /** - * @param ksubst the desired keyword substitution mode, if null chooses for each file: - * <code>KSubstOption.fromPattern(fileName).isBinary() ? KSUBST_BINARY : KSUBST_TEXT</code> - */ - private void computeChangeList(final KSubstOption ksubst) { - if (changeList != null) { - if (changeOption == ksubst) return; - changeList.clear(); - } else { - changeList = new ArrayList(); - } - changeOption = ksubst; - // recurse over all specified resources, considering each exactly once - final Set seen = new HashSet(); - for (int i = 0; i < resources.length; i++) { - final IResource currentResource = resources[i]; - try { - currentResource.accept(new IResourceVisitor() { - public boolean visit(IResource resource) throws CoreException { - try { - if (resource.getType() == IResource.FILE && resource.exists() && ! seen.contains(resource)) { - seen.add(resource); - IFile file = (IFile) resource; - ICVSFile cvsFile = CVSWorkspaceRoot.getCVSFileFor(file); - if (cvsFile.isManaged()) { - ResourceSyncInfo info = cvsFile.getSyncInfo(); - // classify the change - final int classification; - if (info.isAdded()) { - classification = KSubstChangeElement.ADDED_FILE; - } else if (info.isDeleted()) { - return true; - } else if (cvsFile.isModified(null)) { - classification = KSubstChangeElement.CHANGED_FILE; - } else { - classification = KSubstChangeElement.UNCHANGED_FILE; - } - // determine the to/from substitution modes - KSubstOption fromKSubst = info.getKeywordMode(); - KSubstOption toKSubst = ksubst; - if (ksubst == null) { - toKSubst = KSubstOption.fromFile(file); - } - changeList.add(new KSubstChangeElement(file, classification, false, fromKSubst, toKSubst)); - } - } - } catch (TeamException e) { - throw new CoreException(e.getStatus()); - } - // always return true and let the depth determine if children are visited - return true; - } - }, depth, false); - } catch (CoreException e) { - CVSUIPlugin.openError(getShell(), Policy.bind("KSubstWizard.problemsMessage"), null, e); //$NON-NLS-1$ - } - } - } - - private int getFilters() { - return KSubstChangeElement.ADDED_FILE | - (sharedFilesPage.includeSharedFiles() ? KSubstChangeElement.UNCHANGED_FILE | - (dirtyFilesPage.includeDirtyFiles() ? KSubstChangeElement.CHANGED_FILE : 0) : 0); - } - - private Map getProviderMapping() { - Map table = new HashMap(); - int filter = getFilters(); - for (Iterator it = changeList.iterator(); it.hasNext();) { - KSubstChangeElement change = (KSubstChangeElement) it.next(); - if (! change.isExcluded() && change.isNewKSubstMode() && change.matchesFilter(filter)) { - // classify file according to its provider - IFile file = change.getFile(); - RepositoryProvider provider = RepositoryProvider.getProvider(file.getProject(), CVSProviderPlugin.getTypeId()); - Map providerMap = (Map) table.get(provider); - if (providerMap == null) { - providerMap = new HashMap(); - table.put(provider, providerMap); - } - providerMap.put(file, change.toKSubst); - } - } - return table; - } - - /** - * Method setParentDialog. - * @param dialog - */ - public void setParentDialog(Dialog dialog) { - this.parentDialog = dialog; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardCommitCommentPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardCommitCommentPage.java deleted file mode 100644 index 5597ff55d..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardCommitCommentPage.java +++ /dev/null @@ -1,64 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.wizards; - -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.team.internal.ccvs.ui.CommitCommentArea; -import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.ui.help.WorkbenchHelp; - -public class KSubstWizardCommitCommentPage extends CVSWizardPage { - - private CommitCommentArea commitCommentArea; - - /** - * Constructor for KSubstWizardCommitCommentPage. - * @param pageName - * @param title - * @param titleImage - * @param description - */ - public KSubstWizardCommitCommentPage( - Dialog parentDialog, - String pageName, - String title, - ImageDescriptor titleImage, - String description) { - - super(pageName, title, titleImage, description); - commitCommentArea = new CommitCommentArea(parentDialog, null); - } - - /** - * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) - */ - public void createControl(Composite parent) { - Composite top = new Composite(parent, SWT.NONE); - top.setLayout(new GridLayout()); - setControl(top); - // set F1 help - WorkbenchHelp.setHelp(top, IHelpContextIds.KEYWORD_SUBSTITUTION_COMMIT_COMMENT_PAGE); - commitCommentArea.createArea(top); - } - - /** - * Method getComment. - * @return String - */ - public String getComment() { - return commitCommentArea.getComment(); - } - -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardDirtyFilesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardDirtyFilesPage.java deleted file mode 100644 index d057e3af4..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardDirtyFilesPage.java +++ /dev/null @@ -1,93 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.wizards; - - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.viewers.ListViewer; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ccvs.ui.wizards.KSubstWizard.KSubstChangeElement; -import org.eclipse.ui.help.WorkbenchHelp; - -/** - * Page to warn user about uncommitted outgoing changes. - */ -public class KSubstWizardDirtyFilesPage extends CVSWizardPage { - private boolean includeDirtyFiles; - private Button includeDirtyFilesButton; - private ListViewer listViewer; - - public KSubstWizardDirtyFilesPage(String pageName, String title, ImageDescriptor image, boolean includeDirtyFiles) { - super(pageName, title, image); - this.includeDirtyFiles = includeDirtyFiles; - } - - public void createControl(Composite parent) { - Composite top = new Composite(parent, SWT.NONE); - top.setLayout(new GridLayout()); - setControl(top); - - // set F1 help - WorkbenchHelp.setHelp(top, IHelpContextIds.KEYWORD_SUBSTITUTION_CHANGED_PAGE); - - createWrappingLabel(top, Policy.bind("KSubstWizardDirtyFilesPage.contents"), 0); //$NON-NLS-1$ - - includeDirtyFilesButton = new Button(top, SWT.CHECK); - includeDirtyFilesButton.setText(Policy.bind("KSubstWizardDirtyFilesPage.includeDirtyFiles")); //$NON-NLS-1$ - includeDirtyFilesButton.setSelection(includeDirtyFiles); - includeDirtyFilesButton.addListener(SWT.Selection, new Listener() { - public void handleEvent(Event e) { - includeDirtyFiles = includeDirtyFilesButton.getSelection(); - } - }); - - createSeparator(top, SPACER_HEIGHT); - listViewer = createFileListViewer(top, - Policy.bind("KSubstWizardDirtyFilesPage.dirtyFilesViewer.title"), LIST_HEIGHT_HINT); //$NON-NLS-1$ - } - - public boolean includeDirtyFiles() { - return includeDirtyFiles; - } - - public void setChangeList(List changes) { - List filteredFiles = new ArrayList(); - for (Iterator it = changes.iterator(); it.hasNext();) { - KSubstChangeElement change = (KSubstChangeElement) it.next(); - if (change.matchesFilter(KSubstChangeElement.CHANGED_FILE)) { - filteredFiles.add(change.getFile()); - } - } - listViewer.setInput(filteredFiles.toArray()); - } - - public boolean isListEmpty() { - // returns true iff the list is empty after filtering - return listViewer.getList().getItemCount() == 0; - } - public void setVisible(boolean visible) { - super.setVisible(visible); - if (visible) { - includeDirtyFilesButton.setFocus(); - } - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSelectionPage.java deleted file mode 100644 index 56d2ed994..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSelectionPage.java +++ /dev/null @@ -1,155 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.wizards; - - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; - -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Combo; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; -import org.eclipse.team.internal.ccvs.core.client.Command; -import org.eclipse.team.internal.ccvs.core.client.Command.KSubstOption; -import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.ui.help.WorkbenchHelp; - -/** - * Page to select keyword substitution mode. - */ -public class KSubstWizardSelectionPage extends CVSWizardPage { - private KSubstOption ksubst; - private List ksubstOptions; - private Button automaticRadioButton; - private Button binaryRadioButton; - private Button textRadioButton; - private Button ksubstRadioButton; - private Combo ksubstOptionCombo; - - public KSubstWizardSelectionPage(String pageName, String title, ImageDescriptor image, KSubstOption defaultKSubst) { - super(pageName, title, image); - this.ksubst = defaultKSubst; - - // sort the options by display text - KSubstOption[] options = KSubstOption.getAllKSubstOptions(); - this.ksubstOptions = new ArrayList(); - for (int i = 0; i < options.length; i++) { - KSubstOption option = options[i]; - if (! (Command.KSUBST_BINARY.equals(option) || - Command.KSUBST_TEXT.equals(option))) { - ksubstOptions.add(option); - } - } - Collections.sort(ksubstOptions, new Comparator() { - public int compare(Object a, Object b) { - String aKey = ((KSubstOption) a).getLongDisplayText(); - String bKey = ((KSubstOption) b).getLongDisplayText(); - return aKey.compareTo(bKey); - } - }); - } - - public void createControl(Composite parent) { - Composite top = new Composite(parent, SWT.NONE); - top.setLayout(new GridLayout()); - setControl(top); - - // set F1 help - WorkbenchHelp.setHelp(top, IHelpContextIds.KEYWORD_SUBSTITUTION_SELECTION_PAGE); - - Listener selectionListener = new Listener() { - public void handleEvent(Event event) { - updateEnablements(); - } - }; - - // Automatic - automaticRadioButton = createRadioButton(top, Policy.bind("KSubstWizardSelectionPage.automaticButton"), 1); //$NON-NLS-1$ - automaticRadioButton.addListener(SWT.Selection, selectionListener); - automaticRadioButton.setSelection(ksubst == null); - createWrappingLabel(top, Policy.bind("KSubstWizardSelectionPage.automaticLabel", //$NON-NLS-1$ - Command.KSUBST_BINARY.getLongDisplayText(), - CVSProviderPlugin.getPlugin().getDefaultTextKSubstOption().getLongDisplayText()), - LABEL_INDENT_WIDTH); - - // Binary - binaryRadioButton = createRadioButton(top, Policy.bind("KSubstWizardSelectionPage.binaryButton"), 1); //$NON-NLS-1$ - binaryRadioButton.addListener(SWT.Selection, selectionListener); - binaryRadioButton.setSelection(Command.KSUBST_BINARY.equals(ksubst)); - createIndentedLabel(top, Policy.bind("KSubstWizardSelectionPage.binaryLabel"), LABEL_INDENT_WIDTH); //$NON-NLS-1$ - - // Text without keyword substitution - textRadioButton = createRadioButton(top, Policy.bind("KSubstWizardSelectionPage.textButton"), 1); //$NON-NLS-1$ - textRadioButton.addListener(SWT.Selection, selectionListener); - textRadioButton.setSelection(Command.KSUBST_TEXT.equals(ksubst)); - createIndentedLabel(top, Policy.bind("KSubstWizardSelectionPage.textLabel"), LABEL_INDENT_WIDTH); //$NON-NLS-1$ - - // Text with keyword substitution - ksubstRadioButton = createRadioButton(top, Policy.bind("KSubstWizardSelectionPage.textWithSubstitutionsButton"), 1); //$NON-NLS-1$ - ksubstRadioButton.addListener(SWT.Selection, selectionListener); - ksubstRadioButton.setSelection(false); - createIndentedLabel(top, Policy.bind("KSubstWizardSelectionPage.textWithSubstitutionsLabel"), LABEL_INDENT_WIDTH); //$NON-NLS-1$ - - ksubstOptionCombo = new Combo(top, SWT.READ_ONLY); - ksubstOptionCombo.addListener(SWT.Selection, selectionListener); - GridData data = new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_BEGINNING); - data.horizontalIndent = LABEL_INDENT_WIDTH; - ksubstOptionCombo.setLayoutData(data); - - // populate the combo box and select the default option - for (int i = 0; i < ksubstOptions.size(); ++i) { - KSubstOption option = (KSubstOption) ksubstOptions.get(i); - ksubstOptionCombo.add(option.getLongDisplayText()); - if (option.equals(ksubst)) { - ksubstOptionCombo.select(i); - ksubstRadioButton.setSelection(true); - } else if (option.equals(Command.KSUBST_TEXT_EXPAND)) { - // if no expansion mode selected, show KSUBST_TEXT_EXPAND - // since it is the server default - if (! ksubstRadioButton.getSelection()) ksubstOptionCombo.select(i); - } - } - updateEnablements(); - } - - /** - * Enable and disable controls based on the selected radio button. - */ - protected void updateEnablements() { - if (ksubstRadioButton.getSelection()) { - ksubstOptionCombo.setEnabled(true); - ksubst = (KSubstOption) ksubstOptions.get(ksubstOptionCombo.getSelectionIndex()); - } else { - ksubstOptionCombo.setEnabled(false); - if (automaticRadioButton.getSelection()) { - ksubst = null; - } else if (binaryRadioButton.getSelection()) { - ksubst = Command.KSUBST_BINARY; - } else if (textRadioButton.getSelection()) { - ksubst = Command.KSUBST_TEXT; - } - } - } - - public KSubstOption getKSubstOption() { - return ksubst; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSharedFilesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSharedFilesPage.java deleted file mode 100644 index 2bf2bd94e..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSharedFilesPage.java +++ /dev/null @@ -1,93 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.wizards; - - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.viewers.ListViewer; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ccvs.ui.wizards.KSubstWizard.KSubstChangeElement; -import org.eclipse.ui.help.WorkbenchHelp; - -/** - * Page to warn user about the side-effects of changing keyword - * substitution on already committed files. - */ -public class KSubstWizardSharedFilesPage extends CVSWizardPage { - private boolean includeSharedFiles; - private Button includeSharedFilesButton; - private ListViewer listViewer; - - public KSubstWizardSharedFilesPage(String pageName, String title, ImageDescriptor image, boolean includeSharedFiles) { - super(pageName, title, image); - this.includeSharedFiles = includeSharedFiles; - } - - public void createControl(Composite parent) { - Composite top = new Composite(parent, SWT.NONE); - top.setLayout(new GridLayout()); - setControl(top); - createWrappingLabel(top, Policy.bind("KSubstWizardSharedFilesPage.contents"), 0); //$NON-NLS-1$ - - // set F1 help - WorkbenchHelp.setHelp(top, IHelpContextIds.KEYWORD_SUBSTITUTION_SHARED_PAGE); - - includeSharedFilesButton = new Button(top, SWT.CHECK); - includeSharedFilesButton.setText(Policy.bind("KSubstWizardSharedFilesPage.includeSharedFiles")); //$NON-NLS-1$ - includeSharedFilesButton.setSelection(includeSharedFiles); - includeSharedFilesButton.addListener(SWT.Selection, new Listener() { - public void handleEvent(Event e) { - includeSharedFiles = includeSharedFilesButton.getSelection(); - } - }); - - createSeparator(top, SPACER_HEIGHT); - listViewer = createFileListViewer(top, - Policy.bind("KSubstWizardSharedFilesPage.sharedFilesViewer.title"), LIST_HEIGHT_HINT); //$NON-NLS-1$ - } - - public boolean includeSharedFiles() { - return includeSharedFiles; - } - - public void setChangeList(List changes) { - List filteredFiles = new ArrayList(); - for (Iterator it = changes.iterator(); it.hasNext();) { - KSubstChangeElement change = (KSubstChangeElement) it.next(); - if (change.matchesFilter(KSubstChangeElement.CHANGED_FILE | KSubstChangeElement.UNCHANGED_FILE)) { - filteredFiles.add(change.getFile()); - } - } - listViewer.setInput(filteredFiles.toArray()); - } - - public boolean isListEmpty() { - // returns true iff the list is empty after filtering - return listViewer.getList().getItemCount() == 0; - } - public void setVisible(boolean visible) { - super.setVisible(visible); - if (visible) { - includeSharedFilesButton.setFocus(); - } - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSummaryPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSummaryPage.java deleted file mode 100644 index 3e9ad5bf3..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSummaryPage.java +++ /dev/null @@ -1,289 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.wizards; - - -import java.util.Arrays; -import java.util.Comparator; -import java.util.List; - -import org.eclipse.core.resources.IFile; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.viewers.CellEditor; -import org.eclipse.jface.viewers.CheckStateChangedEvent; -import org.eclipse.jface.viewers.CheckboxTableViewer; -import org.eclipse.jface.viewers.ColumnWeightData; -import org.eclipse.jface.viewers.ComboBoxCellEditor; -import org.eclipse.jface.viewers.ICellModifier; -import org.eclipse.jface.viewers.ICheckStateListener; -import org.eclipse.jface.viewers.ILabelProviderListener; -import org.eclipse.jface.viewers.IStructuredContentProvider; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.ITableLabelProvider; -import org.eclipse.jface.viewers.TableLayout; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jface.viewers.ViewerFilter; -import org.eclipse.swt.SWT; -import org.eclipse.swt.custom.BusyIndicator; -import org.eclipse.swt.custom.TableEditor; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Table; -import org.eclipse.swt.widgets.TableColumn; -import org.eclipse.team.internal.ccvs.core.client.Command.KSubstOption; -import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ccvs.ui.wizards.KSubstWizard.KSubstChangeElement; -import org.eclipse.ui.help.WorkbenchHelp; -import org.eclipse.ui.model.WorkbenchViewerSorter; - -public class KSubstWizardSummaryPage extends CVSWizardPage { - private CheckboxTableViewer tableViewer = null; - private KSubstOption[] ksubstOptions; - private String[] ksubstOptionsDisplayText; - private int filterType; - - private Button showUnaffectedFilesButton; - private boolean showUnaffectedFiles; - - public KSubstWizardSummaryPage(String pageName, String title, ImageDescriptor image, boolean showUnaffectedFiles) { - super(pageName, title, image); - this.showUnaffectedFiles = showUnaffectedFiles; - - // sort the options by display text - ksubstOptions = KSubstOption.getAllKSubstOptions(); - ksubstOptionsDisplayText = new String[ksubstOptions.length]; - Arrays.sort(ksubstOptions, new Comparator() { - public int compare(Object a, Object b) { - String aKey = getModeDisplayText((KSubstOption) a); - String bKey = getModeDisplayText((KSubstOption) b); - return aKey.compareTo(bKey); - } - }); - for (int i = 0; i < ksubstOptions.length; i++) { - ksubstOptionsDisplayText[i] = getModeDisplayText(ksubstOptions[i]); - } - } - - public void createControl(Composite parent) { - Composite top = new Composite(parent, SWT.NONE); - top.setLayout(new GridLayout()); - setControl(top); - createWrappingLabel(top, Policy.bind("KSubstWizardSummaryPage.contents"), 0); //$NON-NLS-1$ - - // set F1 help - WorkbenchHelp.setHelp(top, IHelpContextIds.KEYWORD_SUBSTITUTION_SUMMARY_PAGE); - - createSeparator(top, 0); - - showUnaffectedFilesButton = new Button(top, SWT.CHECK); - showUnaffectedFilesButton.setText(Policy.bind("KSubstWizardSummaryPage.showUnaffectedFiles")); //$NON-NLS-1$ - showUnaffectedFilesButton.setSelection(showUnaffectedFiles); - showUnaffectedFilesButton.addListener(SWT.Selection, new Listener() { - public void handleEvent(Event e) { - BusyIndicator.showWhile(getContainer().getShell().getDisplay(), new Runnable() { - public void run() { - showUnaffectedFiles = showUnaffectedFilesButton.getSelection(); - refresh(false); - } - }); - } - }); - - tableViewer = createFileTableViewer(top, - Policy.bind("KSubstWizardSummaryPage.summaryViewer.title"), //$NON-NLS-1$ - Policy.bind("KSubstWizardSummaryPage.summaryViewer.fileHeader"), //$NON-NLS-1$ - Policy.bind("KSubstWizardSummaryPage.summaryViewer.ksubstHeader"), //$NON-NLS-1$ - LIST_HEIGHT_HINT); - } - - /** - * Creates a TableViewer whose input is a Map from IFile to KSubstOption. - * - * @param parent the parent of the viewer - * @param title the text for the title label - * @param heightHint the nominal height of the list - * @return the created list viewer - */ - public CheckboxTableViewer createFileTableViewer(Composite parent, String title, - String fileHeader, String ksubstHeader, int heightHint) { - createLabel(parent, title); - // create a table - Table table = new Table(parent, SWT.CHECK | SWT.V_SCROLL | SWT.H_SCROLL | SWT.BORDER | SWT.FULL_SELECTION); - GridData data = new GridData(GridData.FILL_BOTH); - data.heightHint = heightHint; - table.setLayoutData(data); - table.setLinesVisible(true); - table.setHeaderVisible(true); - - // add the columns - TableColumn column = new TableColumn(table, SWT.LEFT); - column.setText(fileHeader); - column = new TableColumn(table, SWT.LEFT); - column.setText(ksubstHeader); - TableLayout tableLayout = new TableLayout(); - table.setLayout(tableLayout); - tableLayout.addColumnData(new ColumnWeightData(1, true)); - tableLayout.addColumnData(new ColumnWeightData(1, true)); - - // create a viewer for the table - final CheckboxTableViewer tableViewer = new CheckboxTableViewer(table); - tableViewer.setContentProvider(new IStructuredContentProvider() { - public Object[] getElements(Object inputElement) { - return (Object[]) inputElement; - } - public void dispose() { - } - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - } - }); - - // show file name and keyword substitution mode - tableViewer.setLabelProvider(new ITableLabelProvider() { - public Image getColumnImage(Object element, int columnIndex) { - return null; - } - public String getColumnText(Object element, int columnIndex) { - KSubstChangeElement change = (KSubstChangeElement) element; - if (columnIndex == 0) { - return change.getFile().getFullPath().toString(); - } else if (columnIndex == 1) { - return getModeDisplayText(change.getKSubst()); - } - return null; - } - public void addListener(ILabelProviderListener listener) { - } - public void dispose() { - } - public boolean isLabelProperty(Object element, String property) { - return false; - } - public void removeListener(ILabelProviderListener listener) { - } - }); - - // sort by file name - tableViewer.setSorter(new WorkbenchViewerSorter() { - public int compare(Viewer viewer, Object e1, Object e2) { - IFile file1 = ((KSubstChangeElement) e1).getFile(); - IFile file2 = ((KSubstChangeElement) e2).getFile(); - return super.compare(viewer, file1, file2); - } - }); - - // filter - tableViewer.addFilter(new ViewerFilter() { - public boolean select(Viewer viewer, Object parentElement, Object element) { - KSubstChangeElement change = (KSubstChangeElement) element; - return ( showUnaffectedFiles || change.isNewKSubstMode()) && change.matchesFilter(filterType); - } - }); - - // add a check state listener - tableViewer.addCheckStateListener(new ICheckStateListener() { - public void checkStateChanged(CheckStateChangedEvent event) { - KSubstChangeElement change = (KSubstChangeElement) event.getElement(); - if (tableViewer.getGrayed(change)) { - // if it's grayed then give it the appearance of being disabled - updateCheckStatus(change); - } else { - // otherwise record the change - change.setExcluded(! event.getChecked()); - } - } - }); - - // add a cell editor in the Keyword Substitution Mode column - TableEditor tableEditor = new TableEditor(table); - CellEditor cellEditor = new ComboBoxCellEditor(table, ksubstOptionsDisplayText); - tableViewer.setCellEditors(new CellEditor[] { null, cellEditor }); - tableViewer.setColumnProperties(new String[] { "file", "mode" }); //$NON-NLS-1$ //$NON-NLS-2$ - tableViewer.setCellModifier(new ICellModifier() { - public Object getValue(Object element, String property) { - KSubstChangeElement change = (KSubstChangeElement) element; - KSubstOption option = change.getKSubst(); - for (int i = 0; i < ksubstOptions.length; ++i) { - if (ksubstOptions[i].equals(option)) return new Integer(i); - } - // XXX need to handle this better - return null; - } - public boolean canModify(Object element, String property) { - return true; - } - public void modify(Object element, String property, Object value) { - // XXX The runtime type of 'element' seems to be a TableItem instead of the - // actual element data as with the other methods. As a workaround, use - // the table's selection mechanism instead. - IStructuredSelection selection = (IStructuredSelection) tableViewer.getSelection(); - element = selection.getFirstElement(); - int index = ((Integer) value).intValue(); - // selection will be -1 if some arbitrary text was entered since the combo box is not read only - if (index != -1) { - KSubstChangeElement change = (KSubstChangeElement) element; - KSubstOption newOption = ksubstOptions[index]; - if (! newOption.equals(change.getKSubst())) { - // the option has been changed, include it by default now if it wasn't before - // since the user has shown interest in it - change.setKSubst(newOption); - change.setExcluded(false); - tableViewer.refresh(change, true /*updateLabels*/); - updateCheckStatus(change); - } - } - } - }); - return tableViewer; - } - - public void setChangeList(List changes, int filterType) { - this.filterType = filterType; - tableViewer.setInput(changes.toArray()); - refresh(true); - } - - private void refresh(boolean updateLabels) { - tableViewer.refresh(updateLabels); - Object[] elements = (Object[]) tableViewer.getInput(); - for (int i = 0; i < elements.length; i++) { - KSubstChangeElement change = (KSubstChangeElement) elements[i]; - updateCheckStatus(change); - } - } - - private void updateCheckStatus(KSubstChangeElement change) { - if (change.isNewKSubstMode()) { - // if the mode differs, the checkbox indicates the inclusion/exclusion status - tableViewer.setGrayed(change, false); - tableViewer.setChecked(change, ! change.isExcluded()); - } else { - // otherwise, the checkbox is meaningless except to indicate that the file will not be changed - tableViewer.setGrayed(change, true); - tableViewer.setChecked(change, false); - } - } - - private String getModeDisplayText(KSubstOption option) { - return option.getLongDisplayText(); - } - public void setVisible(boolean visible) { - super.setVisible(visible); - if (visible) { - showUnaffectedFilesButton.setFocus(); - } - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModuleSelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModuleSelectionPage.java deleted file mode 100644 index d34a3bf52..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModuleSelectionPage.java +++ /dev/null @@ -1,94 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.wizards; - - -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Text; -import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.ui.help.WorkbenchHelp; - -public class ModuleSelectionPage extends CVSWizardPage { - Button useProjectNameButton; - Button useSpecifiedNameButton; - Text text; - - String result; - boolean useProjectName = true; - - public ModuleSelectionPage(String pageName, String title, ImageDescriptor titleImage) { - super(pageName, title, titleImage); - } - - public void createControl(Composite parent) { - Composite composite = createComposite(parent, 2); - // set F1 help - WorkbenchHelp.setHelp(composite, IHelpContextIds.SHARING_MODULE_PAGE); - - useProjectNameButton = createRadioButton(composite, Policy.bind("ModuleSelectionPage.moduleIsProject"), 2); //$NON-NLS-1$ - useSpecifiedNameButton = createRadioButton(composite, Policy.bind("ModuleSelectionPage.specifyModule"), 1); //$NON-NLS-1$ - useProjectNameButton.addListener(SWT.Selection, new Listener() { - public void handleEvent(Event event) { - useProjectName = useProjectNameButton.getSelection(); - if (useProjectName) { - text.setEnabled(false); - result = null; - setPageComplete(true); - } else { - text.setEnabled(true); - result = text.getText(); - if (result.length() == 0) { - result = null; - setPageComplete(false); - } else { - setPageComplete(true); - } - } - } - }); - - text = createTextField(composite); - text.setEnabled(false); - text.addListener(SWT.Modify, new Listener() { - public void handleEvent(Event event) { - result = text.getText(); - if (result.length() == 0) { - result = null; - setPageComplete(false); - } else { - setPageComplete(true); - } - } - }); - useSpecifiedNameButton.setSelection(false); - useProjectNameButton.setSelection(true); - setControl(composite); - setPageComplete(true); - } - public String getModuleName() { - return result; - } - public boolean useProjectName() { - return useProjectName; - } - public void setVisible(boolean visible) { - super.setVisible(visible); - if (visible) { - useProjectNameButton.setFocus(); - } - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/NewLocationWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/NewLocationWizard.java deleted file mode 100644 index 325d3b675..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/NewLocationWizard.java +++ /dev/null @@ -1,131 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.wizards; - - -import java.lang.reflect.InvocationTargetException; -import java.util.Properties; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.jface.dialogs.IDialogSettings; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.dialogs.ProgressMonitorDialog; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.jface.wizard.Wizard; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.Policy; - -public class NewLocationWizard extends Wizard { - private ConfigurationWizardMainPage mainPage; - - private Properties properties = null; - - public NewLocationWizard() { - IDialogSettings workbenchSettings = CVSUIPlugin.getPlugin().getDialogSettings(); - IDialogSettings section = workbenchSettings.getSection("NewLocationWizard");//$NON-NLS-1$ - if (section == null) { - section = workbenchSettings.addNewSection("NewLocationWizard");//$NON-NLS-1$ - } - setDialogSettings(section); - setWindowTitle(Policy.bind("NewLocationWizard.title")); //$NON-NLS-1$ - } - - public NewLocationWizard(Properties initialProperties) { - this(); - this.properties = initialProperties; - } - - /** - * Creates the wizard pages - */ - public void addPages() { - mainPage = new ConfigurationWizardMainPage("repositoryPage1", Policy.bind("NewLocationWizard.heading"), CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_NEW_LOCATION)); //$NON-NLS-1$ //$NON-NLS-2$ - if (properties != null) { - mainPage.setProperties(properties); - } - mainPage.setShowValidate(true); - mainPage.setDescription(Policy.bind("NewLocationWizard.description")); //$NON-NLS-1$ - mainPage.setDialogSettings(getDialogSettings()); - addPage(mainPage); - } - /* - * @see IWizard#performFinish - */ - public boolean performFinish() { - mainPage.finish(new NullProgressMonitor()); - Properties properties = mainPage.getProperties(); - final ICVSRepositoryLocation[] root = new ICVSRepositoryLocation[1]; - CVSProviderPlugin provider = CVSProviderPlugin.getPlugin(); - try { - root[0] = provider.createRepository(properties); - if (mainPage.getValidate()) { - try { - new ProgressMonitorDialog(getShell()).run(true, true, new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - try { - root[0].validateConnection(monitor); - } catch (TeamException e) { - throw new InvocationTargetException(e); - } - } - }); - } catch (InterruptedException e) { - return false; - } catch (InvocationTargetException e) { - Throwable t = e.getTargetException(); - if (t instanceof TeamException) { - throw (TeamException)t; - } - } - } - provider.addRepository(root[0]); - } catch (TeamException e) { - if (root[0] == null) { - // Exception creating the root, we cannot continue - CVSUIPlugin.openError(getContainer().getShell(), Policy.bind("NewLocationWizard.exception"), null, e); //$NON-NLS-1$ - return false; - } else { - // Exception validating. We can continue if the user wishes. - IStatus error = e.getStatus(); - if (error.isMultiStatus() && error.getChildren().length == 1) { - error = error.getChildren()[0]; - } - - boolean keep = false; - if (error.isMultiStatus()) { - CVSUIPlugin.openError(getContainer().getShell(), Policy.bind("NewLocationWizard.validationFailedTitle"), null, e); //$NON-NLS-1$ - } else { - keep = MessageDialog.openQuestion(getContainer().getShell(), - Policy.bind("NewLocationWizard.validationFailedTitle"), //$NON-NLS-1$ - Policy.bind("NewLocationWizard.validationFailedText", new Object[] {error.getMessage()})); //$NON-NLS-1$ - } - try { - if (keep) { - provider.addRepository(root[0]); - } else { - provider.disposeRepository(root[0]); - } - } catch (TeamException e1) { - CVSUIPlugin.openError(getContainer().getShell(), Policy.bind("exception"), null, e1); //$NON-NLS-1$ - return false; - } - return keep; - } - } - return true; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RepositorySelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RepositorySelectionPage.java deleted file mode 100644 index 51c4d1c43..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RepositorySelectionPage.java +++ /dev/null @@ -1,140 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.wizards; - - -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.viewers.ColumnWeightData; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jface.viewers.TableLayout; -import org.eclipse.jface.viewers.TableViewer; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Table; -import org.eclipse.swt.widgets.TableColumn; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.ui.help.WorkbenchHelp; -import org.eclipse.ui.internal.model.AdaptableList; -import org.eclipse.ui.model.WorkbenchContentProvider; -import org.eclipse.ui.model.WorkbenchLabelProvider; - -/** - * First wizard page for importing a project into a CVS repository. - * This page prompts the user to select an existing repo or create a new one. - * If the user selected an existing repo, then getLocation() will return it. - */ -public class RepositorySelectionPage extends CVSWizardPage { - private TableViewer table; - private Button useExistingRepo; - private Button useNewRepo; - - private ICVSRepositoryLocation result; - - /** - * RepositorySelectionPage constructor. - * - * @param pageName the name of the page - * @param title the title of the page - * @param titleImage the image for the page - */ - public RepositorySelectionPage(String pageName, String title, ImageDescriptor titleImage) { - super(pageName, title, titleImage); - } - protected TableViewer createTable(Composite parent, int span) { - Table table = new Table(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER | SWT.SINGLE | SWT.FULL_SELECTION); - GridData data = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL); - data.horizontalSpan = span; - table.setLayoutData(data); - TableLayout layout = new TableLayout(); - layout.addColumnData(new ColumnWeightData(100, true)); - table.setLayout(layout); - TableColumn col = new TableColumn(table, SWT.NONE); - col.setResizable(true); - - return new TableViewer(table); - } - /** - * Creates the UI part of the page. - * - * @param parent the parent of the created widgets - */ - public void createControl(Composite parent) { - Composite composite = createComposite(parent, 1); - // set F1 help - WorkbenchHelp.setHelp(composite, IHelpContextIds.SHARING_SELECT_REPOSITORY_PAGE); - - createWrappingLabel(composite, Policy.bind("RepositorySelectionPage.description"), 0 /* indent */, 1 /* columns */); //$NON-NLS-1$ - - useNewRepo = createRadioButton(composite, Policy.bind("RepositorySelectionPage.useNew"), 1); //$NON-NLS-1$ - - useExistingRepo = createRadioButton(composite, Policy.bind("RepositorySelectionPage.useExisting"), 1); //$NON-NLS-1$ - table = createTable(composite, 1); - table.setContentProvider(new WorkbenchContentProvider()); - table.setLabelProvider(new WorkbenchLabelProvider()); - table.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - result = (ICVSRepositoryLocation)((IStructuredSelection)table.getSelection()).getFirstElement(); - setPageComplete(true); - } - }); - - useExistingRepo.addListener(SWT.Selection, new Listener() { - public void handleEvent(Event event) { - if (useNewRepo.getSelection()) { - table.getTable().setEnabled(false); - result = null; - } else { - table.getTable().setEnabled(true); - result = (ICVSRepositoryLocation)((IStructuredSelection)table.getSelection()).getFirstElement(); - } - setPageComplete(true); - } - }); - - setControl(composite); - - initializeValues(); - } - /** - * Initializes states of the controls. - */ - private void initializeValues() { - ICVSRepositoryLocation[] locations = CVSUIPlugin.getPlugin().getRepositoryManager().getKnownRepositoryLocations(); - AdaptableList input = new AdaptableList(locations); - table.setInput(input); - if (locations.length == 0) { - useNewRepo.setSelection(true); - } else { - useExistingRepo.setSelection(true); - table.setSelection(new StructuredSelection(locations[0])); - } - } - - public ICVSRepositoryLocation getLocation() { - return result; - } - public void setVisible(boolean visible) { - super.setVisible(visible); - if (visible) { - useExistingRepo.setFocus(); - } - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RestoreFromRepositoryFileSelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RestoreFromRepositoryFileSelectionPage.java deleted file mode 100644 index ed926953f..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RestoreFromRepositoryFileSelectionPage.java +++ /dev/null @@ -1,584 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.wizards; - -import java.io.BufferedInputStream; -import java.io.InputStream; -import java.lang.reflect.InvocationTargetException; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - -import org.eclipse.compare.CompareUI; -import org.eclipse.compare.CompareViewerPane; -import org.eclipse.compare.CompareViewerSwitchingPane; -import org.eclipse.compare.IModificationDate; -import org.eclipse.compare.IStreamContentAccessor; -import org.eclipse.compare.ITypedElement; -import org.eclipse.compare.Splitter; -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.Path; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.viewers.CheckStateChangedEvent; -import org.eclipse.jface.viewers.CheckboxTableViewer; -import org.eclipse.jface.viewers.DecoratingLabelProvider; -import org.eclipse.jface.viewers.ICheckStateListener; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredContentProvider; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Widget; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSFile; -import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFile; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.core.ILogEntry; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo; -import org.eclipse.team.internal.ccvs.ui.AdaptableHierarchicalResourceList; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.HistoryTableProvider; -import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.ui.help.WorkbenchHelp; -import org.eclipse.ui.model.WorkbenchLabelProvider; -import org.eclipse.ui.views.navigator.ResourceSorter; - -/** - * Select the files to restore - */ -public class RestoreFromRepositoryFileSelectionPage extends CVSWizardPage { - private TreeViewer fileTree; - private CompareViewerPane fileSelectionPane; - private CompareViewerPane revisionSelectionPane; - private CheckboxTableViewer revisionsTable; - private CompareViewerSwitchingPane fileContentPane; - - private HistoryTableProvider historyTableProvider; - private AdaptableHierarchicalResourceList treeInput = new AdaptableHierarchicalResourceList(ResourcesPlugin.getWorkspace().getRoot(), new IResource[0]); - - private IContainer folder; - private IFile selectedFile; - private ILogEntry selectedRevision; - private Map entriesCache = new HashMap(); - private Map filesToRestore = new HashMap(); - - private static final int WIZARD_WIDTH = 550; - - class HistoryInput implements ITypedElement, IStreamContentAccessor, IModificationDate { - IFile file; - ILogEntry logEntry; - - HistoryInput(IFile file, ILogEntry logEntry) { - this.file= file; - this.logEntry = logEntry; - } - public InputStream getContents() throws CoreException { - return getContentsFromLogEntry(logEntry); - } - public String getName() { - return file.getName(); - } - public String getType() { - return file.getFileExtension(); - } - public Image getImage() { - return CompareUI.getImage(file); - } - public long getModificationDate() { - return logEntry.getDate().getTime(); - } - } - - /** - * Constructor for RestoreFromRepositoryFileSelectionPage. - * @param pageName - * @param title - * @param titleImage - * @param description - */ - public RestoreFromRepositoryFileSelectionPage( - String pageName, - String title, - ImageDescriptor titleImage, - String description) { - super(pageName, title, titleImage, description); - } - - /** - * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) - */ - public void createControl(Composite parent) { - Composite composite= createComposite(parent, 1); - setControl(composite); - - WorkbenchHelp.setHelp(composite, IHelpContextIds.RESTORE_FROM_REPOSITORY_FILE_SELECTION_PAGE); - - // Top and bottom panes: top is the two selection panes, bottom is the file content viewer - Splitter vsplitter= new Splitter(composite, SWT.VERTICAL); - GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL - | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_VERTICAL); - // Set the width to be extra wide to accomodate the two selection lists - data.widthHint = WIZARD_WIDTH; - vsplitter.setLayoutData(data); - - // Top left and top right panes: the left for the files, the right for the log entries - Splitter hsplitter= new Splitter(vsplitter, SWT.HORIZONTAL); - - // Top left: file selection pane - fileSelectionPane = new CompareViewerPane(hsplitter, SWT.BORDER | SWT.FLAT); - data = new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL); - fileSelectionPane.setLayoutData(data); - fileTree = createFileSelectionTree(fileSelectionPane); - - // Top right: Revision selection pane - revisionSelectionPane = new CompareViewerPane(hsplitter, SWT.BORDER | SWT.FLAT); - data = new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL);; - revisionSelectionPane.setLayoutData(data); - historyTableProvider = new HistoryTableProvider(); - revisionsTable = createRevisionSelectionTable(revisionSelectionPane, historyTableProvider); - revisionSelectionPane.setText(Policy.bind("RestoreFromRepositoryFileSelectionPage.emptyRevisionPane")); //$NON-NLS-1$ - - // Bottom: File content viewer - fileContentPane = new CompareViewerSwitchingPane(vsplitter, SWT.BORDER | SWT.FLAT) { - protected Viewer getViewer(Viewer oldViewer, Object input) { - return CompareUI.findContentViewer(oldViewer, input, this, null); - } - }; - - initializeValues(); - updateWidgetEnablements(); - } - - protected CheckboxTableViewer createRevisionSelectionTable(CompareViewerPane composite, HistoryTableProvider tableProvider) { - CheckboxTableViewer table = tableProvider.createCheckBoxTable(composite); - table.setContentProvider(new IStructuredContentProvider() { - public Object[] getElements(Object inputElement) { - ILogEntry[] entries = getSelectedEntries(); - if (entries != null) return entries; - return new Object[0]; - } - public void dispose() { - } - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - } - }); - table.setInput(this); - table.getTable().addSelectionListener( - new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - // Handle check selection in the check state listener - if (e.detail == SWT.CHECK) return; - handleRevisionSelection(e.item); - } - } - ); - table.addCheckStateListener(new ICheckStateListener() { - public void checkStateChanged(CheckStateChangedEvent event) { - handleRevisionChecked(event); - } - }); - composite.setContent(table.getControl()); - return table; - } - - protected TreeViewer createFileSelectionTree(CompareViewerPane composite) { - TreeViewer tree = new TreeViewer(composite, SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER); - tree.setUseHashlookup(true); - tree.setContentProvider(treeInput.getTreeContentProvider()); - tree.setLabelProvider( - new DecoratingLabelProvider( - new WorkbenchLabelProvider() { - protected String decorateText(String input, Object element) { - String text; - if (element instanceof IFolder && element.equals(folder)) { - text = super.decorateText(folder.getProjectRelativePath().toString(), element); - } else { - ILogEntry entry = (ILogEntry)filesToRestore.get(element); - text = super.decorateText(input, element); - if (entry != null) { - text = Policy.bind("RestoreFromRepositoryFileSelectionPage.fileToRestore", text, entry.getRevision()); //$NON-NLS-1$ - } - } - return text; - } - }, - CVSUIPlugin.getPlugin().getWorkbench().getDecoratorManager().getLabelDecorator())); - tree.setSorter(new ResourceSorter(ResourceSorter.NAME)); - tree.setInput(treeInput); - - GridData data = new GridData(GridData.FILL_BOTH | GridData.GRAB_VERTICAL); - tree.getTree().setLayoutData(data); - tree.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - handleFileSelection(event); - } - }); - composite.setContent(tree.getControl()); - return tree; - } - - /** - * Method updateWidgetEnablements. - */ - private void updateWidgetEnablements() { - - if (filesToRestore.isEmpty()) { - setPageComplete(false); - setErrorMessage(null); - return; - } - - for (Iterator iter = filesToRestore.keySet().iterator(); iter.hasNext();) { - IFile file = (IFile) iter.next(); - if (file.exists()) { - setPageComplete(false); - setErrorMessage(Policy.bind("RestoreFromRepositoryFileSelectionPage.fileExists", file.getName())); //$NON-NLS-1$ - return; - } - - ILogEntry entry = (ILogEntry) filesToRestore.get(file); - if (entry.isDeletion()) { - setPageComplete(false); - setErrorMessage(Policy.bind("RestoreFromRepositoryFileSelectionPage.revisionIsDeletion", entry.getRevision(), file.getName())); //$NON-NLS-1$ - return; - } - } - setPageComplete(true); - setErrorMessage(null); - } - - /** - * Method initializeValues. - */ - private void initializeValues() { - refresh(); - } - - /** - * Sets the folder. - * @param folder The folder to set - */ - public void setInput(IContainer folder, ICVSFile[] files) { - if (folder.equals(this.folder)) return; - this.folder = folder; - setTreeInput(folder, files); - initializeValues(); - updateWidgetEnablements(); - } - - /* - * Set the resource tree input to the files that were deleted - */ - private void setTreeInput(IContainer folder, ICVSFile[] cvsFiles) { - reset(); - IResource[] files = new IResource[cvsFiles.length]; - for (int i = 0; i < cvsFiles.length; i++) { - try { - files[i] = cvsFiles[i].getIResource(); - } catch (CVSException e) { - // In practive, this error shold not occur. - // It may if there is an existing folder with a name that matches the file - // but this is bad in general when using CVS - CVSUIPlugin.log(e); - } - } - treeInput.setResources(files); - // kludge to avoid auto-selection of first element - // set the root to the folder's parent so the folder appears in the tree - treeInput.setRoot(folder.getParent()); - refresh(); - } - - private void reset() { - this.selectedFile = null; - this.selectedRevision = null; - treeInput.setResources(null); - filesToRestore = new HashMap(); - if (fileContentPane != null && !fileContentPane.isDisposed()) { - fileContentPane.setInput(null); - } - updateWidgetEnablements(); - } - - /** - * Method refresh. - */ - private void refresh() { - if (folder == null) return; - - if (fileSelectionPane != null && !fileSelectionPane.isDisposed()) { - fileSelectionPane.setText(Policy.bind("RestoreFromRepositoryFileSelectionPage.fileSelectionPaneTitle", folder.getProject().getName())); //$NON-NLS-1$ - fileSelectionPane.setImage(CompareUI.getImage(folder.getProject())); - } - - if (revisionSelectionPane != null && !revisionSelectionPane.isDisposed()) { - if (selectedFile == null) { - revisionSelectionPane.setText(Policy.bind("RestoreFromRepositoryFileSelectionPage.emptyRevisionPane")); //$NON-NLS-1$ - revisionSelectionPane.setImage(null); - } - } - - // Empty the file content viewer - if (fileContentPane != null && !fileContentPane.isDisposed()) { - fileContentPane.setInput(null); - } - - // refresh the tree - if (fileTree != null) { - // If the parent folder is in the tree, make sure it is expanded - fileTree.setExpandedState(folder, true); - fileTree.refresh(); - } - if (revisionsTable != null) - revisionsTable.refresh(); - } - - /* - * Set the log entry table input to the fetched entries in response to a file selection - */ - private void setLogEntryTableInput(ILogEntry[] entries) { - this.selectedRevision = null; - // Refresh the table so it picks up the selected entries through its content provider - revisionsTable.refresh(); - // Check the previously checked entry if one exists - ILogEntry selectedEntry = (ILogEntry)filesToRestore.get(selectedFile); - if (selectedEntry != null) { - revisionsTable.setChecked(selectedEntry, true); - } - // Disable entries that represent deletions since they can't be loaded - for (int i = 0; i < entries.length; i++) { - ILogEntry entry = entries[i]; - if (entry.isDeletion()) { - revisionsTable.setGrayed(entry, true); - } - } - // Set the titlebar text for the revisions table - revisionSelectionPane.setText(Policy.bind("RestoreFromRepositoryFileSelectionPage.revisionSelectionPaneTitle", selectedFile.getName())); //$NON-NLS-1$ - revisionSelectionPane.setImage(CompareUI.getImage(selectedFile)); - // Clear the file content pane - fileContentPane.setInput(null); - } - - private void handleFileSelection(SelectionChangedEvent event) { - ISelection selection = event.getSelection(); - if (selection == null || selection.isEmpty()) { - clearSelection(); - } else { - if (selection instanceof StructuredSelection) { - StructuredSelection structuredSelection = (StructuredSelection) selection; - IResource resource = (IResource)structuredSelection.getFirstElement(); - if (resource instanceof IFile) { - handleFileSelection((IFile) resource); - } else { - clearSelection(); - } - } - } - } - - /** - * Method handleFileSelection. - * @param file - */ - private void handleFileSelection(IFile file) { - if (this.selectedFile == file) return; - this.selectedFile = file; - if (entriesCache.get(file) == null) { - try { - - // First, we need to create a remote file handle so we can get the log entries - ICVSFolder parent = CVSWorkspaceRoot.getCVSFolderFor(file.getParent()); - FolderSyncInfo info = parent.getFolderSyncInfo(); - ICVSRepositoryLocation location = CVSProviderPlugin.getPlugin().getRepository(info.getRoot()); - final ICVSRemoteFile remoteFile = location.getRemoteFile(new Path(info.getRepository()).append(file.getName()).toString(), CVSTag.DEFAULT); - - // Then we need to fetch the log entries - getContainer().run(true, true, new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - try { - // fetch the entries - ILogEntry[] entries = remoteFile.getLogEntries(monitor); - // cache the entries with the selected file - entriesCache.put(selectedFile, entries); - } catch (TeamException e) { - throw new InvocationTargetException(e); - } - } - }); - } catch (CVSException e) { - setErrorMessage( - CVSUIPlugin.openError(getShell(), null, null, e, CVSUIPlugin.PERFORM_SYNC_EXEC) - .getMessage()); - return; - } catch (InvocationTargetException e) { - setErrorMessage( - CVSUIPlugin.openError(getShell(), null, null, e, CVSUIPlugin.PERFORM_SYNC_EXEC) - .getMessage()); - return; - } catch (InterruptedException e) { - return; - } - } - - // Set the log table to display the entries for the selected file - setLogEntryTableInput(getSelectedEntries()); - } - - private ILogEntry[] getSelectedEntries() { - return (ILogEntry[])entriesCache.get(selectedFile); - } - - /** - * Method getContents. - * @param logEntry - * @return InputStream - */ - private InputStream getContentsFromLogEntry(final ILogEntry logEntry) { - final InputStream[] is = new InputStream[] { null }; - try { - getContainer().run(true, true, new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - try { - ICVSRemoteFile remoteFile = logEntry.getRemoteFile(); - is[0] = remoteFile.getContents(monitor); - } catch (TeamException e) { - throw new InvocationTargetException(e); - } - } - }); - } catch (InvocationTargetException e) { - setErrorMessage( - CVSUIPlugin.openError(getShell(), null, null, e, CVSUIPlugin.PERFORM_SYNC_EXEC) - .getMessage()); - return null; - } catch (InterruptedException e) { - return null; - } - return new BufferedInputStream(is[0]); - } - - private void handleRevisionChecked(CheckStateChangedEvent event) { - if (event.getChecked()) { - revisionsTable.setCheckedElements(new Object[] {event.getElement()}); - filesToRestore.put(selectedFile, event.getElement()); - } - if (revisionsTable.getCheckedElements().length == 0) { - filesToRestore.remove(selectedFile); - } - fileTree.refresh(); - updateWidgetEnablements(); - } - - /* - * A revision in the revision table has been selected. - * Populate the file contents pane with the selected log entry. - */ - private void handleRevisionSelection(Widget w) { - if (fileContentPane != null && !fileContentPane.isDisposed()) { - Object o= w.getData(); - if (o instanceof ILogEntry) { - ILogEntry selected = (ILogEntry) o; - if (this.selectedRevision == selected) return; - this.selectedRevision = selected; - if (selected.isDeletion()) { - fileContentPane.setInput(null); - } else { - fileContentPane.setInput(new HistoryInput(selectedFile, selected)); - fileContentPane.setText(getEditionLabel(selectedFile, selected)); - fileContentPane.setImage(CompareUI.getImage(selectedFile)); - } - } else { - fileContentPane.setInput(null); - } - } - } - /** - * Method getEditionLabel. - * @param selectedFile - * @param selected - * @return String - */ - private String getEditionLabel(IFile selectedFile, ILogEntry selected) { - return Policy.bind("RestoreFromRepositoryFileSelectionPage.fileContentPaneTitle", //$NON-NLS-1$ - new Object[] { selectedFile.getName(), selected.getRevision(), selectedFile.getFullPath().makeRelative().removeLastSegments(1).toString() }); - } - - public boolean restoreSelectedFiles() { - try { - getContainer().run(true, true, new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - try { - monitor.beginTask(null, 100 * filesToRestore.size()); - for (Iterator iter = filesToRestore.keySet().iterator();iter.hasNext();) { - IFile file = (IFile) iter.next(); - ILogEntry entry = (ILogEntry)filesToRestore.get(file); - ensureParentExists(file); - file.create(entry.getRemoteFile().getContents(Policy.subMonitorFor(monitor, 50)), false, Policy.subMonitorFor(monitor, 50)); - } - } catch (TeamException e) { - throw new InvocationTargetException(e); - } catch (CoreException e) { - throw new InvocationTargetException(e); - } finally { - monitor.done(); - } - } - }); - } catch (InvocationTargetException e) { - setErrorMessage( - CVSUIPlugin.openError(getShell(), null, null, e, CVSUIPlugin.PERFORM_SYNC_EXEC) - .getMessage()); - return false; - } catch (InterruptedException e) { - return false; - } - return true; - } - - /** - * Method ensureParentExists. - * @param file - */ - private void ensureParentExists(IResource resource) throws CoreException { - IContainer parent = resource.getParent(); - if (!parent.exists() && parent.getType() == IResource.FOLDER) { - ensureParentExists(parent); - ((IFolder)parent).create(false, true, null); - } - } - - private void clearSelection() { - this.selectedFile = null; - this.selectedRevision = null; - refresh(); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RestoreFromRepositoryWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RestoreFromRepositoryWizard.java deleted file mode 100644 index 960671851..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RestoreFromRepositoryWizard.java +++ /dev/null @@ -1,57 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.wizards; - -import org.eclipse.core.resources.IContainer; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.wizard.Wizard; -import org.eclipse.team.internal.ccvs.core.ICVSFile; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.Policy; - -/** - * This wizard allows the user to show deleted resources in the history view - */ -public class RestoreFromRepositoryWizard extends Wizard { - - private RestoreFromRepositoryFileSelectionPage fileSelectionPage; - private IContainer parent; - private ICVSFile[] files; - - /** - * Constructor for RestoreFromRepositoryWizard. - */ - public RestoreFromRepositoryWizard(IContainer parent, ICVSFile[] files) { - this.parent = parent; - this.files = files; - setWindowTitle(Policy.bind("RestoreFromRepositoryWizard.fileSelectionPageTitle")); //$NON-NLS-1$ - } - - /** - * @see org.eclipse.jface.wizard.IWizard#performFinish() - */ - public boolean performFinish() { - return fileSelectionPage.restoreSelectedFiles(); - } - - /** - * @see org.eclipse.jface.wizard.IWizard#addPages() - */ - public void addPages() { - setNeedsProgressMonitor(true); - ImageDescriptor substImage = CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_CHECKOUT); - - fileSelectionPage = new RestoreFromRepositoryFileSelectionPage("FileSelectionPage", Policy.bind("RestoreFromRepositoryWizard.fileSelectionPageTitle"), substImage, Policy.bind("RestoreFromRepositoryWizard.fileSelectionPageDescription")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - fileSelectionPage.setInput(parent, files); - addPage(fileSelectionPage); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java deleted file mode 100644 index 5bbafd199..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java +++ /dev/null @@ -1,446 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.wizards; - - -import java.io.ByteArrayInputStream; -import java.io.DataInputStream; -import java.io.IOException; -import java.lang.reflect.InvocationTargetException; -import java.util.Properties; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.QualifiedName; -import org.eclipse.core.runtime.SubProgressMonitor; -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.dialogs.IDialogSettings; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.wizard.IWizardPage; -import org.eclipse.jface.wizard.Wizard; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSException; -import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSFile; -import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder; -import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; -import org.eclipse.team.internal.ccvs.core.ICVSResourceVisitor; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ccvs.ui.TagSelectionDialog; -import org.eclipse.team.internal.ccvs.ui.sync.CVSSyncCompareInput; -import org.eclipse.team.internal.ccvs.ui.sync.CVSSyncCompareUnsharedInput; -import org.eclipse.team.ui.IConfigurationWizard; -import org.eclipse.team.ui.TeamUI; -import org.eclipse.team.ui.sync.ISyncViewer; -import org.eclipse.ui.IWorkbench; - -/** - * This wizard helps the user to import a new project in their workspace - * into a CVS repository for the first time. - */ -public class SharingWizard extends Wizard implements IConfigurationWizard { - // The project to configure - private IProject project; - - // The autoconnect page is used if CVS/ directories already exist. - private ConfigurationWizardAutoconnectPage autoconnectPage; - - // The import page is used if CVS/ directories do not exist. - private RepositorySelectionPage locationPage; - - // The page that prompts the user for connection information. - private ConfigurationWizardMainPage createLocationPage; - - // The page that prompts the user for module name. - private ModuleSelectionPage modulePage; - - // The page that tells the user what's going to happen. - private SharingWizardFinishPage finishPage; - - public SharingWizard() { - IDialogSettings workbenchSettings = CVSUIPlugin.getPlugin().getDialogSettings(); - IDialogSettings section = workbenchSettings.getSection("NewLocationWizard");//$NON-NLS-1$ - if (section == null) { - section = workbenchSettings.addNewSection("NewLocationWizard");//$NON-NLS-1$ - } - setDialogSettings(section); - setNeedsProgressMonitor(true); - setWindowTitle(Policy.bind("SharingWizard.title")); //$NON-NLS-1$ - } - - public void addPages() { - ImageDescriptor sharingImage = CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_SHARE); - if (doesCVSDirectoryExist()) { - autoconnectPage = new ConfigurationWizardAutoconnectPage("autoconnectPage", Policy.bind("SharingWizard.autoConnectTitle"), sharingImage); //$NON-NLS-1$ //$NON-NLS-2$ - autoconnectPage.setProject(project); - autoconnectPage.setDescription(Policy.bind("SharingWizard.autoConnectTitleDescription")); //$NON-NLS-1$ - addPage(autoconnectPage); - } else { - FolderSyncInfo info = getRepositoryInfoFromOneO(project); - if (info != null) { - // The project is from 1.0 and has sharing info - autoconnectPage = new ConfigurationWizardAutoconnectPage("autoconnectPage", Policy.bind("SharingWizard.autoConnectOneOTitle"), sharingImage); //$NON-NLS-1$ //$NON-NLS-2$ - autoconnectPage.setSharing(info); - autoconnectPage.setDescription(Policy.bind("SharingWizard.autoConnectTitleDescription")); //$NON-NLS-1$ - addPage(autoconnectPage); - } else { - ICVSRepositoryLocation[] locations = CVSUIPlugin.getPlugin().getRepositoryManager().getKnownRepositoryLocations(); - if (locations.length > 0) { - locationPage = new RepositorySelectionPage("importPage", Policy.bind("SharingWizard.importTitle"), sharingImage); //$NON-NLS-1$ //$NON-NLS-2$ - locationPage.setDescription(Policy.bind("SharingWizard.importTitleDescription")); //$NON-NLS-1$ - addPage(locationPage); - } - createLocationPage = new ConfigurationWizardMainPage("createLocationPage", Policy.bind("SharingWizard.enterInformation"), sharingImage); //$NON-NLS-1$ //$NON-NLS-2$ - createLocationPage.setDescription(Policy.bind("SharingWizard.enterInformationDescription")); //$NON-NLS-1$ - addPage(createLocationPage); - createLocationPage.setDialogSettings(getDialogSettings()); - modulePage = new ModuleSelectionPage("modulePage", Policy.bind("SharingWizard.enterModuleName"), sharingImage); //$NON-NLS-1$ //$NON-NLS-2$ - modulePage.setDescription(Policy.bind("SharingWizard.enterModuleNameDescription")); //$NON-NLS-1$ - addPage(modulePage); - finishPage = new SharingWizardFinishPage("finishPage", Policy.bind("SharingWizard.readyToFinish"), sharingImage); //$NON-NLS-1$ //$NON-NLS-2$ - finishPage.setDescription(Policy.bind("SharingWizard.readyToFinishDescription")); //$NON-NLS-1$ - addPage(finishPage); - } - } - } - public boolean canFinish() { - IWizardPage page = getContainer().getCurrentPage(); - if (page == locationPage) { - if (locationPage.getLocation() == null) { - return createLocationPage.isPageComplete(); - } else { - return modulePage.useProjectName() || modulePage.getModuleName() != null; - } - } else if (page == modulePage) { - return modulePage.useProjectName() || modulePage.getModuleName() != null; - } else if (page == finishPage) { - return true; - } - return super.canFinish(); - } - protected String getMainPageDescription() { - return Policy.bind("SharingWizard.description"); //$NON-NLS-1$ - } - protected String getMainPageTitle() { - return Policy.bind("SharingWizard.heading"); //$NON-NLS-1$ - } - public IWizardPage getNextPage(IWizardPage page) { - if (page == autoconnectPage) return null; - if (page == locationPage) { - if (locationPage.getLocation() == null) { - return createLocationPage; - } else { - return modulePage; - } - } - if (page == createLocationPage) { - return modulePage; - } - if (page == modulePage) { - return finishPage; - } - return null; - } - /* - * @see IWizard#performFinish - */ - public boolean performFinish() { - final boolean[] result = new boolean[] { true }; - try { - final boolean[] doSync = new boolean[] { false }; - final boolean[] projectExists = new boolean[] { false }; - getContainer().run(true /* fork */, true /* cancel */, new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException { - try { - monitor.beginTask("", 100); //$NON-NLS-1$ - if (autoconnectPage != null && doesCVSDirectoryExist()) { - // Autoconnect to the repository using CVS/ directories - - FolderSyncInfo info = autoconnectPage.getFolderSyncInfo(); - if (info == null) { - // Error! - return; - } - - // Get the repository location (the get will add the locatin to the provider) - boolean isPreviouslyKnown = CVSProviderPlugin.getPlugin().isKnownRepository(info.getRoot()); - ICVSRepositoryLocation location = CVSProviderPlugin.getPlugin().getRepository(info.getRoot()); - - // Validate the connection if the user wants to - boolean validate = autoconnectPage.getValidate(); - if (validate) { - // Do the validation - try { - location.validateConnection(new SubProgressMonitor(monitor, 50)); - } catch (final TeamException e) { - // Exception validating. We can continue if the user wishes. - final boolean[] keep = new boolean[] { false }; - getShell().getDisplay().syncExec(new Runnable() { - public void run() { - keep[0] = MessageDialog.openQuestion(getContainer().getShell(), - Policy.bind("SharingWizard.validationFailedTitle"), //$NON-NLS-1$ - Policy.bind("SharingWizard.validationFailedText", new Object[] {e.getStatus().getMessage()})); //$NON-NLS-1$ - } - }); - if (!keep[0]) { - // Remove the root - try { - if (!isPreviouslyKnown) { - CVSProviderPlugin.getPlugin().disposeRepository(location); - } - } catch (TeamException e1) { - CVSUIPlugin.openError(getContainer().getShell(), Policy.bind("exception"), null, e1, CVSUIPlugin.PERFORM_SYNC_EXEC); //$NON-NLS-1$ - } - result[0] = false; - return; - } - // They want to keep the connection anyway. Fall through. - } - } - - // Set the sharing - CVSWorkspaceRoot.setSharing(project, info, new SubProgressMonitor(monitor, 50)); - } else { - // Import - doSync[0] = true; - // Check if the directory exists on the server - ICVSRepositoryLocation location = null; - boolean isKnown = false; - try { - location = getLocation(); - isKnown = CVSProviderPlugin.getPlugin().isKnownRepository(location.getLocation()); - location.validateConnection(monitor); - // Purge any CVS folders that may exists in subfolders - purgeAnyCVSFolders(); - String moduleName = getModuleName(); - ICVSRemoteFolder folder = location.getRemoteFolder(moduleName, null); - if (folder.exists(new SubProgressMonitor(monitor, 50))) { - projectExists[0] = true; - final boolean[] sync = new boolean[] {true}; - if (autoconnectPage == null) { - getShell().getDisplay().syncExec(new Runnable() { - public void run() { - sync[0] = MessageDialog.openQuestion(getShell(), Policy.bind("SharingWizard.couldNotImport"), Policy.bind("SharingWizard.couldNotImportLong", getModuleName())); //$NON-NLS-1$ //$NON-NLS-2$ - } - }); - } - result[0] = sync[0]; - doSync[0] = sync[0]; - return; - } - } catch (TeamException e) { - CVSUIPlugin.openError(getShell(), null, null, e, CVSUIPlugin.PERFORM_SYNC_EXEC); - if (!isKnown && location != null) location.flushUserInfo(); - result[0] = false; - doSync[0] = false; - return; - } - // Add the location to the provider if it is new - if (!isKnown) { - CVSProviderPlugin.getPlugin().addRepository(location); - } - - // Create the remote module for the project - CVSWorkspaceRoot.createModule(location, project, getModuleName(), new SubProgressMonitor(monitor, 50)); - } - } catch (TeamException e) { - throw new InvocationTargetException(e); - } finally { - monitor.done(); - } - } - }); - if (doSync[0]) { - // Sync of the project - CVSSyncCompareInput input; - if (projectExists[0]) { - try { - String moduleName = getModuleName(); - CVSTag tag; - if (autoconnectPage == null) { - TagSelectionDialog dialog = new TagSelectionDialog(getShell(), - new ICVSFolder[] {(ICVSFolder)getLocation().getRemoteFolder(moduleName, null)}, - Policy.bind("SharingWizard.selectTagTitle"), //$NON-NLS-1$ - Policy.bind("SharingWizard.selectTag"), //$NON-NLS-1$ - TagSelectionDialog.INCLUDE_HEAD_TAG | TagSelectionDialog.INCLUDE_BRANCHES, - false, /*don't show recurse option*/ - IHelpContextIds.SHARE_WITH_EXISTING_TAG_SELETION_DIALOG); - dialog.setBlockOnOpen(true); - if (dialog.open() == Dialog.CANCEL) { - return false; - } - tag = dialog.getResult(); - } else { - tag = autoconnectPage.getSharing().getTag(); - } - input = new CVSSyncCompareUnsharedInput(project, getLocation(), moduleName, tag); - } catch (TeamException e) { - throw new InvocationTargetException(e); - } - } else { - input = new CVSSyncCompareInput(new IResource[] {project}); - } - ISyncViewer view = TeamUI.showSyncViewInActivePage(null); - if(view != null) { - view.setSelection(CVSProviderPlugin.getPlugin().getCVSWorkspaceSubscriber(), new IResource[] {project}, ISyncViewer.TREE_VIEW); - } - } - } catch (InterruptedException e) { - return true; - } catch (InvocationTargetException e) { - CVSUIPlugin.openError(getContainer().getShell(), null, null, e); - } - - return result[0]; - } - - /** - * Return an ICVSRepositoryLocation - */ - private ICVSRepositoryLocation getLocation() throws TeamException { - // If there is an autoconnect page then it has the location - if (autoconnectPage != null) { - return autoconnectPage.getLocation(); - } - - // If the import page has a location, use it. - if (locationPage != null) { - ICVSRepositoryLocation location = locationPage.getLocation(); - if (location != null) return location; - } - - // Otherwise, get the location from the create location page - getShell().getDisplay().syncExec(new Runnable() { - public void run() { - createLocationPage.finish(new NullProgressMonitor()); - } - }); - Properties properties = createLocationPage.getProperties(); - ICVSRepositoryLocation location = CVSProviderPlugin.getPlugin().createRepository(properties); - return location; - } - /** - * Return the module name. - */ - private String getModuleName() { - // If there is an autoconnect page then it has the module name - if (autoconnectPage != null) { - return autoconnectPage.getSharing().getRepository(); - } - String moduleName = modulePage.getModuleName(); - if (moduleName == null) moduleName = project.getName(); - return moduleName; - } - /* - * @see IConfigurationWizard#init(IWorkbench, IProject) - */ - public void init(IWorkbench workbench, IProject project) { - this.project = project; - } - private boolean doesCVSDirectoryExist() { - // Determine if there is an existing CVS/ directory from which configuration - // information can be retrieved. - Shell shell = null; - if (getContainer() != null) { - shell = getContainer().getShell(); - } - final boolean[] isCVSFolder = new boolean[] { false }; - try { - CVSUIPlugin.runWithRefresh(shell, new IResource[] { project }, new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - try { - ICVSFolder folder = (ICVSFolder)CVSWorkspaceRoot.getCVSResourceFor(project); - FolderSyncInfo info = folder.getFolderSyncInfo(); - isCVSFolder[0] = info != null; - } catch (final TeamException e) { - throw new InvocationTargetException(e); - } - } - }, null); - } catch (InvocationTargetException e) { - CVSUIPlugin.openError(shell, null, null, e); - } catch (InterruptedException e) { - } - return isCVSFolder[0]; - } - - private FolderSyncInfo getRepositoryInfoFromOneO(IProject project) { - try { - QualifiedName key = new QualifiedName("org.eclipse.vcm.core", "Sharing"); //$NON-NLS-1$ //$NON-NLS-2$ - byte[] syncBytes = ResourcesPlugin.getWorkspace().getSynchronizer().getSyncInfo(key, project); //$NON-NLS-1$ //$NON-NLS-2$ - if (syncBytes != null) { - DataInputStream reader = new DataInputStream(new ByteArrayInputStream(syncBytes)); - String repoType = reader.readUTF(); - String repoLocation = reader.readUTF(); - String stream = reader.readUTF(); - reader.close(); - ResourcesPlugin.getWorkspace().getSynchronizer().flushSyncInfo(key, project, IResource.DEPTH_INFINITE); - if (repoType.equals("CVS")) { //$NON-NLS-1$ - // Get the repository so it is added to the provider - // (in case the user cancels after we purge the old info) - CVSProviderPlugin.getPlugin().getRepository(repoLocation); - CVSTag tag; - if (stream.equals("HEAD")) { //$NON-NLS-1$ - tag = CVSTag.DEFAULT; - } else { - tag = new CVSTag(stream, CVSTag.BRANCH); - } - return new FolderSyncInfo(project.getName(), repoLocation, tag, false); - } - } - } catch (CVSException ex) { - CVSUIPlugin.log(ex); - } catch (CoreException ex) { - // Ignore the core exception since we will get one if the key is not registered - } catch (IOException ex) { - CVSUIPlugin.log(CVSException.wrapException(ex)); - } - return null; - } - - /** - * Method findCommonRootInSubfolders. - * @return String - */ - private void purgeAnyCVSFolders() { - try { - ICVSFolder folder = CVSWorkspaceRoot.getCVSFolderFor(project); - folder.accept(new ICVSResourceVisitor() { - public void visitFile(ICVSFile file) throws CVSException { - // nothing to do for files - } - public void visitFolder(ICVSFolder folder) throws CVSException { - if (folder.isCVSFolder()) { - // for now, just unmanage - folder.unmanage(null); - } - } - }, true /* recurse */); - } catch (CVSException e) { - // log the exception and return null - CVSUIPlugin.log(e); - } - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardFinishPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardFinishPage.java deleted file mode 100644 index ad12bc7b8..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardFinishPage.java +++ /dev/null @@ -1,42 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.wizards; - - -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Label; -import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.ui.help.WorkbenchHelp; - -public class SharingWizardFinishPage extends CVSWizardPage { - public SharingWizardFinishPage(String pageName, String title, ImageDescriptor titleImage) { - super(pageName, title, titleImage); - } - - /* - * @see IDialogPage#createControl(Composite) - */ - public void createControl(Composite parent) { - Composite composite = createComposite(parent, 1); - // set F1 help - WorkbenchHelp.setHelp(composite, IHelpContextIds.SHARING_FINISH_PAGE); - Label label = new Label(composite, SWT.LEFT | SWT.WRAP); - label.setText(Policy.bind("SharingWizardFinishPage.message")); //$NON-NLS-1$ - GridData data = new GridData(); - data.widthHint = 350; - label.setLayoutData(data); - setControl(composite); - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/UpdateWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/UpdateWizard.java deleted file mode 100644 index 8125cccb3..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/UpdateWizard.java +++ /dev/null @@ -1,90 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.wizards; - - -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.jface.dialogs.ProgressMonitorDialog; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.jface.wizard.Wizard; -import org.eclipse.team.core.RepositoryProvider; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSTeamProvider; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.Policy; - -public class UpdateWizard extends Wizard { - - UpdateWizardPage updatePage; - IProject project; - - public UpdateWizard() { - setNeedsProgressMonitor(true); - setWindowTitle(Policy.bind("UpdateWizard.title")); //$NON-NLS-1$ - } - - public void addPages() { - // Provide a progress monitor to indicate what is going on - try { - new ProgressMonitorDialog(getShell()).run(false, false, new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - monitor.beginTask(null, 100); - updatePage = new UpdateWizardPage("updatePage", Policy.bind("UpdateWizard.updatePage"), CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_SHARE)); //$NON-NLS-1$ //$NON-NLS-2$ - updatePage.setProject(project); - addPage(updatePage); - monitor.done(); - } - }); - } catch (InvocationTargetException e) { - CVSUIPlugin.log(IStatus.ERROR, Policy.bind("internal"), e.getTargetException()); //$NON-NLS-1$ - } catch (InterruptedException e) { - // Ignore - } - } - - /* - * @see IWizard#performFinish() - */ - public boolean performFinish() { - final boolean[] result = new boolean[] {false}; - try { - getContainer().run(false, false, new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException { - try { - CVSTeamProvider provider = ((CVSTeamProvider)RepositoryProvider.getProvider(project)); - provider.update(new IResource[] { project }, updatePage.getLocalOptions(), - updatePage.getTag(), true /*createBackups*/, monitor); - result[0] = true; - } catch (TeamException e) { - throw new InvocationTargetException(e); - } finally { - monitor.done(); - } - } - }); - } catch (InterruptedException e) { - return true; - } catch (InvocationTargetException e) { - CVSUIPlugin.openError(getShell(), null, null, e); - } - return result[0]; - } - - public void setProject(IProject project) { - this.project = project; - } -} diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/UpdateWizardPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/UpdateWizardPage.java deleted file mode 100644 index 1ea941248..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/UpdateWizardPage.java +++ /dev/null @@ -1,159 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.wizards; - - -import org.eclipse.core.resources.IProject; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jface.viewers.ViewerSorter; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Tree; -import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder; -import org.eclipse.team.internal.ccvs.core.client.Command; -import org.eclipse.team.internal.ccvs.core.client.Update; -import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.ui.Policy; -import org.eclipse.team.internal.ccvs.ui.TagConfigurationDialog; -import org.eclipse.team.internal.ccvs.ui.merge.ProjectElement; -import org.eclipse.team.internal.ccvs.ui.merge.TagElement; -import org.eclipse.ui.model.WorkbenchContentProvider; -import org.eclipse.ui.model.WorkbenchLabelProvider; - -public class UpdateWizardPage extends CVSWizardPage { - - IProject project; - TreeViewer tree; - CVSTag result; - ICVSRemoteFolder remote; - boolean doOverwrite; - - public UpdateWizardPage(String pageName, String title, ImageDescriptor titleImage) { - super(pageName, title, titleImage); - } - - /* - * @see IDialogPage#createControl(Composite) - */ - public void createControl(Composite parent) { - Composite composite = createComposite(parent, 2); - // set F1 help - // WorkbenchHelp.setHelp(composite, new DialogPageContextComputer (this, ITeamHelpContextIds.REPO_CONNECTION_MAIN_PAGE)); - - Label description = new Label(composite, SWT.WRAP); - GridData data = new GridData(); - data.horizontalSpan = 2; - data.widthHint = 350; - description.setLayoutData(data); - description.setText(Policy.bind("UpdateWizardPage.description")); //$NON-NLS-1$ - - tree = createTree(composite); - tree.setContentProvider(new WorkbenchContentProvider()); - tree.setLabelProvider(new WorkbenchLabelProvider()); - tree.setSorter(new ViewerSorter() { - public int compare(Viewer v, Object o1, Object o2) { - int result = super.compare(v, o1, o2); - if (o1 instanceof TagElement && o2 instanceof TagElement) { - return -result; - } - return result; - } - }); - tree.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - Object selected = ((IStructuredSelection)tree.getSelection()).getFirstElement(); - if (selected instanceof TagElement) { - result = ((TagElement)selected).getTag(); - setPageComplete(true); - } else { - result = null; - setPageComplete(false); - } - } - }); - - createLabel(composite, ""); //$NON-NLS-1$ - createLabel(composite, ""); //$NON-NLS-1$ - - doOverwrite = false; - final Button overwrite = new Button(composite, SWT.CHECK); - data = new GridData(); - data.horizontalSpan = 2; - overwrite.setLayoutData(data); - overwrite.setText(Policy.bind("UpdateWizardPage.overwrite")); //$NON-NLS-1$ - overwrite.setSelection(doOverwrite); - overwrite.addListener(SWT.Selection, new Listener() { - public void handleEvent(Event event) { - doOverwrite = overwrite.getSelection(); - } - }); - - setControl(composite); - tree.setInput(new ProjectElement(CVSWorkspaceRoot.getCVSFolderFor(project), ProjectElement.INCLUDE_ALL_TAGS)); - - Runnable refresh = new Runnable() { - public void run() { - tree.refresh(); - } - }; - TagConfigurationDialog.createTagDefinitionButtons(getShell(), composite, new ICVSFolder[] {CVSWorkspaceRoot.getCVSFolderFor(project)}, - convertVerticalDLUsToPixels(IDialogConstants.BUTTON_HEIGHT), - convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH), refresh, refresh); - - Label seperator = new Label(composite, SWT.SEPARATOR | SWT.HORIZONTAL); - data = new GridData (GridData.FILL_BOTH); - data.horizontalSpan = 2; - seperator.setLayoutData(data); - - setPageComplete(false); - } - - protected TreeViewer createTree(Composite parent) { - Tree tree = new Tree(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER | SWT.SINGLE); - tree.setLayoutData(new GridData(GridData.FILL_BOTH)); - return new TreeViewer(tree); - } - - public void setProject(IProject project) { - this.project = project; - try { - this.remote = (ICVSRemoteFolder) CVSWorkspaceRoot.getRemoteResourceFor(project); - } catch (TeamException e) { - // To do - } - } - - public CVSTag getTag() { - return result; - } - - public LocalOption[] getLocalOptions() { - if (doOverwrite) { - return new LocalOption[] { Update.IGNORE_LOCAL_CHANGES }; - } - return Command.NO_LOCAL_OPTIONS; - } -} |
