Bug 578309: Tidy doc HTML files in /gettingStarted All these have been cleanup up with HTML tidy with: tidy -miq --wrap 120 --tidy-mark no Change-Id: Ie60e36f996058b3b643763e451930a384ffe8f62 Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.common/+/190113 Tested-by: Alexander Kurtakov <akurtako@redhat.com> Reviewed-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/intro/overview.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/intro/overview.htm index d1c6825..3795787 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/intro/overview.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/intro/overview.htm
@@ -1,56 +1,40 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html lang="en"> <head> -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2012. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Eclipse platform overview</title> - -<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"> </script> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2012. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../../book.css" charset="ISO-8859-1" type="text/css"> + <title>Eclipse platform overview</title> + <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script> </head> - -<BODY BGCOLOR="#ffffff"> -<h1>Eclipse platform overview</h1> - -<p>The Eclipse platform itself is structured as subsystems which are implemented -in one or more plug-ins. The subsystems are built on top of a small runtime -engine. The figure below depicts a simplified view. </p> -<p align="center"> -<img alt="Platform runtime base with groups of plug-ins adding function" src="../../images/arch-npi.svg" border="0"> -</p> -<h2>Workbench</h2> -<P>The term <i>Workbench</i> refers to the desktop development environment. -The Workbench aims to achieve seamless tool integration and controlled openness by providing a common paradigm for the creation, management, and navigation of workspace resources.</P> - - -<P> -Each Workbench window contains one or more -perspectives. Perspectives contain views and editors and control -what appears in certain menus and tool bars. More than one Workbench window can exist -on the desktop at any given time.</P> - -<h3 class="related">Related concepts</h3> -<a href="../../concepts/concepts-25.htm">Features</a><br> -<a href="../../concepts/concepts-12.htm">Resources</a><br> -<a href="../../concepts/concepts-4.htm">Perspectives</a><br> -<a href="../../concepts/concepts-5.htm">Views</a><br> -<a href="../../concepts/concepts-6.htm">Editors</a><br> -<a href="../../concepts/concepts-27c.htm">CVS Repositories</a> - -<h3 class="related">Related tasks</h3> -<a href="../../tasks/tasks-124.htm">Installing new software</a><br> -<a href="../../tasks/tasks-9f.htm">Opening perspectives</a><br> -<a href="../../tasks/tasks-3.htm">Opening views</a><br> -<a href="../../tasks/tasks-28.htm">Switching between perspectives</a><br> -<a href="../../tasks/tasks-9n.htm">Showing and hiding menu items and toolbar buttons</a><br> -<a href="../../tasks/tasks-9m.htm">Configuring perspective command groups</a><br> -<a href="../../tasks/tasks-9k.htm">Configuring perspective shortcuts</a> - -<h3 class="related">Related reference</h3> -<a href="../../reference/ref-68.htm">Toolbar buttons</a> - -</BODY> -</HTML> +<body bgcolor="#FFFFFF"> + <h1>Eclipse platform overview</h1> + <p>The Eclipse platform itself is structured as subsystems which are implemented in one or more plug-ins. The + subsystems are built on top of a small runtime engine. The figure below depicts a simplified view.</p> + <p align="center"><img alt="Platform runtime base with groups of plug-ins adding function" src= + "../../images/arch-npi.svg" border="0"></p> + <h2>Workbench</h2> + <p>The term <i>Workbench</i> refers to the desktop development environment. The Workbench aims to achieve seamless + tool integration and controlled openness by providing a common paradigm for the creation, management, and navigation + of workspace resources.</p> + <p>Each Workbench window contains one or more perspectives. Perspectives contain views and editors and control what + appears in certain menus and tool bars. More than one Workbench window can exist on the desktop at any given + time.</p> + <h3 class="related">Related concepts</h3><a href="../../concepts/concepts-25.htm">Features</a><br> + <a href="../../concepts/concepts-12.htm">Resources</a><br> + <a href="../../concepts/concepts-4.htm">Perspectives</a><br> + <a href="../../concepts/concepts-5.htm">Views</a><br> + <a href="../../concepts/concepts-6.htm">Editors</a><br> + <a href="../../concepts/concepts-27c.htm">CVS Repositories</a> + <h3 class="related">Related tasks</h3><a href="../../tasks/tasks-124.htm">Installing new software</a><br> + <a href="../../tasks/tasks-9f.htm">Opening perspectives</a><br> + <a href="../../tasks/tasks-3.htm">Opening views</a><br> + <a href="../../tasks/tasks-28.htm">Switching between perspectives</a><br> + <a href="../../tasks/tasks-9n.htm">Showing and hiding menu items and toolbar buttons</a><br> + <a href="../../tasks/tasks-9m.htm">Configuring perspective command groups</a><br> + <a href="../../tasks/tasks-9k.htm">Configuring perspective shortcuts</a> + <h3 class="related">Related reference</h3><a href="../../reference/ref-68.htm">Toolbar buttons</a> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-01.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-01.htm index 9fb57fa..6041756 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-01.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-01.htm
@@ -1,20 +1,15 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Basic tutorial</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<H1>Basic tutorial</H1> - -<P>This tutorial provides a step by step walk-through of the -Workbench.<br> -</P> -</BODY> -</HTML> \ No newline at end of file +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Basic tutorial</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>Basic tutorial</h1> + <p>This tutorial provides a step by step walk-through of the Workbench.<br></p> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-02a.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-02a.htm index 8aac157..90f222b 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-02a.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-02a.htm
@@ -1,44 +1,35 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>The Workbench</title> -<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"> </script> -</HEAD> - -<BODY BGCOLOR="#ffffff"> -<h1>The Workbench</h1> - -<P CLASS="Para"> When the Workbench is launched, the first thing you see is a - dialog that allows you to select where the workspace should be located. The - workspace is the directory where your work will be stored. For now, just - click OK to pick the default location.</p> -<p>After the workspace location is chosen, a single Workbench window is displayed. - A Workbench window offers one or more perspectives. A perspective contains - editors and views, such as the Project Explorer. Multiple Workbench windows can be - opened simultaneously. Initially, in the first Workbench window that is opened, - the Java perspective is displayed, with only the Welcome view visible. - Click the arrow labeled <b>Workbench</b> in the Welcome view to cause the other - views in the perspective to become visible. Note you can get the Welcome view back at any time by selecting - <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.help.quickStartAction")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> - <b>Help > Welcome</b></a>.</p> -<p>A shortcut bar appears in the top right corner of the window. This allows you - to open new perspectives and switch between ones already open. The name of the - active perspective is shown in the title of the window and its item in the shortcut - bar is highlighted.</p> -<p>You should be seeing the Java perspective. We will switch to the simpler Resource perspective - to simplify this tutorial. Select - <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.ui.resourcePerspective)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> - <b>Window > Perspective > Open Perspective > Other... > Resource</b></a>. - The Project Explorer, Outline, and Tasks views should now be visible. <br> -</p> -<P CLASS="Para"><img src="../images/Image1.png" alt="Workbench" border="0" width="800"></P> -</BODY> -</HTML> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>The Workbench</title> + <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script> +</head> +<body bgcolor="#FFFFFF"> + <h1>The Workbench</h1> + <p class="Para">When the Workbench is launched, the first thing you see is a dialog that allows you to select where + the workspace should be located. The workspace is the directory where your work will be stored. For now, just click + OK to pick the default location.</p> + <p>After the workspace location is chosen, a single Workbench window is displayed. A Workbench window offers one or + more perspectives. A perspective contains editors and views, such as the Project Explorer. Multiple Workbench windows + can be opened simultaneously. Initially, in the first Workbench window that is opened, the Java perspective is + displayed, with only the Welcome view visible. Click the arrow labeled <b>Workbench</b> in the Welcome view to cause + the other views in the perspective to become visible. Note you can get the Welcome view back at any time by selecting + <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.help.quickStartAction")'><img src= + "PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>Help > Welcome</b></a>.</p> + <p>A shortcut bar appears in the top right corner of the window. This allows you to open new perspectives and switch + between ones already open. The name of the active perspective is shown in the title of the window and its item in the + shortcut bar is highlighted.</p> + <p>You should be seeing the Java perspective. We will switch to the simpler Resource perspective to simplify this + tutorial. Select <a class="command-link" href= + 'javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.ui.resourcePerspective)")'> + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>Window > Perspective > Open + Perspective > Other... > Resource</b></a>. The Project Explorer, Outline, and Tasks views should now be + visible.<br></p> + <p class="Para"><img src="../images/Image1.png" alt="Workbench" border="0" width="800"></p> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-02b.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-02b.htm index 2e6a03a..ab65e03 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-02b.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-02b.htm
@@ -1,54 +1,39 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Editors and views</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<h1>Editors and views</h1> - -<P CLASS="Intro">Prior to commencing the Workbench tutorials found in this section, - it is important to first be familiar with the various elements of the Workbench. - A Workbench consists of:</p> -<ul> - <li> - perspectives</li> - <li> - views</li> - <li> - editors</li> -</ul> -<p CLASS="Intro">A perspective is a group of views and editors in -the Workbench window. One or more perspectives can exist in a single Workbench -window. Each perspective contains one or more views and editors. Within a -window, each perspective may have a different set of views but all perspectives -share the same set of editors.</p> -<p CLASS="Intro">A view is a visual component within the Workbench. It is typically - used to navigate a list or hierarchy of information (such as the resources in the Workbench), - or display properties for the active editor. Modifications made in a view are saved immediately.</p> -<p CLASS="Intro">An editor is also a visual component within the Workbench. It is typically used to edit or browse a -resource. The visual presentation might be text or a diagram. -Typically, editors are launched by clicking on a resource in a view. -Modifications made in an editor follow an open-save-close lifecycle model. -</p> -<p CLASS="Intro">Some features are common to both views and editors. We use the - term "part" to mean either a view or an editor. Parts can be active - or inactive, but only one part can be active at any one time. The active - part is the one whose title bar is highlighted. The active part is the target - for common operations like cut, copy and paste. The active part also determines - the contents of the status line. If an editor tab is not highlighted it indicates - the editor is not active, however views may show information based on the last - active editor.</p> -<p CLASS="Intro">In the image below, the Project Explorer view is active. </p> -<p CLASS="Intro"><img src="../images/Image1.png" alt="Workbench" border="0" width="800"></p> -<P CLASS="Intro">Clicking on the Outline view causes the Outline's title bar to - become highlighted and the Project Explorer's title bar to no longer be highlighted. The Outline view is now active. </p> -</p> -</BODY> -</HTML> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Editors and views</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>Editors and views</h1> + <p class="Intro">Prior to commencing the Workbench tutorials found in this section, it is important to first be + familiar with the various elements of the Workbench. A Workbench consists of:</p> + <ul> + <li>perspectives</li> + <li>views</li> + <li>editors</li> + </ul> + <p class="Intro">A perspective is a group of views and editors in the Workbench window. One or more perspectives can + exist in a single Workbench window. Each perspective contains one or more views and editors. Within a window, each + perspective may have a different set of views but all perspectives share the same set of editors.</p> + <p class="Intro">A view is a visual component within the Workbench. It is typically used to navigate a list or + hierarchy of information (such as the resources in the Workbench), or display properties for the active editor. + Modifications made in a view are saved immediately.</p> + <p class="Intro">An editor is also a visual component within the Workbench. It is typically used to edit or browse a + resource. The visual presentation might be text or a diagram. Typically, editors are launched by clicking on a + resource in a view. Modifications made in an editor follow an open-save-close lifecycle model.</p> + <p class="Intro">Some features are common to both views and editors. We use the term "part" to mean either a view or + an editor. Parts can be active or inactive, but only one part can be active at any one time. The active part is the + one whose title bar is highlighted. The active part is the target for common operations like cut, copy and paste. The + active part also determines the contents of the status line. If an editor tab is not highlighted it indicates the + editor is not active, however views may show information based on the last active editor.</p> + <p class="Intro">In the image below, the Project Explorer view is active.</p> + <p class="Intro"><img src="../images/Image1.png" alt="Workbench" border="0" width="800"></p> + <p class="Intro">Clicking on the Outline view causes the Outline's title bar to become highlighted and the Project + Explorer's title bar to no longer be highlighted. The Outline view is now active.</p> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-02e.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-02e.htm index ad7cf32..e7ac4f0 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-02e.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-02e.htm
@@ -1,62 +1,47 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Views</title> -<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"> </script> -</HEAD> - -<BODY BGCOLOR="#ffffff"> -<h1>Views</h1> - -<P CLASS="Para">The primary use of Views is to provide navigation of the information - in the Workbench. For example:</P> -<UL CLASS="UnorderedList"> -<LI CLASS="Item"> -The Bookmarks view displays all bookmarks in the Workbench along with the names -of the files with which the bookmarks are associated.</LI> - <LI CLASS="Item"> The Project Explorer view displays the Workbench projects, their folders and files.</LI> -</UL> -<P CLASS="Para"> -A view might appear by itself or stacked with other views in a tabbed notebook.</P> -<P CLASS="Para"> - <img src="../images/Image3_single.png" width="534" alt="Task View" border="0"> -</P> -<P CLASS="Para"> To activate a view that is part of a tabbed notebook simply click - its tab.</P> -<P CLASS="Para"> - <img src="../images/Image3_tabbed.png" width="272" alt="Two views with tabs, project explorer view active" border="0"> -</P> -<P CLASS="Para">Views have two menus. The first, which is accessed by right clicking on the - view's tab, allows the view to be manipulated in much the - same manner as the menu associated with the Workbench window.</P> -<P CLASS="Para"> - <img src="../images/Image8_view.png" width="272" alt="Project Explorer view menu, top left" border="0"> -</P> -<P CLASS="Para">The second menu, called the "view pull-down menu", is accessed by clicking the down arrow <img src="../images/view_menu.svg" alt="View down arrow" border="0" >. - The view pull-down menu typically contains operations that apply to the entire - contents of the view, but not to a specific item shown in the view. Operations - for sorting and filtering are commonly found in the view pull-down.</P> -<P CLASS="Para"> - <img src="../images/Image7_view_pulldown.png" width="550" alt="Project Explorer view menu, arrow pulldown" border="0"> -</P> -<P CLASS="Para"> A view can be displayed by selecting it from the <b>Window > - Show View</b> menu. A perspective determines which views may be required and - displays these on the <b>Show View</b> sub-menu. Additional views are available - by choosing - <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.views.showView")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> - <b>Other...</b></a> - at the bottom of the <b>Show View</b> sub-menu. This - is just one of the many features that provide for the creation of a custom work - environment. </P> -<P CLASS="Para">Through the normal course of using the Workbench you will open, move, resize, and close views. - If you'd like to restore the perspective back to its original state, you can - select the <b>Window > Perspective > Reset Perspective</b> menu operation.</P> -</BODY> -</HTML> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Views</title> + <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script> +</head> +<body bgcolor="#FFFFFF"> + <h1>Views</h1> + <p class="Para">The primary use of Views is to provide navigation of the information in the Workbench. For + example:</p> + <ul class="UnorderedList"> + <li class="Item">The Bookmarks view displays all bookmarks in the Workbench along with the names of the files with + which the bookmarks are associated.</li> + <li class="Item">The Project Explorer view displays the Workbench projects, their folders and files.</li> + </ul> + <p class="Para">A view might appear by itself or stacked with other views in a tabbed notebook.</p> + <p class="Para"><img src="../images/Image3_single.png" width="534" alt="Task View" border="0"></p> + <p class="Para">To activate a view that is part of a tabbed notebook simply click its tab.</p> + <p class="Para"><img src="../images/Image3_tabbed.png" width="272" alt= + "Two views with tabs, project explorer view active" border="0"></p> + <p class="Para">Views have two menus. The first, which is accessed by right clicking on the view's tab, allows the + view to be manipulated in much the same manner as the menu associated with the Workbench window.</p> + <p class="Para"><img src="../images/Image8_view.png" width="272" alt="Project Explorer view menu, top left" border= + "0"></p> + <p class="Para">The second menu, called the "view pull-down menu", is accessed by clicking the down arrow <img src= + "../images/view_menu.svg" alt="View down arrow" border="0">. The view pull-down menu typically contains operations + that apply to the entire contents of the view, but not to a specific item shown in the view. Operations for sorting + and filtering are commonly found in the view pull-down.</p> + <p class="Para"><img src="../images/Image7_view_pulldown.png" width="550" alt= + "Project Explorer view menu, arrow pulldown" border="0"></p> + <p class="Para">A view can be displayed by selecting it from the <b>Window > Show View</b> menu. A perspective + determines which views may be required and displays these on the <b>Show View</b> sub-menu. Additional views are + available by choosing <a class="command-link" href= + 'javascript:executeCommand("org.eclipse.ui.views.showView")'><img src= + "PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>Other...</b></a> at the bottom of the <b>Show + View</b> sub-menu. This is just one of the many features that provide for the creation of a custom work + environment.</p> + <p class="Para">Through the normal course of using the Workbench you will open, move, resize, and close views. If + you'd like to restore the perspective back to its original state, you can select the <b>Window > Perspective > + Reset Perspective</b> menu operation.</p> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-07a.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-07a.htm index 9da3638..c0c15e1 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-07a.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-07a.htm
@@ -1,28 +1,24 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>A simple project</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<h1> A simple project</h1> - -<P CLASS="Para"> Now that the basic elements of the Workbench have been explained, - here are some instructions for creating a simple project. New projects, folders, - and files can be created using several different approaches. In this section - resources will be created using three different approaches:</P> -<ol> - <li><b>File</b> menu</li> - <li>Project Explorer's view context menu</li> - <li>New Wizard button</li> -</ol> -<P>A project can be created using the <b>File</b> menu. Once the project has been - created a folder and file can be created as well. </P> -</BODY> -</HTML> \ No newline at end of file +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>A simple project</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>A simple project</h1> + <p class="Para">Now that the basic elements of the Workbench have been explained, here are some instructions for + creating a simple project. New projects, folders, and files can be created using several different approaches. In + this section resources will be created using three different approaches:</p> + <ol> + <li><b>File</b> menu</li> + <li>Project Explorer's view context menu</li> + <li>New Wizard button</li> + </ol> + <p>A project can be created using the <b>File</b> menu. Once the project has been created a folder and file can be + created as well.</p> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-07b.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-07b.htm index 5e30a7c..bc858c8 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-07b.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-07b.htm
@@ -1,59 +1,48 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Using the File menu</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<h1>Using the File menu</h1> - -<P CLASS="Para"> -You can create new resources by using the <b>File > New</b> menu on the Workbench menu bar. -Start by creating a simple project as follows:</P> -<ol> - <li> -<P CLASS="Para"> -From the menu bar, select <b>File > New > Project...</b></P> -<P CLASS="Para"> -<img src="../images/Image11_new_wizard.png" width="650" alt="New Project Wizard" border="0"></P> - </li> - <li> - <P CLASS="Para"> In the New Project wizard, select <b>General</b> <strong>></strong> - <b>Project</b> then click <b>Next</b>.</P> - </li> - <li> - <P CLASS="Para"> In the <b> Project name </b> field, type in a name of your new project.</P> - </li> - <li> -<P CLASS="Para"> -Leave the box checked to use the default location for your new project. Click -<b>Finish</b> when you are done.</P> -<P CLASS="Para"> -<img src="../images/Image12_new_project_wizard.png" width="650" alt="New Project Wizard" border="0"></P> -<P CLASS="Para"></P> - </li> -</ol> -<P>If you sneak a peek at the navigation view, you will see that it now contains - the simple project we just created.</P> -<blockquote> - <img src="../images/Image13_project_in_nav.png" width="255" alt="Project Explorer view" border="0"> -</blockquote> - - -<P>Create a second project using the same steps, but instead - of clicking <b>Finish</b>, click <b>Next</b>. At this point you can specify - other projects that your new project depends on. Since we want to create two - independent projects we will not select any of the projects in the <b>Project - References </b> table. Click <b>Finish</b> to create your second simple project. -</P> -<blockquote> - <img src="../images/Image15_project_depend.png" width="650" alt="New Project Wizard" border="0"> -</blockquote> -</BODY> -</HTML> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Using the File menu</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>Using the File menu</h1> + <p class="Para">You can create new resources by using the <b>File > New</b> menu on the Workbench menu bar. Start + by creating a simple project as follows:</p> + <ol> + <li> + <p class="Para">From the menu bar, select <b>File > New > Project...</b></p> + <p class="Para"><img src="../images/Image11_new_wizard.png" width="650" alt="New Project Wizard" border="0"></p> + </li> + <li> + <p class="Para">In the New Project wizard, select <b>General</b> <strong>></strong> <b>Project</b> then click + <b>Next</b>.</p> + </li> + <li> + <p class="Para">In the <b>Project name</b> field, type in a name of your new project.</p> + </li> + <li> + <p class="Para">Leave the box checked to use the default location for your new project. Click <b>Finish</b> when + you are done.</p> + <p class="Para"><img src="../images/Image12_new_project_wizard.png" width="650" alt="New Project Wizard" border= + "0"></p> + <p class="Para"></p> + </li> + </ol> + <p>If you sneak a peek at the navigation view, you will see that it now contains the simple project we just + created.</p> + <blockquote> + <img src="../images/Image13_project_in_nav.png" width="255" alt="Project Explorer view" border="0"> + </blockquote> + <p>Create a second project using the same steps, but instead of clicking <b>Finish</b>, click <b>Next</b>. At this + point you can specify other projects that your new project depends on. Since we want to create two independent + projects we will not select any of the projects in the <b>Project References</b> table. Click <b>Finish</b> to create + your second simple project.</p> + <blockquote> + <img src="../images/Image15_project_depend.png" width="650" alt="New Project Wizard" border="0"> + </blockquote> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-07c.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-07c.htm index 3469a4f..49a12e2 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-07c.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-07c.htm
@@ -1,43 +1,39 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Using the popup</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<h1>Using the popup</h1> - -<P CLASS="Para"> Now that we have our project we will create a folder. We will -create our folder using the Project Explorer view's popup menu.</P> -<ol> - <li> - <P CLASS="Para"> Activate the Project Explorer view and select the first - project we created in the Project Explorer view. From the view's popup - menu choose <b>New > Folder</b>.</P> - </li> - <li> - <P CLASS="Para"> In the New Folder wizard, your project name appears by default - in the <b>Enter or select the parent folder </b> field. This is because - we chose to create the new folder from your project's context menu.</P> - </li> - <li> - <P CLASS="Para"> In the <b>Folder name</b> field, type a unique name for - your new folder. Depending on the operating system you are running on, some characters will not be allowed.</P> - <P CLASS="Para"> <img src="../images/Image14_new_folder_wizard.png" width="650" alt="New Folder Wizard" border="0"></P> - </li> - <li> - <P CLASS="Para"> Click <b>Finish</b> when you are done. The Project Explorer view - will update to show your newly created folder.</P> - </li> -</ol> -<P><strong>Note:</strong> There is also an <b>Advanced >></b> button. This button - when selected allows you to enter a location outside of a project's hierarchy - as the location for one of its folders. This is called a linked folder.</P> -</BODY> -</HTML> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Using the popup</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>Using the popup</h1> + <p class="Para">Now that we have our project we will create a folder. We will create our folder using the Project + Explorer view's popup menu.</p> + <ol> + <li> + <p class="Para">Activate the Project Explorer view and select the first project we created in the Project + Explorer view. From the view's popup menu choose <b>New > Folder</b>.</p> + </li> + <li> + <p class="Para">In the New Folder wizard, your project name appears by default in the <b>Enter or select the + parent folder</b> field. This is because we chose to create the new folder from your project's context menu.</p> + </li> + <li> + <p class="Para">In the <b>Folder name</b> field, type a unique name for your new folder. Depending on the + operating system you are running on, some characters will not be allowed.</p> + <p class="Para"><img src="../images/Image14_new_folder_wizard.png" width="650" alt="New Folder Wizard" border= + "0"></p> + </li> + <li> + <p class="Para">Click <b>Finish</b> when you are done. The Project Explorer view will update to show your newly + created folder.</p> + </li> + </ol> + <p><strong>Note:</strong> There is also an <b>Advanced >></b> button. This button when selected allows you to + enter a location outside of a project's hierarchy as the location for one of its folders. This is called a linked + folder.</p> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-07d.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-07d.htm index d4967a2..c6d4249 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-07d.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-07d.htm
@@ -1,107 +1,98 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Using the New button</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<h1>Using the New button</h1> - -<P CLASS="Para">We have seen how to create resources using <b>File > New</b> - and <b>New</b> from the context menu of one of the navigation views. We will - now create a file for our project using the third alternative, the toolbar <b>New</b> - button.</P> -<ol> - <li> - <P CLASS="Para">Select the just created folder in one of the navigation views.</P> - </li> - <li> - <P CLASS="Para">In the Workbench window's toolbar, activate the drop-down - menu on the New Wizard button <img src="../images/new_wiz.svg" alt="New Wizard Button" border="0"> - and select <b>File</b>. To activate the drop-down menu simply click on the - down arrow.</P> - <P CLASS="Para"> <img src="../images/Image16_new_pulldown.png" width="258" alt="New Wizard Pulldown" border="0"></P> - </li> - <li> - <P CLASS="Para"> In the New File wizard, your folder's name and path already - appear by default in the <b> Enter or select the parent folder </b> field. - This is because you chose to create the new file while this folder was selected - in one of the navigation views and the view was active.</P> - </li> - <li> - <P CLASS="Para"> In the <b> File name</b> field, type a unique name for a - new text file, including the .txt file extension.</P> - </li> - <li> - <P CLASS="Para"> Click <b>Finish</b> when you are done.</P> - </li> - <li> - <P CLASS="Para"> The Workbench has an editor capable of editing text files. - A text editor is automatically opened on the newly created file.</P> - </li> - <li> - <P CLASS="Para"> In the text editor, type in the following five lines:</P> - <blockquote> - <P CLASS="Para"><i>This is a sample text file.<br> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Using the New button</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>Using the New button</h1> + <p class="Para">We have seen how to create resources using <b>File > New</b> and <b>New</b> from the context menu + of one of the navigation views. We will now create a file for our project using the third alternative, the toolbar + <b>New</b> button.</p> + <ol> + <li> + <p class="Para">Select the just created folder in one of the navigation views.</p> + </li> + <li> + <p class="Para">In the Workbench window's toolbar, activate the drop-down menu on the New Wizard button <img src= + "../images/new_wiz.svg" alt="New Wizard Button" border="0"> and select <b>File</b>. To activate the drop-down + menu simply click on the down arrow.</p> + <p class="Para"><img src="../images/Image16_new_pulldown.png" width="258" alt="New Wizard Pulldown" border= + "0"></p> + </li> + <li> + <p class="Para">In the New File wizard, your folder's name and path already appear by default in the <b>Enter or + select the parent folder</b> field. This is because you chose to create the new file while this folder was + selected in one of the navigation views and the view was active.</p> + </li> + <li> + <p class="Para">In the <b>File name</b> field, type a unique name for a new text file, including the .txt file + extension.</p> + </li> + <li> + <p class="Para">Click <b>Finish</b> when you are done.</p> + </li> + <li> + <p class="Para">The Workbench has an editor capable of editing text files. A text editor is automatically opened + on the newly created file.</p> + </li> + <li> + <p class="Para">In the text editor, type in the following five lines:</p> + <blockquote> + <p class="Para"><i>This is a sample text file.<br> There is not much else<br> we can really say about it other<br> than it has five lines of<br> - text that are rather dull.</i></P> - </blockquote> - <P CLASS="Para">Notice that the editor tab has an asterisk (*) at the left - of the filename. The asterisk indicates that the editor has unsaved changes.</P> - <blockquote> - <P CLASS="Para"><img src="../images/Image17b_unsaved_changes.png" width="575" alt="Editor Unsaved Changes" border="0"></P> - </blockquote> - </li> - <li> - <P CLASS="Para"> In the Workbench window's toolbar, click the Save button - <img src="../images/save_edit.svg" alt="Save Button" border="0"> - to save your work.</P> - </li> - <li> - <P CLASS="Para"> In one of the navigation views ensure your folder is still - selected and the navigation view is active.</P> - </li> - <li> - <P CLASS="Para"> Click <strong>New Wizard </strong>in the Workbench toolbar. - Previously we clicked on the drop-down arrow of the New button. Here we - clicked on the button itself which has the same effect as choosing <b>File - > New > Other...</b></P> - </li> - <li> - <P CLASS="Para"> In the New wizard, select <b>General > File</b>. - Then click <b>Next</b>.</P> - </li> - <li> <P CLASS="Para"> Once again, your folder's name and path appears by default in the <b> Enter - or select the parent folder </b> field.</P></li> - <li> - <P CLASS="Para"> In the <b>File name</b> field, type a unique name for an - .ini file. Click Finish when you are done.</P> - </li> - <li> - <P CLASS="Para"> Since the Workbench does not have any editors registered - for .ini files, it may launch an external editor on the file if one is registered - with the operating system. For the moment, close the editor. </P> - </li> -</ol> -<P>Now that we have created our resources, one of the navigation views shows our two projects, - the folder and its two files. To the right of one of the navigation views is the text - editor open on the first file we created. To proceed with the - following example create a second file. </P> - -<P>Click the editor tab of that newly created second file. Now select the .ini file in one of - the navigation views. Then select the <b>Link with Editor</b> <img src="../images/synced.svg" alt="Link with Editor" border="0"> - button in the local toolbar or view menu <img src="../images/view_menu.svg" alt="View Menu" border="0"> - of one of the navigation views. Lastly, click on the editor tab for another file. - Notice how the navigation view updated itself to select the file you are currently - editing. If you don't like this automatic update you can easily turn it off by deselecting <b>Link with Editor</b>.</P> - -</BODY> -</HTML> + text that are rather dull.</i></p> + </blockquote> + <p class="Para">Notice that the editor tab has an asterisk (*) at the left of the filename. The asterisk + indicates that the editor has unsaved changes.</p> + <blockquote> + <p class="Para"><img src="../images/Image17b_unsaved_changes.png" width="575" alt="Editor Unsaved Changes" + border="0"></p> + </blockquote> + </li> + <li> + <p class="Para">In the Workbench window's toolbar, click the Save button <img src="../images/save_edit.svg" alt= + "Save Button" border="0"> to save your work.</p> + </li> + <li> + <p class="Para">In one of the navigation views ensure your folder is still selected and the navigation view is + active.</p> + </li> + <li> + <p class="Para">Click <strong>New Wizard</strong> in the Workbench toolbar. Previously we clicked on the + drop-down arrow of the New button. Here we clicked on the button itself which has the same effect as choosing + <b>File > New > Other...</b></p> + </li> + <li> + <p class="Para">In the New wizard, select <b>General > File</b>. Then click <b>Next</b>.</p> + </li> + <li> + <p class="Para">Once again, your folder's name and path appears by default in the <b>Enter or select the parent + folder</b> field.</p> + </li> + <li> + <p class="Para">In the <b>File name</b> field, type a unique name for an .ini file. Click Finish when you are + done.</p> + </li> + <li> + <p class="Para">Since the Workbench does not have any editors registered for .ini files, it may launch an + external editor on the file if one is registered with the operating system. For the moment, close the editor.</p> + </li> + </ol> + <p>Now that we have created our resources, one of the navigation views shows our two projects, the folder and its two + files. To the right of one of the navigation views is the text editor open on the first file we created. To proceed + with the following example create a second file.</p> + <p>Click the editor tab of that newly created second file. Now select the .ini file in one of the navigation views. + Then select the <b>Link with Editor</b> <img src="../images/synced.svg" alt="Link with Editor" border="0"> button in + the local toolbar or view menu <img src="../images/view_menu.svg" alt="View Menu" border="0"> of one of the + navigation views. Lastly, click on the editor tab for another file. Notice how the navigation view updated itself to + select the file you are currently editing. If you don't like this automatic update you can easily turn it off by + deselecting <b>Link with Editor</b>.</p> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-10b.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-10b.htm index 2b2af81..3b3a345 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-10b.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-10b.htm
@@ -1,61 +1,53 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Closing an editor</title> -<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"> </script> -</HEAD> - -<BODY BGCOLOR="#ffffff"> -<h1>Closing an editor</h1> - -<P CLASS="Para">Now that there are a couple of editors open, here's how to close them.</P> -<ol> - <li> -<P CLASS="Para">Select the editor tab showing the first .txt file.</P> - </li> - <li> -<p CLASS="Para"> -In the text area add a 6th line of text:</p> -<blockquote> - <p CLASS="Para">This is a 6th line</p> -</blockquote> - </li> - <li> - <P CLASS="Para"> To close the editor, choose one of the following options:</P> -<ul> - <li> - <p CLASS="Para"> - Click the close button ("X") - <img src="../images/Image19_close_on_tab.png" width="122" alt="Editor Tab" border="0"> - in the tab of the editor.</p> - </li> - <li> - <p CLASS="Para"> Select <b>File > Close</b> from the menu bar.</p></li> -</ul> - </li> - <li> - <P CLASS="Para"> Note the prompt to save the file before the editor is closed.</P> - </li> - <li> - <P CLASS="Para"> Click OK to save any changes and close the editor.</P> - </li> -</ol> -<P>If the editor was closed using <b>File > Close</b>, notice that the option - <b>File > Close All</b> was also displayed. This is a quick way to close - all of the open editors. If <b>File > Close All</b> is chosen, a prompt will - appear to choose which editors with unsaved changes should be saved. </P> - -<P>The preference to close editors automatically can be found in the - <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Editors)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> - <b>General > Editors</b></a> preference page. There you can configure the number of editors that - can be opened prior to editors being reused and what should occur when all editors - have unsaved changes.</P> -</BODY> -</HTML> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Closing an editor</title> + <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script> +</head> +<body bgcolor="#FFFFFF"> + <h1>Closing an editor</h1> + <p class="Para">Now that there are a couple of editors open, here's how to close them.</p> + <ol> + <li> + <p class="Para">Select the editor tab showing the first .txt file.</p> + </li> + <li> + <p class="Para">In the text area add a 6th line of text:</p> + <blockquote> + <p class="Para">This is a 6th line</p> + </blockquote> + </li> + <li> + <p class="Para">To close the editor, choose one of the following options:</p> + <ul> + <li> + <p class="Para">Click the close button ("X") <img src="../images/Image19_close_on_tab.png" width="122" alt= + "Editor Tab" border="0"> in the tab of the editor.</p> + </li> + <li> + <p class="Para">Select <b>File > Close</b> from the menu bar.</p> + </li> + </ul> + </li> + <li> + <p class="Para">Note the prompt to save the file before the editor is closed.</p> + </li> + <li> + <p class="Para">Click OK to save any changes and close the editor.</p> + </li> + </ol> + <p>If the editor was closed using <b>File > Close</b>, notice that the option <b>File > Close All</b> was also + displayed. This is a quick way to close all of the open editors. If <b>File > Close All</b> is chosen, a prompt + will appear to choose which editors with unsaved changes should be saved.</p> + <p>The preference to close editors automatically can be found in the <a class="command-link" href= + 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Editors)")'> + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>General > Editors</b></a> + preference page. There you can configure the number of editors that can be opened prior to editors being reused and + what should occur when all editors have unsaved changes.</p> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-12.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-12.htm index 4b31649..2f1d7f3 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-12.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-12.htm
@@ -1,30 +1,23 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Navigating resources</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<h1>Navigating resources </h1> - -<P CLASS="Para"> This section will work with the Project Explorer and Tasks views. - These views are initially part of the resource perspective. To experiment with - other views, they can be displayed by using the <b>Window > Show View</b> - menu.</P> -<P CLASS="Para"> -One important view to become familiar with is one of the navigation views, which displays information -about the contents of the Workbench and how the resources relate to each other in a hierarchy.</P> -<P CLASS="Para"> -The Workbench contains projects, which in turn contain folders and/or files. -Projects, folders, and files are collectively called resources.</P> -<P CLASS="Para"> -<img src="../images/Image20_nav_with_resources.png" width="258" alt="Project Explorer View" border="0"></P> - -</BODY> -</HTML> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Navigating resources</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>Navigating resources</h1> + <p class="Para">This section will work with the Project Explorer and Tasks views. These views are initially part of + the resource perspective. To experiment with other views, they can be displayed by using the <b>Window > Show + View</b> menu.</p> + <p class="Para">One important view to become familiar with is one of the navigation views, which displays information + about the contents of the Workbench and how the resources relate to each other in a hierarchy.</p> + <p class="Para">The Workbench contains projects, which in turn contain folders and/or files. Projects, folders, and + files are collectively called resources.</p> + <p class="Para"><img src="../images/Image20_nav_with_resources.png" width="258" alt="Project Explorer View" border= + "0"></p> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-12b.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-12b.htm index a8b3920..f30cc42 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-12b.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-12b.htm
@@ -1,47 +1,40 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Opening resources in the Project Explorer</title> -<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"> </script> -</HEAD> - -<BODY BGCOLOR="#ffffff"> -<h1>Opening resources in the Project Explorer </h1> - -<P CLASS="Para">Using the Project Explorer there are several ways to open an -editor.</P> -<ol> - <li> - <P CLASS="Para">In one of the navigation views select a file</P> - </li> - <li> - <P CLASS="Para"> To open an editor on the file choose one of the following - approaches:</P> - <ul> - <li><p>To edit a resource using the default editor for that resource, either - double click on the resource (in one of the navigation views), or select - the resource and choose <b>Open</b> from its popup menu.; - </p></li> - <li><p>To use a specific editor to edit the resource, start by selecting the - resource in one of the navigation views, and choose the <b>Open With</b> - option from the popup menu. - </p> </li> - </ul> - <p CLASS="Para">The Workbench remembers the last editor that was used for - editing a specific file. This makes it easier to use the same editor down - the road.</p> - </li> -</ol> -<P CLASS="Para"> The default editors can be configured using the -<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.FileEditors)")'> -<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> -<b>General > Editors > File Associations</b></a> preference page. -</P> -</BODY> -</HTML> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Opening resources in the Project Explorer</title> + <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script> +</head> +<body bgcolor="#FFFFFF"> + <h1>Opening resources in the Project Explorer</h1> + <p class="Para">Using the Project Explorer there are several ways to open an editor.</p> + <ol> + <li> + <p class="Para">In one of the navigation views select a file</p> + </li> + <li> + <p class="Para">To open an editor on the file choose one of the following approaches:</p> + <ul> + <li> + <p>To edit a resource using the default editor for that resource, either double click on the resource (in one + of the navigation views), or select the resource and choose <b>Open</b> from its popup menu.;</p> + </li> + <li> + <p>To use a specific editor to edit the resource, start by selecting the resource in one of the navigation + views, and choose the <b>Open With</b> option from the popup menu.</p> + </li> + </ul> + <p class="Para">The Workbench remembers the last editor that was used for editing a specific file. This makes it + easier to use the same editor down the road.</p> + </li> + </ol> + <p class="Para">The default editors can be configured using the <a class="command-link" href= + 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.FileEditors)")'> + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>General > Editors > File + Associations</b></a> preference page.</p> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-12c.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-12c.htm index 1926de3..39daa01 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-12c.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-12c.htm
@@ -1,41 +1,37 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Go To</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<h1>Go To</h1> - -<P CLASS="Para"> The Go To operation makes it easy to jump to a specific resource - in the navigation views.</P> -<ol> - <li> - <P CLASS="Para"> Select one of the navigation views. Its title bar will be - highlighted (according to the operating system's color scheme).</P> - </li> - <li> - <P CLASS="Para">From the menu bar choose <b>Navigate > Go To > Resource...</b>.</P> - </li> - <li> - <P CLASS="Para">In the Go To Resource dialog type the filename into the pattern field at the top of the dialog.</P> - <P CLASS="Para">As the filename is typed, the dialog filters the set of possible matches based on what has been entered so far.</P> - </li> - <li> - <P CLASS="Para"> Select a .txt file from the <b>Matching items</b> field - and click OK or simply press Enter. </P> - <P><img src="../images/Image30_goto_resource.png" width="600" alt="Goto Resource popup" border="0"> - </li> - <li> - <p CLASS="Para"> The navigation view will select the corresponding file </p> - </li> -</ol> -</P> -</BODY> -</HTML> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Go To</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>Go To</h1> + <p class="Para">The Go To operation makes it easy to jump to a specific resource in the navigation views.</p> + <ol> + <li> + <p class="Para">Select one of the navigation views. Its title bar will be highlighted (according to the operating + system's color scheme).</p> + </li> + <li> + <p class="Para">From the menu bar choose <b>Navigate > Go To > Resource...</b>.</p> + </li> + <li> + <p class="Para">In the Go To Resource dialog type the filename into the pattern field at the top of the + dialog.</p> + <p class="Para">As the filename is typed, the dialog filters the set of possible matches based on what has been + entered so far.</p> + </li> + <li> + <p class="Para">Select a .txt file from the <b>Matching items</b> field and click OK or simply press Enter.</p> + <p><img src="../images/Image30_goto_resource.png" width="600" alt="Goto Resource popup" border="0"></p> + </li> + <li> + <p class="Para">The navigation view will select the corresponding file</p> + </li> + </ol> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-13.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-13.htm index 2106ba1..5fd5d3a 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-13.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-13.htm
@@ -1,31 +1,25 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Files</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<h1>Files</h1> - -<p CLASS="Para">The projects, folders and files that you create with the Workbench are - all stored under a single directory that represents your workspace. The location of - the workspace was set in the dialog that first opens when you start the Workbench.</p> -<p>If you have forgotten where that location is, you can find it by selecting - <b>File > Switch Workspace...</b>. The workspace directory will be displayed in - the dialog that appears. - <b>IMPORTANT:</b> After recording this location, hit <b>Cancel</b> to close the dialog, - or the Workbench will exit and re-open on whatever workspace was selected.</p> -<p CLASS="Para">All of the projects, folders and files that you create with the - Workbench are stored as normal directories and files on the machine. This allows - the use of other tools when working with the files. - Those tools can be completely oblivious to the Workbench. A later section will - look at how to work with external editors that are not integrated into the Workbench.</p> - -</BODY> -</HTML> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Files</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>Files</h1> + <p class="Para">The projects, folders and files that you create with the Workbench are all stored under a single + directory that represents your workspace. The location of the workspace was set in the dialog that first opens when + you start the Workbench.</p> + <p>If you have forgotten where that location is, you can find it by selecting <b>File > Switch Workspace...</b>. + The workspace directory will be displayed in the dialog that appears. <b>IMPORTANT:</b> After recording this + location, hit <b>Cancel</b> to close the dialog, or the Workbench will exit and re-open on whatever workspace was + selected.</p> + <p class="Para">All of the projects, folders and files that you create with the Workbench are stored as normal + directories and files on the machine. This allows the use of other tools when working with the files. Those tools can + be completely oblivious to the Workbench. A later section will look at how to work with external editors that are not + integrated into the Workbench.</p> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-31a.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-31a.htm index 7110395..d57b98b 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-31a.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-31a.htm
@@ -1,40 +1,27 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Importing files</title> -<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"> </script> -</HEAD> - -<BODY BGCOLOR="#ffffff"> -<h1>Importing files </h1> -<P CLASS="Para"> Files can be imported into the Workbench either by :</P> -<ul> - <li> - dragging and dropping from the file system, or</li> - <li> - copying and pasting from the file system, or</li> - <li> - Using the - <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.file.import")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> - <b>Import wizard</b></a>.</li> -</ul> -<p>Using drag and drop or copy/paste to import files relies on operating system support - that is not necessarily available on all platforms. If the platform you are using - does not have this support, you can always use the Import wizard.</p> -<p CLASS="Para"> In this section the two files that were just exported will be - imported and placed into the second project JaneQUser2. <br> -</p> - - - - - -</BODY> -</HTML> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Importing files</title> + <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script> +</head> +<body bgcolor="#FFFFFF"> + <h1>Importing files</h1> + <p class="Para">Files can be imported into the Workbench either by :</p> + <ul> + <li>dragging and dropping from the file system, or</li> + <li>copying and pasting from the file system, or</li> + <li>Using the <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.file.import")'><img src= + "PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>Import wizard</b></a>.</li> + </ul> + <p>Using drag and drop or copy/paste to import files relies on operating system support that is not necessarily + available on all platforms. If the platform you are using does not have this support, you can always use the Import + wizard.</p> + <p class="Para">In this section the two files that were just exported will be imported and placed into the second + project JaneQUser2.<br></p> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-31b.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-31b.htm index a12910a..857343b 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-31b.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-31b.htm
@@ -1,56 +1,49 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Drag and drop or copy and paste</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<h1>Drag and drop or copy and paste</h1> - -<P CLASS="Para"> - On some platforms, for example on macOS and Microsoft Windows, - the operating system's file system browser can be used to copy folders and files - from the file system into the Workbench.</P> -<P CLASS="Para"> <strong>Note: </strong>The resource(s) must be dragged to the - exact location in the hierarchy of one of the navigation views where the resources - are to reside; they cannot be simply dragged and dropped onto a blank area in - the navigation view.</P> -<ol> - <li> - <P CLASS="Para"> Open the operating system's file system explorer.</P> - </li> - <li> - <P CLASS="Para"> Locate the file JanesFile.txt that was recently exported - and drag it to a specific location in one of the navigation views in the - Workbench.</P> - <P CLASS="Para"> A dialog appears that allows to determine how the file will be - added to the project, either as a simple copy of the original file or as a link file.</P> - <P CLASS="Para"> <img src="../images/Image_file_operation.png" width="494" alt="File Operation dialog" border="0"></P> - <P CLASS="Para">When dragging resources into one of the navigation views, - the project/folder that the resource is being dropped into will be selected.</P> - <P CLASS="Para"></P> - <P CLASS="Para"> Drag the file over your project and release the mouse button.</P> - </li> - <li> - <P CLASS="Para"> Notice that the file is copied into the Workbench and placed - into JaneQUser2.</P> - </li> - <li>This can also be achieved by copying the file in the file system explorer, - then selecting the destination in the navigation view and choosing <b>Edit - > Paste</b>. </li> -</ol> -<P CLASS="Para">Generally, files and folders can be imported in a project by making -copies under the project folder, or by linking to the original files and folders by creating link files and folders. -When folders are drag and dropped (not only files), the dialog also allows you to create a project hierarchy with virtual folders. -A virtual folder is a folder hierarchy in the Workspace whose files are all links referring to the original file system location.</P> - <blockquote> - <P CLASS="Para"> <img src="../images/Image_file_folder_operation.png" width="494" alt="File and Folder Operation dialog" border="0"></P> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Drag and drop or copy and paste</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>Drag and drop or copy and paste</h1> + <p class="Para">On some platforms, for example on macOS and Microsoft Windows, the operating system's file system + browser can be used to copy folders and files from the file system into the Workbench.</p> + <p class="Para"><strong>Note:</strong> The resource(s) must be dragged to the exact location in the hierarchy of one + of the navigation views where the resources are to reside; they cannot be simply dragged and dropped onto a blank + area in the navigation view.</p> + <ol> + <li> + <p class="Para">Open the operating system's file system explorer.</p> + </li> + <li> + <p class="Para">Locate the file JanesFile.txt that was recently exported and drag it to a specific location in + one of the navigation views in the Workbench.</p> + <p class="Para">A dialog appears that allows to determine how the file will be added to the project, either as a + simple copy of the original file or as a link file.</p> + <p class="Para"><img src="../images/Image_file_operation.png" width="494" alt="File Operation dialog" border= + "0"></p> + <p class="Para">When dragging resources into one of the navigation views, the project/folder that the resource is + being dropped into will be selected.</p> + <p class="Para"></p> + <p class="Para">Drag the file over your project and release the mouse button.</p> + </li> + <li> + <p class="Para">Notice that the file is copied into the Workbench and placed into JaneQUser2.</p> + </li> + <li>This can also be achieved by copying the file in the file system explorer, then selecting the destination in + the navigation view and choosing <b>Edit > Paste</b>.</li> + </ol> + <p class="Para">Generally, files and folders can be imported in a project by making copies under the project folder, + or by linking to the original files and folders by creating link files and folders. When folders are drag and dropped + (not only files), the dialog also allows you to create a project hierarchy with virtual folders. A virtual folder is + a folder hierarchy in the Workspace whose files are all links referring to the original file system location.</p> + <blockquote> + <p class="Para"><img src="../images/Image_file_folder_operation.png" width="494" alt= + "File and Folder Operation dialog" border="0"></p> </blockquote> -</BODY> -</HTML> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-31c.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-31c.htm index 6f54aa3..f258ad7 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-31c.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-31c.htm
@@ -1,68 +1,64 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2016. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Import wizard</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<h1>Import wizard</h1> - -<P CLASS="Para"> The Import wizard can be used to copy resources into the Workbench.</P> -<ol> - <li> - <p CLASS="Para"> Select your project.</p> - </li> - <li> - <P CLASS="Para"> Select <b>Import</b> from the popup.</P> - </li> - <li> - <P CLASS="Para"> In the Import wizard, select <b>File system</b>, then click - <b>Next</b>.</P> - <P CLASS="Para"> <img src="../images/Image38_import.png" width="676" alt="Import Wizard. Import resources from the local file system." border="0"></P> - </li> - <li> - <P CLASS="Para"> In the <b>From directory</b> field, type or browse to select - the directory containing the .ini file that was recently exported.</P> - <P CLASS="Para">Recent directories that have been imported from are shown - on the <b>From directory</b> field's combo box.</P> - </li> - <li> - <P CLASS="Para">In the right pane check the .ini file.</P> - <P CLASS="Para"> Checking a folder in the left pane will import its entire - contents into the Workbench. A partially marked checkbox (as shown below) indicates - that only some of the files in the folder will be imported into the Workbench.</P> - <P CLASS="Para">The <b>Filter Types...</b> button can be used to filter the types - of files that will be imported.</P> - <P CLASS="Para"><img src="../images/Image39_import_tree.png" width="676" alt="Import Wizard. Filter types." border="0"></P> - </li> - <li> - <P CLASS="Para"> The <b>Into folder</b> field should already be filled in - with the name of the project.</P> - </li> - <li> - <P CLASS="Para">The destination project or folder can be changed by clicking - <b>Browse</b>; </P> - <P CLASS="Para">Click the <b>Browse</b> button and choose the second project.</P> - <P CLASS="Para"> <img src="../images/Image40_import_target.png" width="352" alt="Import Wizard. Select a folder to import into." border="0"></P> - </li> - <li> - <P CLASS="Para"> In the <b>Options</b> area, options are given to: </P> - <UL CLASS="UnorderedList"> - <LI CLASS="Item"> Overwrite existing resources without warning </LI> - <LI CLASS="Item"> Create complete folder structure or Create selected folders - only</LI> - </UL> - </li> - <li> - <P CLASS="Para"> Click <b>Finish</b> when done. The .ini file is - now shown in the one of the navigation views in your project.</P> - </li> -</ol> -</BODY> -</HTML> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2016. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Import wizard</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>Import wizard</h1> + <p class="Para">The Import wizard can be used to copy resources into the Workbench.</p> + <ol> + <li> + <p class="Para">Select your project.</p> + </li> + <li> + <p class="Para">Select <b>Import</b> from the popup.</p> + </li> + <li> + <p class="Para">In the Import wizard, select <b>File system</b>, then click <b>Next</b>.</p> + <p class="Para"><img src="../images/Image38_import.png" width="676" alt= + "Import Wizard. Import resources from the local file system." border="0"></p> + </li> + <li> + <p class="Para">In the <b>From directory</b> field, type or browse to select the directory containing the .ini + file that was recently exported.</p> + <p class="Para">Recent directories that have been imported from are shown on the <b>From directory</b> field's + combo box.</p> + </li> + <li> + <p class="Para">In the right pane check the .ini file.</p> + <p class="Para">Checking a folder in the left pane will import its entire contents into the Workbench. A + partially marked checkbox (as shown below) indicates that only some of the files in the folder will be imported + into the Workbench.</p> + <p class="Para">The <b>Filter Types...</b> button can be used to filter the types of files that will be + imported.</p> + <p class="Para"><img src="../images/Image39_import_tree.png" width="676" alt="Import Wizard. Filter types." + border="0"></p> + </li> + <li> + <p class="Para">The <b>Into folder</b> field should already be filled in with the name of the project.</p> + </li> + <li> + <p class="Para">The destination project or folder can be changed by clicking <b>Browse</b>;</p> + <p class="Para">Click the <b>Browse</b> button and choose the second project.</p> + <p class="Para"><img src="../images/Image40_import_target.png" width="352" alt= + "Import Wizard. Select a folder to import into." border="0"></p> + </li> + <li> + <p class="Para">In the <b>Options</b> area, options are given to:</p> + <ul class="UnorderedList"> + <li class="Item">Overwrite existing resources without warning</li> + <li class="Item">Create complete folder structure or Create selected folders only</li> + </ul> + </li> + <li> + <p class="Para">Click <b>Finish</b> when done. The .ini file is now shown in the one of the navigation views in + your project.</p> + </li> + </ol> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-32.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-32.htm index 65b74c7..e464ba1 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-32.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-32.htm
@@ -1,54 +1,46 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Deleting resources</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<h1>Deleting resources</h1> - -<P CLASS="Para">Now that a few files have been imported into the second project, here are instructions on how to delete the project.</P> -<ol> - <li> - <P CLASS="Para">Select your second project in one of the navigation views.</P> - </li> - <li> - <P CLASS="Para"> To delete the project do one of the following:</P> - <ul> - <li> From the project's pop-up menu choose <b>Delete</b> </li> - <li>Press the DEL key </li> - <li>Choose <b>Edit > Delete</b> from the pull-down menu</li> - </ul> - </li> - <li> - <P CLASS="Para"> A prompt will ask for confirmation of the deletion and also - what type of deletion should be performed.</P> - <P CLASS="Para"> It is possible to:</P> - <ul> - <li> - <p CLASS="Para">Delete the contents of the project from the file system</p> - </li> - <li> - <p CLASS="Para">Delete the project from the workspace but keep its contents - in the file system</p> - </li> - <li>Accept the default (do not delete contents) and click <b>Yes</b>.</li> - </ul> - </li> -</ol> -<p><strong>Note:</strong> This is only an option for projects. Files and folders - are always deleted from the file system when deleted.</p> -<P> The same steps work for any resource shown in the navigation view. <br> -</P> - - - - -</BODY> -</HTML> \ No newline at end of file +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Deleting resources</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>Deleting resources</h1> + <p class="Para">Now that a few files have been imported into the second project, here are instructions on how to + delete the project.</p> + <ol> + <li> + <p class="Para">Select your second project in one of the navigation views.</p> + </li> + <li> + <p class="Para">To delete the project do one of the following:</p> + <ul> + <li>From the project's pop-up menu choose <b>Delete</b></li> + <li>Press the DEL key</li> + <li>Choose <b>Edit > Delete</b> from the pull-down menu</li> + </ul> + </li> + <li> + <p class="Para">A prompt will ask for confirmation of the deletion and also what type of deletion should be + performed.</p> + <p class="Para">It is possible to:</p> + <ul> + <li> + <p class="Para">Delete the contents of the project from the file system</p> + </li> + <li> + <p class="Para">Delete the project from the workspace but keep its contents in the file system</p> + </li> + <li>Accept the default (do not delete contents) and click <b>Yes</b>.</li> + </ul> + </li> + </ol> + <p><strong>Note:</strong> This is only an option for projects. Files and folders are always deleted from the file + system when deleted.</p> + <p>The same steps work for any resource shown in the navigation view.<br></p> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-34d.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-34d.htm index 10d177f..04a2853 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-34d.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-34d.htm
@@ -1,59 +1,51 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Editing files outside the Workbench</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<h1>Editing files outside the Workbench</h1> - -<P CLASS="Para"> In a previous section an external editor was launched on a - .ini file by double clicking on it in the Project Explorer. The same external - editor can also be used by launching it outside of the Workbench.</P> -<ol> - <li> - <P CLASS="Para"> Close any editors that are open on the .ini file.</P> - </li> - <li> - <P CLASS="Para"> In the file system explorer, navigate to the directory where - the Workbench was installed and go into the workspace sub-directory.</P> - </li> - <li> - <P CLASS="Para"> Edit the .ini file and save it. Do not use the - Workbench's Project Explorer to open the editor.</P> - </li> - <li> - <P CLASS="Para"> Return to the Workbench and in the Project Explorer view, select - your project.</P> - </li> - <li> - <P CLASS="Para"> Choose <b>Refresh</b> from the project's context menu. This - instructs the Workbench to look for any changes to the project that have - been made in the local file system by external tools.</P> - </li> - <li> - <P CLASS="Para"> Select the .ini file.</P> - </li> - <li> - <p CLASS="Para"> For a little variety choose <b>Open With > Text Editor</b> - from the file's popup menu.</p> - </li> - <li> - <P CLASS="Para"> Observe that the Workbench's own default text editor is opened.</P> - <P CLASS="Para"> In the default text editor verify that the externally made - changes are reflected in the Workbench.</P> - </li> -</ol> -<P>The Workbench stores all of its resources in the local file system. This means - the system file explorer can be used to copy files from the Workbench's workspace - area even when the Workbench is not running. Resources can also be copied into - the workspace directory. Use Refresh to update the Workbench with any changes - made outside the Workbench.</P> -</BODY> -</HTML> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Editing files outside the Workbench</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>Editing files outside the Workbench</h1> + <p class="Para">In a previous section an external editor was launched on a .ini file by double clicking on it in the + Project Explorer. The same external editor can also be used by launching it outside of the Workbench.</p> + <ol> + <li> + <p class="Para">Close any editors that are open on the .ini file.</p> + </li> + <li> + <p class="Para">In the file system explorer, navigate to the directory where the Workbench was installed and go + into the workspace sub-directory.</p> + </li> + <li> + <p class="Para">Edit the .ini file and save it. Do not use the Workbench's Project Explorer to open the + editor.</p> + </li> + <li> + <p class="Para">Return to the Workbench and in the Project Explorer view, select your project.</p> + </li> + <li> + <p class="Para">Choose <b>Refresh</b> from the project's context menu. This instructs the Workbench to look for + any changes to the project that have been made in the local file system by external tools.</p> + </li> + <li> + <p class="Para">Select the .ini file.</p> + </li> + <li> + <p class="Para">For a little variety choose <b>Open With > Text Editor</b> from the file's popup menu.</p> + </li> + <li> + <p class="Para">Observe that the Workbench's own default text editor is opened.</p> + <p class="Para">In the default text editor verify that the externally made changes are reflected in the + Workbench.</p> + </li> + </ol> + <p>The Workbench stores all of its resources in the local file system. This means the system file explorer can be + used to copy files from the Workbench's workspace area even when the Workbench is not running. Resources can also be + copied into the workspace directory. Use Refresh to update the Workbench with any changes made outside the + Workbench.</p> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-35.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-35.htm index cc648c8..857f115 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-35.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-35.htm
@@ -1,43 +1,37 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Copying, renaming and moving</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<h1>Copying, renaming and moving</h1> - -<P CLASS="Para">Workbench resources can be copied, moved and renamed using popup - menu operations in one of the navigation views. In this section several of the - files that have been created will be copied and renamed.</P> -<P CLASS="Para">Prior to copying files, some setup is required:</P> -<p CLASS="Head"><b><a name="Setup">Setup</a></b></p> -<ol> - <li> - <p CLASS="Head">In one of the navigation views, delete the file .doc file. </p> - </li> - <li> - <P CLASS="Para">Double click on the .txt file and ensure that it contains - the following text.</P> - <P><i>This is a sample text file<br> - There is not much else<br> - we can really say about it other<br> - than it has five lines of<br> - text that are rather dull.</i></P> - </li> - <li> - <p CLASS="Head">Close the editor on the .txt file.</p> - </li> - <li> - <p CLASS="Para"> Select your project. Using the project's pop-up - menu create a folder.</p> - </li> -</ol> -</BODY> -</HTML> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Copying, renaming and moving</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>Copying, renaming and moving</h1> + <p class="Para">Workbench resources can be copied, moved and renamed using popup menu operations in one of the + navigation views. In this section several of the files that have been created will be copied and renamed.</p> + <p class="Para">Prior to copying files, some setup is required:</p> + <p class="Head"><b><a name="Setup" id="Setup">Setup</a></b></p> + <ol> + <li> + <p class="Head">In one of the navigation views, delete the file .doc file.</p> + </li> + <li> + <p class="Para">Double click on the .txt file and ensure that it contains the following text.</p> + <p><i>This is a sample text file<br> + There is not much else<br> + we can really say about it other<br> + than it has five lines of<br> + text that are rather dull.</i></p> + </li> + <li> + <p class="Head">Close the editor on the .txt file.</p> + </li> + <li> + <p class="Para">Select your project. Using the project's pop-up menu create a folder.</p> + </li> + </ol> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-35b.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-35b.htm index 555ad23..72d9303 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-35b.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-35b.htm
@@ -1,38 +1,30 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Copying</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<h1>Copying</h1> - -<p CLASS="Head">You can copy files to a folder using the following steps. </p> -<ol> - <li> - <p CLASS="Para"> In one of the navigation views, select the .txt file.</p> - </li> - <li> - <P CLASS="Para"> From the file's context menu, select <b>Copy</b> (or Ctrl+C)</P> - </li> - <li>In one of the navigation views, select another folder as the destination.</li> - <li> - <p CLASS="Head"> From the folder's context menu, select <b>Paste</b> (or Ctrl+V).</p> - </li> -</ol> -<P>As an alternative to copying files using the copy operation, it is also possible - to copy files by holding down the Ctrl key while dragging a file from one folder - to another folder. (On macOS, the ⌥ key is used for this.)</P> -<p>Once the file has been copied it can be renamed.</p> - - - - -</BODY> -</HTML> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Copying</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>Copying</h1> + <p class="Head">You can copy files to a folder using the following steps.</p> + <ol> + <li> + <p class="Para">In one of the navigation views, select the .txt file.</p> + </li> + <li> + <p class="Para">From the file's context menu, select <b>Copy</b> (or Ctrl+C)</p> + </li> + <li>In one of the navigation views, select another folder as the destination.</li> + <li> + <p class="Head">From the folder's context menu, select <b>Paste</b> (or Ctrl+V).</p> + </li> + </ol> + <p>As an alternative to copying files using the copy operation, it is also possible to copy files by holding down the + Ctrl key while dragging a file from one folder to another folder. (On macOS, the ⌥ key is used for this.)</p> + <p>Once the file has been copied it can be renamed.</p> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-35c.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-35c.htm index 181fd11..432e050 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-35c.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-35c.htm
@@ -1,49 +1,41 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Renaming</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<h1>Renaming</h1> -<p CLASS="Head">Now that the .txt file has been copied from one folder to another - it is ready to be renamed as something else.</p> -<ol> - <li> - <p CLASS="Head">In one of the navigation views, select the copied .txt file.</p> - </li> - <li> -<P CLASS="Para"> -From the file's context menu, select <b>Rename</b>.</P> - </li> - <li> - <p CLASS="Para">The navigation view overlays the file's name with a text field. Type - in a new name and press Enter.</p> - <P CLASS="Para">To halt the renaming of a resource, Escape can be pressed - to dismiss the text field.</P> - </li> -</ol> -<P>Copy and rename works on folders as well.</P> -<ol> - <li> - <P CLASS="Para"> In one of the navigation views, select the a folder.</P> - </li> - <li> - <p CLASS="Para"> From the folder's context menu choose <b>Rename</b>.</p> - </li> - <li>Once again the navigation view overlays the folder name with an entry field - to allow the typing in of a new name. Change the folder name to a different one.</li> - <li>Rename the folder back to its original name .</li> -</ol> - - - - -</BODY> -</HTML> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Renaming</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>Renaming</h1> + <p class="Head">Now that the .txt file has been copied from one folder to another it is ready to be renamed as + something else.</p> + <ol> + <li> + <p class="Head">In one of the navigation views, select the copied .txt file.</p> + </li> + <li> + <p class="Para">From the file's context menu, select <b>Rename</b>.</p> + </li> + <li> + <p class="Para">The navigation view overlays the file's name with a text field. Type in a new name and press + Enter.</p> + <p class="Para">To halt the renaming of a resource, Escape can be pressed to dismiss the text field.</p> + </li> + </ol> + <p>Copy and rename works on folders as well.</p> + <ol> + <li> + <p class="Para">In one of the navigation views, select the a folder.</p> + </li> + <li> + <p class="Para">From the folder's context menu choose <b>Rename</b>.</p> + </li> + <li>Once again the navigation view overlays the folder name with an entry field to allow the typing in of a new + name. Change the folder name to a different one.</li> + <li>Rename the folder back to its original name .</li> + </ol> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-35d.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-35d.htm index 7663111..205d277 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-35d.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-35d.htm
@@ -1,35 +1,31 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Moving</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<h1>Moving</h1> -<p CLASS="Head">Having copied and renamed several of the resources, now it's time - to move some resources around. The second folder and its file will be moved to - be a sub-folder of the first folder.</p> -<ol> - <li>In the Project Explorer view, select the second folder. </li> - <li>From the file's context menu, select <b>Move</b>.</li> - <li><p>In the Folder Selection dialog choose the first folder and click <b>OK</b>.</p> - <p CLASS="Para"><img src="../images/Image48_move.png" width="620" alt="Folder dialog" border="0"></p> - </li> - <li>In the Project Explorer frist folder now contains the second one. Expand -the second folder and confirm that it contains your .txt file. - <p><img src="../images/Image48_rename_done.png" width="352" alt="Project Explorer view" border="0"></p> - </li> -</ol> -<P>As an alternative to moving files using the move operation, it is also possible - to move files by dragging a file from one folder to another folder. Remember - that to copy files from one folder to the other, Ctrl needs to be held down - while performing the drag and drop operation. (On macOS, the ⌥ - key is used for this.) </P> -</BODY> -</HTML> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Moving</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>Moving</h1> + <p class="Head">Having copied and renamed several of the resources, now it's time to move some resources around. The + second folder and its file will be moved to be a sub-folder of the first folder.</p> + <ol> + <li>In the Project Explorer view, select the second folder.</li> + <li>From the file's context menu, select <b>Move</b>.</li> + <li> + <p>In the Folder Selection dialog choose the first folder and click <b>OK</b>.</p> + <p class="Para"><img src="../images/Image48_move.png" width="620" alt="Folder dialog" border="0"></p> + </li> + <li>In the Project Explorer frist folder now contains the second one. Expand the second folder and confirm that it + contains your .txt file. + <p><img src="../images/Image48_rename_done.png" width="352" alt="Project Explorer view" border="0"></p> + </li> + </ol> + <p>As an alternative to moving files using the move operation, it is also possible to move files by dragging a file + from one folder to another folder. Remember that to copy files from one folder to the other, Ctrl needs to be held + down while performing the drag and drop operation. (On macOS, the ⌥ key is used for this.)</p> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-36.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-36.htm index 842a7fb..d06eb1e 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-36.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-36.htm
@@ -1,33 +1,27 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"><head> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<meta http-equiv="Content-Style-Type" content="text/css"> - -<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"><title>Searching</title></head> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Searching</title> +</head> <body> - -<h1>Searching</h1> - -<p>Text strings and files can be searched for in the Workbench in two different ways:</p> -<ul> - <li>Using the <strong>Search Button</strong><img src="../images/search.svg" alt="Search button" border="0"> - and Search view</li> - <li>Using the Quick Text Search Dialog</li> -</ul> - -<p>In this section, we discuss both.</p> - -<p>First, we start showing how -<strong>Search </strong><img src="../images/search.svg" alt="Search button" border="0"> -can be used to perform a text search across the resources that are shown in -the navigation view. Instruction will also be given on how to use the Search -view to work with the results.</p> - -<p>Second, we will also explain how to use the <a href="qs-36c.htm">Quick Text Search</a> as an alternative to -the standard search. The Quick Text Search is a popup dialog especially suited to find and jump to different -places in your workspace quickly. -</p> - -</body></html> + <h1>Searching</h1> + <p>Text strings and files can be searched for in the Workbench in two different ways:</p> + <ul> + <li>Using the <strong>Search Button</strong><img src="../images/search.svg" alt="Search button" border="0"> and + Search view</li> + <li>Using the Quick Text Search Dialog</li> + </ul> + <p>In this section, we discuss both.</p> + <p>First, we start showing how <strong>Search</strong> <img src="../images/search.svg" alt="Search button" border= + "0"> can be used to perform a text search across the resources that are shown in the navigation view. Instruction + will also be given on how to use the Search view to work with the results.</p> + <p>Second, we will also explain how to use the <a href="qs-36c.htm">Quick Text Search</a> as an alternative to the + standard search. The Quick Text Search is a popup dialog especially suited to find and jump to different places in + your workspace quickly.</p> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-36a.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-36a.htm index 4b45309..bf37ea3 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-36a.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-36a.htm
@@ -1,48 +1,40 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Starting a search</title> - -</HEAD> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Starting a search</title> +</head> <body> -<h1>Starting a search</h1> - -<p>Text strings can be searched for in the Workbench as follows:</p> - -<ol> - <li>In the Workbench toolbar, click the search button <img src="../images/search.svg" alt="Search button" border="0">.</li> - <li>In the <b>Containing text</b> field, type in: <i>it</i> <br> - The combo box for the <b>Containing text</b> field also displays a list of - recently performed searches to select from.<br> - <li> The <b>Case sensitive</b> checkbox can be selected or unselected depending - on whether or not a case sensitive or insensitive search is to be performed. - You can also select the <b>Regular expression</b> checkbox to enable more powerful searching - capabilities. To see what is available in regular expression mode, you can hit - Ctrl-Space over the text field to get content assistance that lists the possibilities. - For this example, just check the <b>Case sensitive</b> box to search for lowercase - "<i>it</i>".</li> - <li> The kinds of files to include in the search can be specified in the <b>File - name patterns</b> field. Click <b>Choose...</b> to open the Select Types dialog. - This dialog provides a quick way to select from a list of registered extensions. - For the moment, the search will be confined to .txt files. Ensure *.txt is - checked and click <b>OK</b>.</li> - <li>In the <b>Scope</b> field, specify the files and folders to include in the - search. The choices are: the entire workspace, the currently selected resources - in the Workbench, or a working set which is a named, customized group of files - and folders. Leave the scope as workspace.</li> - <li> Use the <b>Customize</b> button to choose what kinds of searches are available - in the dialog. This setting may be left unchanged.</li> - <li>Click <b>Search</b>. At this point, the Search view will be made visible, - and it will begin to fill in with the results of the search. The stop button - in the Search view can be clicked to cancel the search while it is in progress. - </li> -</ol> -<p> The next section will describe how to work with the Search view.</p> -</BODY> -</HTML> + <h1>Starting a search</h1> + <p>Text strings can be searched for in the Workbench as follows:</p> + <ol> + <li>In the Workbench toolbar, click the search button <img src="../images/search.svg" alt="Search button" border= + "0">.</li> + <li>In the <b>Containing text</b> field, type in: <i>it</i><br> + The combo box for the <b>Containing text</b> field also displays a list of recently performed searches to select + from.<br></li> + <li>The <b>Case sensitive</b> checkbox can be selected or unselected depending on whether or not a case sensitive + or insensitive search is to be performed. You can also select the <b>Regular expression</b> checkbox to enable more + powerful searching capabilities. To see what is available in regular expression mode, you can hit Ctrl-Space over + the text field to get content assistance that lists the possibilities. For this example, just check the <b>Case + sensitive</b> box to search for lowercase "<i>it</i>".</li> + <li>The kinds of files to include in the search can be specified in the <b>File name patterns</b> field. Click + <b>Choose...</b> to open the Select Types dialog. This dialog provides a quick way to select from a list of + registered extensions. For the moment, the search will be confined to .txt files. Ensure *.txt is checked and click + <b>OK</b>.</li> + <li>In the <b>Scope</b> field, specify the files and folders to include in the search. The choices are: the entire + workspace, the currently selected resources in the Workbench, or a working set which is a named, customized group + of files and folders. Leave the scope as workspace.</li> + <li>Use the <b>Customize</b> button to choose what kinds of searches are available in the dialog. This setting may + be left unchanged.</li> + <li>Click <b>Search</b>. At this point, the Search view will be made visible, and it will begin to fill in with the + results of the search. The stop button in the Search view can be clicked to cancel the search while it is in + progress.</li> + </ol> + <p>The next section will describe how to work with the Search view.</p> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-36b.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-36b.htm index 8aceea6..12262b2 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-36b.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-36b.htm
@@ -1,57 +1,39 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> <head> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - - <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> - <META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - <LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> - - <title>The Search view</title> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>The Search view</title> </head> - <body> - -<h1>The Search view</h1> - -<p>Now that the search has been completed, the Search view - is visible. The title of the Search view shows that four matches were found.</p> -<p CLASS="Head"> Within the Search view two files are shown and within each file - there were 2 matches found.</p> - <ol> - <li>Click the Show Next Match button <img src="../images/next_nav2.svg" alt="Show next match button" border="0"> to - navigate to the first match of the search expression. <br> - Notice that the corresponding file is automatically selected and opened in - the editor area. <br> - Click Show Next Match button two more times. Once again the Search view automatically - opens the file.</li> - <li>It is sometimes useful to remove uninteresting matches from the search results. - The Search view's popup menu allows you to do this using <b>Remove Selected - Matches</b> which removes any selected file entries (and all matches in them) - from the Search view. Note that this <strong>only</strong> removes the entries - in the Search view, it does <strong>not</strong> affect the files themselves. - Select the corresponding entry in the Search view and choose <b>Remove Selected Matches</b> from the popup - menu. The Search view now shows only the remaining matches. - </li> - <li>Perform a second search for another search term by clicking on the Search button - <img src="../images/search.svg" alt="Search button" border="0"> in the Workbench's toolbar.</li> - <li>The Search view updates to show the results of the new search. <br> - Use the drop down button on the Search view's toolbar to move back and forth - between the two search results. - </li> - <li>In the drop down button choose the first search. The Search - view switches back to show the original search. On the context menu choose - <b>Search Again</b> to repeat the initial search.</li> -</ol> -<p>So far you have seen how to manage your search results and how to switch between -different searches. However, it might happen that you do not want the search view to -change even if further searches are performed. For this you can <strong>pin</strong> -the search view, which causes subsequent searches to be shown in a second Search -view.</p> -<p> - In the next section we will show how to use the Quick Text Search Dialog as an - alternative to Search Dialog and Search View. -</p> - + <h1>The Search view</h1> + <p>Now that the search has been completed, the Search view is visible. The title of the Search view shows that four + matches were found.</p> + <p class="Head">Within the Search view two files are shown and within each file there were 2 matches found.</p> + <ol> + <li>Click the Show Next Match button <img src="../images/next_nav2.svg" alt="Show next match button" border="0"> to + navigate to the first match of the search expression.<br> + Notice that the corresponding file is automatically selected and opened in the editor area.<br> + Click Show Next Match button two more times. Once again the Search view automatically opens the file.</li> + <li>It is sometimes useful to remove uninteresting matches from the search results. The Search view's popup menu + allows you to do this using <b>Remove Selected Matches</b> which removes any selected file entries (and all matches + in them) from the Search view. Note that this <strong>only</strong> removes the entries in the Search view, it does + <strong>not</strong> affect the files themselves. Select the corresponding entry in the Search view and choose + <b>Remove Selected Matches</b> from the popup menu. The Search view now shows only the remaining matches.</li> + <li>Perform a second search for another search term by clicking on the Search button <img src= + "../images/search.svg" alt="Search button" border="0"> in the Workbench's toolbar.</li> + <li>The Search view updates to show the results of the new search.<br> + Use the drop down button on the Search view's toolbar to move back and forth between the two search results.</li> + <li>In the drop down button choose the first search. The Search view switches back to show the original search. On + the context menu choose <b>Search Again</b> to repeat the initial search.</li> + </ol> + <p>So far you have seen how to manage your search results and how to switch between different searches. However, it + might happen that you do not want the search view to change even if further searches are performed. For this you can + <strong>pin</strong> the search view, which causes subsequent searches to be shown in a second Search view.</p> + <p>In the next section we will show how to use the Quick Text Search Dialog as an alternative to Search Dialog and + Search View.</p> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-36c.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-36c.htm index b0717d0..b1ee7a0 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-36c.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-36c.htm
@@ -1,76 +1,47 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Starting a Quick Text Search</title> - -</HEAD> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Starting a Quick Text Search</title> +</head> <body> -<h1>Starting a Quick Text Search</h1> - -<p>Quick Text Search is a convenient alternative to Search Dialong and Search View. -It provides a popup dialog that is especially well-suited to jump around the workspace -quickly using textual matches. -</p> - -<p>A Quick Text Search can usually be started by pressing its keyboard shortut CTRL-ALT-SHIFT-L ( -or CMD-ALT-SHIFT-L on Mac). This will popup the following dialog: -</p> - -<p> - <img src="../images/quick-text-search.png" alt="Quick Text Search dialog" border="0"> -</p> - -<p>To run a workspace-wide Quick Text Search, simply type text in the main search field and you'll see - the list of possible matches updated live as you type. You can also select some text in a Eclipse view - or editor prior to opening the dialog. The selected text will be entered automatically into the - search box.</p> - -<p>The dialog has these features:</p> - -<ul> - <li>A main search box in which you can enter a search string. The string can contain <code>*</code> and <code>?</code> - wildcard characters. These characters will be interpreted in the usual way (<code>*</code> matches any - sequence of characters and <code>?</code> matches any single character). - </li> - <li>The 'In:' input allows limiting the search scope to files who's path/name matches any of - a list of patterns. The syntax is the same as that used in '.gitignore' inclusion patterns. - Multiple patterns can be entered and are separated by commas. The patterns are matched - against workspace paths. So you can use a pattern like <code>/project-name/**</code> to search files - in a specific project. - </li> - <li> - A table of 'Matching Items'. You can select items in the table by clicking on them or - using the arrow up/down keys. The contents of the table is updated in real time, as you type - in the search box. - </li> - <li> - A 'Open' button. Clicking this will open the currently selected match in a editor. - If no match is currently selected, the first match will be opened instead. - This action can also be invoked by pressing - the 'Enter' key rather than clicking the button. By default the dialog is 'modal' - and it will close upon invoking this action. - </li> - <li> - A pull-down menu provides options to: - <ul> - <li>Switch between case-sensitive versus case-insensitive matching</li> - <li>Keep the dialog open (i.e. the dialog becomes 'non-modal' and does not close after selecting an item and - opening it.</li> - </ul> - </li> - <li> - A 'Refresh' button. This can be useful to manually trigger the dialog to refresh its matches. - This may be especially useful if you are using the dialog in a 'non-modal' - way (because the non-modal dialog may remain open for extended periods of time, but its matches are not - automatically refreshed if the file content is changed). - </li> -</ul> - -</BODY> -</HTML> + <h1>Starting a Quick Text Search</h1> + <p>Quick Text Search is a convenient alternative to Search Dialong and Search View. It provides a popup dialog that + is especially well-suited to jump around the workspace quickly using textual matches.</p> + <p>A Quick Text Search can usually be started by pressing its keyboard shortut CTRL-ALT-SHIFT-L ( or CMD-ALT-SHIFT-L + on Mac). This will popup the following dialog:</p> + <p><img src="../images/quick-text-search.png" alt="Quick Text Search dialog" border="0"></p> + <p>To run a workspace-wide Quick Text Search, simply type text in the main search field and you'll see the list of + possible matches updated live as you type. You can also select some text in a Eclipse view or editor prior to opening + the dialog. The selected text will be entered automatically into the search box.</p> + <p>The dialog has these features:</p> + <ul> + <li>A main search box in which you can enter a search string. The string can contain <code>*</code> and + <code>?</code> wildcard characters. These characters will be interpreted in the usual way (<code>*</code> matches + any sequence of characters and <code>?</code> matches any single character).</li> + <li>The 'In:' input allows limiting the search scope to files who's path/name matches any of a list of patterns. + The syntax is the same as that used in '.gitignore' inclusion patterns. Multiple patterns can be entered and are + separated by commas. The patterns are matched against workspace paths. So you can use a pattern like + <code>/project-name/**</code> to search files in a specific project.</li> + <li>A table of 'Matching Items'. You can select items in the table by clicking on them or using the arrow up/down + keys. The contents of the table is updated in real time, as you type in the search box.</li> + <li>A 'Open' button. Clicking this will open the currently selected match in a editor. If no match is currently + selected, the first match will be opened instead. This action can also be invoked by pressing the 'Enter' key + rather than clicking the button. By default the dialog is 'modal' and it will close upon invoking this action.</li> + <li>A pull-down menu provides options to: + <ul> + <li>Switch between case-sensitive versus case-insensitive matching</li> + <li>Keep the dialog open (i.e. the dialog becomes 'non-modal' and does not close after selecting an item and + opening it.</li> + </ul> + </li> + <li>A 'Refresh' button. This can be useful to manually trigger the dialog to refresh its matches. This may be + especially useful if you are using the dialog in a 'non-modal' way (because the non-modal dialog may remain open + for extended periods of time, but its matches are not automatically refreshed if the file content is changed).</li> + </ul> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-37-2b.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-37-2b.htm index eda7be4..68cba49 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-37-2b.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-37-2b.htm
@@ -1,25 +1,20 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Tasks and markers</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<h1>Tasks and markers</h1> -<P CLASS="Para"> There are various types of markers including bookmarks, task - markers, debugging breakpoints and problems. This section will focus on tasks - and the Tasks view.</P> -<P CLASS="Para"> The Tasks view displays all the tasks in the Workbench. - The view displays tasks associated with specific files, specific lines in specific - files, as well as generic tasks that are not associated with any specific file.</P> -<P> - <img src="../images/Image3_single.png" width="514" alt="Task view" border="0"> -</P> -</BODY> -</HTML> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Tasks and markers</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>Tasks and markers</h1> + <p class="Para">There are various types of markers including bookmarks, task markers, debugging breakpoints and + problems. This section will focus on tasks and the Tasks view.</p> + <p class="Para">The Tasks view displays all the tasks in the Workbench. The view displays tasks associated with + specific files, specific lines in specific files, as well as generic tasks that are not associated with any specific + file.</p> + <p><img src="../images/Image3_single.png" width="514" alt="Task view" border="0"></p> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-37-2d.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-37-2d.htm index 7a8ea2d..8ef60f1 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-37-2d.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-37-2d.htm
@@ -1,28 +1,25 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Unassociated tasks</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<h1>Unassociated tasks</h1> -<P CLASS="Para"> -Unassociated tasks are not associated with any specific resource. To create an -unassociated task: </P> -<ol> - <li> - <P CLASS="Para"> In the Tasks view, choose <b>Add Task...</b> from the context menu. A new task dialog appears. </P> - </li> - <li> - <P CLASS="Para"> Type a brief description for the task and press Enter. To - cancel the dialog while entering the description press Escape . The new - task appears in the Tasks view.</P> -</ol> -</BODY> -</HTML> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Unassociated tasks</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>Unassociated tasks</h1> + <p class="Para">Unassociated tasks are not associated with any specific resource. To create an unassociated task:</p> + <ol> + <li> + <p class="Para">In the Tasks view, choose <b>Add Task...</b> from the context menu. A new task dialog + appears.</p> + </li> + <li> + <p class="Para">Type a brief description for the task and press Enter. To cancel the dialog while entering the + description press Escape . The new task appears in the Tasks view.</p> + </li> + </ol> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-37-2d2.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-37-2d2.htm index bca6523..7c4bf64 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-37-2d2.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-37-2d2.htm
@@ -1,77 +1,65 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Associated tasks</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<h1>Associated tasks</h1> -<P CLASS="Para"> Associated tasks are associated with a specific location in a - resource. To associate a task with a file:</P> -<ol> - <li> - <P CLASS="Para"> Open a text file by double clicking on it in one of the navigation views.</P> - </li> - <li> - <P CLASS="Para"> In the editor area directly to the left of any line in the - text editor, access the context menu from the marker bar. The marker bar - is the vertical bar to the left of the main text area.</P> - </li> - <li> - <P CLASS="Para"> From the marker bar's context menu, select <b>Add Task...</b>.</P> - <P CLASS="Para"> The marker bar displays any marker including bookmarks, task - markers (for associated tasks), and/or debugging breakpoints. Various markers - can be associated with specific lines in a file by accessing the context - menu from the marker bar directly to the left of that line.</P> - </li> - <li> - <P CLASS="Para"> In the <b>Description</b> field, type a brief description - for the task that will be associated with that line in the text file.</P> - </li> - <li> - <P CLASS="Para"> Click <b>OK</b> when done.</P> - </li> - <li> - <P CLASS="Para"> Notice that a new task marker appears in the marker bar, - directly to the left of the line where the task was added. Also, notice - that the new task appears in the Tasks view.</P> - </li> - <li> - <P CLASS="Para"> After the new task has been added, click in the editor on - the first line or any other line above the line with which the new task - is associated.</P> - </li> - <li> - <P CLASS="Para"> Add several lines of text to the file at this point.</P> - </li> - <li> - <P CLASS="Para"> Notice that as lines of text are added above it, the task - marker moves down in the marker bar in order to remain with the associated - line in the file. The line number in the Tasks view is updated when the - file is saved.</P> - </li> - <li> - <P CLASS="Para"> In the Tasks view, access the context menu for the task that - was just created.</P> - </li> - <li> - <P CLASS="Para"> Select <b>Mark Completed</b>. </P> - </li> - <li>Now select <b>Delete Completed Tasks</b> from the marker's context menu.</li> - <li> - <P CLASS="Para"> Notice that the task marker disappears from the marker bar - and the task is removed from the Tasks view.</P> - </li> -</ol> - - - - -</BODY> -</HTML> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Associated tasks</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>Associated tasks</h1> + <p class="Para">Associated tasks are associated with a specific location in a resource. To associate a task with a + file:</p> + <ol> + <li> + <p class="Para">Open a text file by double clicking on it in one of the navigation views.</p> + </li> + <li> + <p class="Para">In the editor area directly to the left of any line in the text editor, access the context menu + from the marker bar. The marker bar is the vertical bar to the left of the main text area.</p> + </li> + <li> + <p class="Para">From the marker bar's context menu, select <b>Add Task...</b>.</p> + <p class="Para">The marker bar displays any marker including bookmarks, task markers (for associated tasks), + and/or debugging breakpoints. Various markers can be associated with specific lines in a file by accessing the + context menu from the marker bar directly to the left of that line.</p> + </li> + <li> + <p class="Para">In the <b>Description</b> field, type a brief description for the task that will be associated + with that line in the text file.</p> + </li> + <li> + <p class="Para">Click <b>OK</b> when done.</p> + </li> + <li> + <p class="Para">Notice that a new task marker appears in the marker bar, directly to the left of the line where + the task was added. Also, notice that the new task appears in the Tasks view.</p> + </li> + <li> + <p class="Para">After the new task has been added, click in the editor on the first line or any other line above + the line with which the new task is associated.</p> + </li> + <li> + <p class="Para">Add several lines of text to the file at this point.</p> + </li> + <li> + <p class="Para">Notice that as lines of text are added above it, the task marker moves down in the marker bar in + order to remain with the associated line in the file. The line number in the Tasks view is updated when the file + is saved.</p> + </li> + <li> + <p class="Para">In the Tasks view, access the context menu for the task that was just created.</p> + </li> + <li> + <p class="Para">Select <b>Mark Completed</b>.</p> + </li> + <li>Now select <b>Delete Completed Tasks</b> from the marker's context menu.</li> + <li> + <p class="Para">Notice that the task marker disappears from the marker bar and the task is removed from the Tasks + view.</p> + </li> + </ol> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-37-2f.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-37-2f.htm index b831467..b59ad68 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-37-2f.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-37-2f.htm
@@ -1,31 +1,21 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Opening files</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<h1>Opening files</h1> -<P CLASS="Para"> -The Tasks view provides two approaches for opening the file associated with a -task:</P> -<ul> - <li> Select the task, and from the context menu choose <b>Go To</b></li> - <li> - Double click on the task</li> -</ul> -<p CLASS="Para">In both cases the file's editor is opened and the line with which the selected task is associated is highlighted. -<br> -</p> - - - - -</BODY> -</HTML> \ No newline at end of file +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Opening files</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>Opening files</h1> + <p class="Para">The Tasks view provides two approaches for opening the file associated with a task:</p> + <ul> + <li>Select the task, and from the context menu choose <b>Go To</b></li> + <li>Double click on the task</li> + </ul> + <p class="Para">In both cases the file's editor is opened and the line with which the selected task is associated is + highlighted.<br></p> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-37-3b.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-37-3b.htm index 79ce177..7b77baf 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-37-3b.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-37-3b.htm
@@ -1,22 +1,18 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Bookmarks</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<h1>Bookmarks</h1> -<P CLASS="Para"> Bookmarks are a simple way to navigate to resources that are - used frequently. This section will look at setting and removing bookmarks and - viewing them in the Bookmarks view.</P> -<P CLASS="Para"> The Bookmarks view displays all bookmarks in the Workbench. - To show the Bookmarks view select <b>Window > Show View > Bookmarks</b> - while in the Resource perspective.</P> -</BODY> -</HTML> \ No newline at end of file +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Bookmarks</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>Bookmarks</h1> + <p class="Para">Bookmarks are a simple way to navigate to resources that are used frequently. This section will look + at setting and removing bookmarks and viewing them in the Bookmarks view.</p> + <p class="Para">The Bookmarks view displays all bookmarks in the Workbench. To show the Bookmarks view select + <b>Window > Show View > Bookmarks</b> while in the Resource perspective.</p> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-37-3c.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-37-3c.htm index 4308879..4486bfd 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-37-3c.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-37-3c.htm
@@ -1,49 +1,41 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Adding and viewing bookmarks</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> - -<h1>Adding and viewing bookmarks</h1> -<p CLASS="Head">The Workbench allows the bookmarking of individual files or locations - within a file. This section will demonstrate how to set several bookmarks and - how to view them using the Bookmarks view.</p> -<ol> - <li> -<p CLASS="Head">From the menu bar, select <b>Window > Show View > Bookmarks</b>. The -Bookmarks view appears in the Workbench.</p> - </li> - <li> - <P CLASS="Para"> Edit a file.</P> - </li> - <li> - <P CLASS="Para"> Position the cursor over the editor's marker bar next to - any line in the file. Then, from the context menu on the marker bar, select - <b>Add Bookmark</b>.</P> -<P CLASS="Para">When the Add Bookmark dialog opens type in a description for -this bookmark. Type in "My Bookmark".</P> - </li> - <li> -<P CLASS="Para"> -Notice that a new bookmark appears in the marker bar.</P> -<P CLASS="Para"> -The new bookmark also appears in the Bookmarks view.</P> - </li> - <li> - <P CLASS="Para"> In one of the navigation views select the just edited file. From - the main Workbench menu select <strong>Edit > </strong><b>Add Bookmark</b>.</P> -<P CLASS="Para"> -This will bookmark the file using the filename to describe the bookmark. Observe the Bookmarks view now contains two -bookmarks.</P> - </li> -</ol> -</BODY> -</HTML> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Adding and viewing bookmarks</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>Adding and viewing bookmarks</h1> + <p class="Head">The Workbench allows the bookmarking of individual files or locations within a file. This section + will demonstrate how to set several bookmarks and how to view them using the Bookmarks view.</p> + <ol> + <li> + <p class="Head">From the menu bar, select <b>Window > Show View > Bookmarks</b>. The Bookmarks view appears + in the Workbench.</p> + </li> + <li> + <p class="Para">Edit a file.</p> + </li> + <li> + <p class="Para">Position the cursor over the editor's marker bar next to any line in the file. Then, from the + context menu on the marker bar, select <b>Add Bookmark</b>.</p> + <p class="Para">When the Add Bookmark dialog opens type in a description for this bookmark. Type in "My + Bookmark".</p> + </li> + <li> + <p class="Para">Notice that a new bookmark appears in the marker bar.</p> + <p class="Para">The new bookmark also appears in the Bookmarks view.</p> + </li> + <li> + <p class="Para">In one of the navigation views select the just edited file. From the main Workbench menu select + <strong>Edit ></strong> <b>Add Bookmark</b>.</p> + <p class="Para">This will bookmark the file using the filename to describe the bookmark. Observe the Bookmarks + view now contains two bookmarks.</p> + </li> + </ol> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-37-3e.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-37-3e.htm index bea14e5..8a1d8bc 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-37-3e.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-37-3e.htm
@@ -1,50 +1,39 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Using bookmarks</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<h1>Using bookmarks</h1> -<p CLASS="Head"> Now that some bookmarks have been created, instructions will - be given on how to get to the files associated with the bookmarks.</p> -<ol> - <li> - <P CLASS="Para"> Close all of the files in the editor area.</P> - </li> - <li> - <P CLASS="Para"> In the Bookmarks view, double-click on the first bookmark - that was created.</P> - </li> - <li> - <P CLASS="Para"> Notice that a file editor opens displaying the file with - which the bookmark is associated and that the line associated with the bookmark - is highlighted.<br> - <strong>Note:</strong> The Bookmarks view supports an additional - way to open the file associated with a selected bookmark, simply select - <b>Go To </b>from the bookmark's context menu.</P> - </li> -</ol> -<p CLASS="Head"> In the Bookmarks view, select the associated file in the Project Explorer. -</p> -<ol> - <li>In the Bookmarks view, select My Bookmark.</li> - <li>From the bookmark's context menu choose <b>Show in Project Explorer</b>. </li> - <li> - <P CLASS="Para"> Notice that the Project Explorer view is now visible and the file - corresponding file is automatically selected. The selected file is the file the bookmark - was associated with.</P> - </li> -</ol> - - - - -</BODY> -</HTML> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Using bookmarks</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>Using bookmarks</h1> + <p class="Head">Now that some bookmarks have been created, instructions will be given on how to get to the files + associated with the bookmarks.</p> + <ol> + <li> + <p class="Para">Close all of the files in the editor area.</p> + </li> + <li> + <p class="Para">In the Bookmarks view, double-click on the first bookmark that was created.</p> + </li> + <li> + <p class="Para">Notice that a file editor opens displaying the file with which the bookmark is associated and + that the line associated with the bookmark is highlighted.<br> + <strong>Note:</strong> The Bookmarks view supports an additional way to open the file associated with a selected + bookmark, simply select <b>Go To</b> from the bookmark's context menu.</p> + </li> + </ol> + <p class="Head">In the Bookmarks view, select the associated file in the Project Explorer.</p> + <ol> + <li>In the Bookmarks view, select My Bookmark.</li> + <li>From the bookmark's context menu choose <b>Show in Project Explorer</b>.</li> + <li> + <p class="Para">Notice that the Project Explorer view is now visible and the file corresponding file is + automatically selected. The selected file is the file the bookmark was associated with.</p> + </li> + </ol> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-37-3f.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-37-3f.htm index 4f02958..bbe68bf 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-37-3f.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-37-3f.htm
@@ -1,51 +1,44 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Removing bookmarks</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<h1> -Removing bookmarks</h1> -<p CLASS="Head">This section will demonstrate how to remove the bookmarks that - have been created.</p> -<ol> - <li> - <P CLASS="Para"> In the Bookmarks view, select the second bookmark we created and do one of the following:</P> - <ul> - <li> From the bookmark's context menu choose delete.</li> - <li> Hit the Delete key on the keyboard.</li> - </ul> - <P CLASS="Para">Notice that the bookmark is removed from the Bookmarks view.</P> - </li> - <li>There should be one remaining bookmark. This bookmark is associated with - a line in the same file. There are two other approaches to removing - this bookmark. - <ul> - <li>Use <b>Remove Bookmark</b> in the marker bar of the editor. - Remember, <b>Add Bookmark</b> was used in the marker bar when the - bookmark was first created.<br> - <li>Delete the bookmark (as was done above) by using <b>Delete</b> from - the bookmark's popup menu in the Bookmarks view.</li> - </ul> - <p>Here is the second approach.</p> - </li> - <li> - <P CLASS="Para">Ensure there is an editor open on your file.</P> - <P CLASS="Para">Although the editor doesn't actually need to be open, the - editor update will be viewable as the bookmark is deleted.</P> - </li> - <li> - <p CLASS="Head">In the Bookmarks view, select your file (the remaining - bookmark). Press the Delete key. Notice that the bookmark is removed from the Bookmarks - view and the editor.</p> - </li> -</ol> -</BODY> -</HTML> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Removing bookmarks</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>Removing bookmarks</h1> + <p class="Head">This section will demonstrate how to remove the bookmarks that have been created.</p> + <ol> + <li> + <p class="Para">In the Bookmarks view, select the second bookmark we created and do one of the following:</p> + <ul> + <li>From the bookmark's context menu choose delete.</li> + <li>Hit the Delete key on the keyboard.</li> + </ul> + <p class="Para">Notice that the bookmark is removed from the Bookmarks view.</p> + </li> + <li>There should be one remaining bookmark. This bookmark is associated with a line in the same file. There are two + other approaches to removing this bookmark. + <ul> + <li>Use <b>Remove Bookmark</b> in the marker bar of the editor. Remember, <b>Add Bookmark</b> was used in the + marker bar when the bookmark was first created.<br></li> + <li>Delete the bookmark (as was done above) by using <b>Delete</b> from the bookmark's popup menu in the + Bookmarks view.</li> + </ul> + <p>Here is the second approach.</p> + </li> + <li> + <p class="Para">Ensure there is an editor open on your file.</p> + <p class="Para">Although the editor doesn't actually need to be open, the editor update will be viewable as the + bookmark is deleted.</p> + </li> + <li> + <p class="Head">In the Bookmarks view, select your file (the remaining bookmark). Press the Delete key. Notice + that the bookmark is removed from the Bookmarks view and the editor.</p> + </li> + </ol> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-39.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-39.htm index afb3b27..a47c642 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-39.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-39.htm
@@ -1,40 +1,33 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Rearranging views and editors</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<h1> -Rearranging views and editors</h1> -<P CLASS="Para">This section will explain how to rearrange editors and views to - customize the layout of the Workbench.</P> -<P CLASS="Para"><b>Setup</b></P> -<P CLASS="Para">Before rearranging the Workbench, a little housekeeping is required.</P> -<ol> - <li> -<P CLASS="Para">Start by choosing <b>Window > Perspective > Reset Perspective</b> and selecting <b>OK</b>. This will reset the -current perspective to its original views and layout.</P> - </li> - <li> - <P CLASS="Para">Ensure there are editors open for file.txt and file1.txt. Close any other editors.</P> - </li> -</ol> -<P>The Workbench should now look like this: </P> - -<P><img src="../images/Image55_reset.png" alt="Workbench after reset" border="0" width="800"> -</P> -<h3 class="related">Related tasks</h3> - <a href="qs-39d.htm">Rearranging views</a><br> - <a href="qs-39e.htm">Tiling editors</a><br> - <a href="qs-39f.htm">Rearranging tabbed views</a><br> - <a href="qs-39g.htm">Maximizing and minimizing</a> - -</BODY> -</HTML> \ No newline at end of file +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Rearranging views and editors</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>Rearranging views and editors</h1> + <p class="Para">This section will explain how to rearrange editors and views to customize the layout of the + Workbench.</p> + <p class="Para"><b>Setup</b></p> + <p class="Para">Before rearranging the Workbench, a little housekeeping is required.</p> + <ol> + <li> + <p class="Para">Start by choosing <b>Window > Perspective > Reset Perspective</b> and selecting <b>OK</b>. + This will reset the current perspective to its original views and layout.</p> + </li> + <li> + <p class="Para">Ensure there are editors open for file.txt and file1.txt. Close any other editors.</p> + </li> + </ol> + <p>The Workbench should now look like this:</p> + <p><img src="../images/Image55_reset.png" alt="Workbench after reset" border="0" width="800"></p> + <h3 class="related">Related tasks</h3><a href="qs-39d.htm">Rearranging views</a><br> + <a href="qs-39e.htm">Tiling editors</a><br> + <a href="qs-39f.htm">Rearranging tabbed views</a><br> + <a href="qs-39g.htm">Maximizing and minimizing</a> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-39d.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-39d.htm index 5d7253f..6107ab4 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-39d.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-39d.htm
@@ -1,58 +1,47 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Rearranging views</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<h1> -Rearranging views</h1> -<p CLASS="Head"> The position of the Project Explorer (or any other) view in the Workbench window can - be changed.</p> -<ol> - <li> - <p CLASS="Head"> Click in the title bar of the Project Explorer view and drag the - view across the Workbench window. Do not release the mouse button yet.</p> - </li> - <li> - <p CLASS="Head"> While still dragging the view around on the Workbench - window, note that various drop outlines appear. These drop outlines - indicate where the view will dock in relation to the view or editor - area underneath the cursor when the mouse button is released.</p> - </li> - <li> - <P CLASS="Para"> Dock the Project Explorer in the stack with the Outline view and - notice the results of this action. Note the drop outline next to the tab of - the view you are dropping next to.</P> - </li> - <li> - <P CLASS="Para"> Click and drag the Project Explorer's title bar to re-dock the view as its - own view stack on top of the Outline view. Note the drop outline showing the orientation of the views - after the drop. - </P> - </li> - <li> - <P CLASS="Para"> Click and drag the Project Explorer's title bar outside the Workbench window to make it a - "detached" window (a view stack in its own window). Note the drop outline showing it will be outside the main workbench window. - </P> - </li> - <li> - <P CLASS="Para"> Finally, drag the Project Explorer view over the editor area. A - drop outline will be displayed to show the view orientation related to the editor area. - </P> - </li> -</ol> - -<h3 class="related">Related tasks</h3> - <a href="qs-39.htm">Rearranging views and editors</a><br> - <a href="qs-39e.htm">Tiling editors</a><br> - <a href="qs-39f.htm">Rearranging tabbed views</a><br> - <a href="qs-39g.htm">Maximizing and minimizing</a> -</BODY> -</HTML> \ No newline at end of file +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Rearranging views</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>Rearranging views</h1> + <p class="Head">The position of the Project Explorer (or any other) view in the Workbench window can be changed.</p> + <ol> + <li> + <p class="Head">Click in the title bar of the Project Explorer view and drag the view across the Workbench + window. Do not release the mouse button yet.</p> + </li> + <li> + <p class="Head">While still dragging the view around on the Workbench window, note that various drop outlines + appear. These drop outlines indicate where the view will dock in relation to the view or editor area underneath + the cursor when the mouse button is released.</p> + </li> + <li> + <p class="Para">Dock the Project Explorer in the stack with the Outline view and notice the results of this + action. Note the drop outline next to the tab of the view you are dropping next to.</p> + </li> + <li> + <p class="Para">Click and drag the Project Explorer's title bar to re-dock the view as its own view stack on top + of the Outline view. Note the drop outline showing the orientation of the views after the drop.</p> + </li> + <li> + <p class="Para">Click and drag the Project Explorer's title bar outside the Workbench window to make it a + "detached" window (a view stack in its own window). Note the drop outline showing it will be outside the main + workbench window.</p> + </li> + <li> + <p class="Para">Finally, drag the Project Explorer view over the editor area. A drop outline will be displayed to + show the view orientation related to the editor area.</p> + </li> + </ol> + <h3 class="related">Related tasks</h3><a href="qs-39.htm">Rearranging views and editors</a><br> + <a href="qs-39e.htm">Tiling editors</a><br> + <a href="qs-39f.htm">Rearranging tabbed views</a><br> + <a href="qs-39g.htm">Maximizing and minimizing</a> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-39e.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-39e.htm index 6bdadc1..2216ae4 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-39e.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-39e.htm
@@ -1,73 +1,63 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Tiling editors</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<h1> -Tiling editors</h1> -<P CLASS="Para"> The Workbench allows for the creation of two or more sets of - editors in the editor area. The editor area can also be resized but views cannot - be dragged into the editor area.</P> -<ol> - <li> - <P CLASS="Para"> Open at least two editors in the editor area by double-clicking - editable files in one of the navigation views.</P> - </li> - <li> - <P CLASS="Para"> Click and drag one of the editor's tabs out of the editor - area. Do not release the mouse button.</P> - </li> - <li> - <P CLASS="Para"> Notice that the restricted cursor displays if an attempt - is made to drop the editor either on top of any view or outside the Workbench - window.</P> - </li> - <li> - <P CLASS="Para"> Still holding down the mouse button, drag the editor over - the editor area and move the cursor along all four edges as well as in the - middle of the editor area, on top of another open editor. Notice that along - the edges of the editor area the directional arrow drop cursors appear, - and in the middle of the editor area the stack drop cursor appears.</P> - </li> - <li> - <P CLASS="Para"> Dock the editor on a directional arrow drop cursor so that - two editors appear in the editor area.</P> - </li> - <li> - <P CLASS="Para"> Notice that each editor can also be resized as well as the - entire editor area to accommodate the editors and views as necessary.</P> - </li> - <li> - <p CLASS="Para"> It is important to observe the color of an editor tab (in - the figure below there are two groups, one above the other)</p> - <p CLASS="Para"><b>blue</b> - indicates that the editor is currently active</p> - <p CLASS="Para"><b>default </b>(gray on Windows XP) - indicates that the editor - was the last active editor. If there is an active view, it will be the editor - that the active view is currently working with. This is important when working - with views like the Outline and Properties that work closely with the editor.</p></li> - <li> - <P CLASS="Para"> Drag and dock the editor somewhere else in the editor area, - noting the behavior that results from docking on each kind of drop cursor. - Continue to experiment with docking and resizing editors and views until - the Workbench has been arranged to satisfaction. The figure below illustrates - the layout if one editor is dragged and dropped below another.</P> - <P><img src="../images/Image57_two_editors.png" alt="Two editors" border="0" width="800"></P> - </li> -</ol> - -<h3 class="related">Related tasks</h3> - <a href="qs-39.htm">Rearranging views and editors</a><br> - <a href="qs-39d.htm">Rearranging views</a><br> - <a href="qs-39f.htm">Rearranging tabbed views</a><br> - <a href="qs-39g.htm">Maximizing and minimizing</a> - -</BODY> -</HTML> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Tiling editors</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>Tiling editors</h1> + <p class="Para">The Workbench allows for the creation of two or more sets of editors in the editor area. The editor + area can also be resized but views cannot be dragged into the editor area.</p> + <ol> + <li> + <p class="Para">Open at least two editors in the editor area by double-clicking editable files in one of the + navigation views.</p> + </li> + <li> + <p class="Para">Click and drag one of the editor's tabs out of the editor area. Do not release the mouse + button.</p> + </li> + <li> + <p class="Para">Notice that the restricted cursor displays if an attempt is made to drop the editor either on top + of any view or outside the Workbench window.</p> + </li> + <li> + <p class="Para">Still holding down the mouse button, drag the editor over the editor area and move the cursor + along all four edges as well as in the middle of the editor area, on top of another open editor. Notice that + along the edges of the editor area the directional arrow drop cursors appear, and in the middle of the editor + area the stack drop cursor appears.</p> + </li> + <li> + <p class="Para">Dock the editor on a directional arrow drop cursor so that two editors appear in the editor + area.</p> + </li> + <li> + <p class="Para">Notice that each editor can also be resized as well as the entire editor area to accommodate the + editors and views as necessary.</p> + </li> + <li> + <p class="Para">It is important to observe the color of an editor tab (in the figure below there are two groups, + one above the other)</p> + <p class="Para"><b>blue</b> - indicates that the editor is currently active</p> + <p class="Para"><b>default</b> (gray on Windows XP) - indicates that the editor was the last active editor. If + there is an active view, it will be the editor that the active view is currently working with. This is important + when working with views like the Outline and Properties that work closely with the editor.</p> + </li> + <li> + <p class="Para">Drag and dock the editor somewhere else in the editor area, noting the behavior that results from + docking on each kind of drop cursor. Continue to experiment with docking and resizing editors and views until the + Workbench has been arranged to satisfaction. The figure below illustrates the layout if one editor is dragged and + dropped below another.</p> + <p><img src="../images/Image57_two_editors.png" alt="Two editors" border="0" width="800"></p> + </li> + </ol> + <h3 class="related">Related tasks</h3><a href="qs-39.htm">Rearranging views and editors</a><br> + <a href="qs-39d.htm">Rearranging views</a><br> + <a href="qs-39f.htm">Rearranging tabbed views</a><br> + <a href="qs-39g.htm">Maximizing and minimizing</a> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-39f.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-39f.htm index ee16afc..231be3e 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-39f.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-39f.htm
@@ -1,45 +1,38 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Rearranging tabbed views</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<h1>Rearranging tabbed views</h1> -<P CLASS="Para">In addition to dragging and dropping views in the Workbench the - order of views can also be rearranged within a tabbed view stack.</P> -<ol> - <li> - <P CLASS="Para"> Choose <b>Window > Perspective > Reset Perspective</b> to reset the - Resource perspective back to its original layout.</P> - </li> - <li> - <P CLASS="Para">Click on the Outline title bar and drag it on top of one of - the navigation views. The Outline will now be stacked on top of one of the - navigation views.</P> - </li> - <li> - <P CLASS="Para"> Click the tab of the Project Explorer view and drag it to the - left of the Outline tab.</P> - </li> - <li> - <P CLASS="Para"> Once the cursor is to the left of the Outline tab and the - drop outline is shown, release the mouse button.</P> - <P CLASS="Para">Observe the Project Explorer tab is now to the left of the Outline - tab.</P> - </li> -</ol> - -<h3 class="related">Related tasks</h3> - <a href="qs-39.htm">Rearranging views and editors</a><br> - <a href="qs-39d.htm">Rearranging views</a><br> - <a href="qs-39e.htm">Tiling editors</a><br> - <a href="qs-39g.htm">Maximizing and minimizing</a> -</BODY> -</HTML> \ No newline at end of file +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Rearranging tabbed views</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>Rearranging tabbed views</h1> + <p class="Para">In addition to dragging and dropping views in the Workbench the order of views can also be rearranged + within a tabbed view stack.</p> + <ol> + <li> + <p class="Para">Choose <b>Window > Perspective > Reset Perspective</b> to reset the Resource perspective + back to its original layout.</p> + </li> + <li> + <p class="Para">Click on the Outline title bar and drag it on top of one of the navigation views. The Outline + will now be stacked on top of one of the navigation views.</p> + </li> + <li> + <p class="Para">Click the tab of the Project Explorer view and drag it to the left of the Outline tab.</p> + </li> + <li> + <p class="Para">Once the cursor is to the left of the Outline tab and the drop outline is shown, release the + mouse button.</p> + <p class="Para">Observe the Project Explorer tab is now to the left of the Outline tab.</p> + </li> + </ol> + <h3 class="related">Related tasks</h3><a href="qs-39.htm">Rearranging views and editors</a><br> + <a href="qs-39d.htm">Rearranging views</a><br> + <a href="qs-39e.htm">Tiling editors</a><br> + <a href="qs-39g.htm">Maximizing and minimizing</a> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-39g.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-39g.htm index 7f4a779..8397ccf 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-39g.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-39g.htm
@@ -1,104 +1,70 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Maximizing and minimizing</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> - -<h1>Maximizing and minimizing elements of the Eclipse presentation</h1> - -<p> -The eclipse presentation provides a rich environment consisting of (in its basic form) an -<i>Editor Area</i> (containing one or more stacks showing the open editors) surrounded by -one or more <i>View Stacks</i> (each containing one or more views).These various parts compete -for valuable screen real-estate and correctly managing the amount of screen given to each -can greatly enhance your productivity within the IDE. -</p> -<p> -The two most common mechanisms for managing this issue are 'minimize' (i.e. make me use as -little space as possible) and 'maximize' (i.e. give me as much space as you can). The eclipse -presentation provides a variety of ways to access these operations:</p> -<ol> - <li>Using the minimize and maximize buttons provided on a stack's border</li> - <li>Double-clicking on a stack</li> - <li>Using <b>Ctrl + M</b>. This is the key binding for a command that will toggle the currently active -part between its 'maximized' and its 'restored' (i.e. normal) states.</li> -</ol> - - -<h4>Maximize:</h4> -<p> -It is desirable at times to focus your attention on one particular part to the exclusion of -the others. The most popular candidate for this is, of course, maximizing the editor area in -order to make as much of the display available for editing as possible (but there are workflows -where it would make sense to focus on a view as well). -</p> -<p> -The default presentation implements the maximize behavior by minimizing all stacks -<i>except</i> the one being maximized. This allows the maximized stack to completely occupy -the main presentation while still allowing access any open views in your perspective by using -the icons in their <i>Trim Stack</i> (the area around the edges of the window is called the 'trim'). -</p> -<p> -The editor maximization operates on the complete Editor Area (rather than simply maximizing the particular Editor Stack). -This allows for 'compare' workflows which require the ability to see both files in a split editor area at the same time. -</p> - -<h4>Minimize:</h4> -<p> -Another way to optimize the use of the screen area is to directly minimize stacks that are of no current -interest. The default presentation minimizing a stack will cause it to be moved into -the trim area at the edges of the workbench window, creating a <i>Trim Stack</i>. View Stacks -get minimized into a trim representation that contains the icons for each view in the stack. -</p> -<p> -The minimize behavior for the Editor Area is somewhat different; minimizing the Editor Area -results in a trim stack containing only a placeholder icon representing the entire editor area -rather than icons for each open editor (since in most cases all the icons would be the same, making -them essentially useless). -</p> -<p> -If your particular workflow is such that you need to have more than one element (i.e. having the -Editor Area <i>and</i> a View Stack in the presentation at the same time) -you can still gain additional screen space by minimizing the stacks that aren't of current interest. -This will remove them from the main presentation and place them on the outer edge of the workbench -window as <i>Trim Stacks</i>, -allowing more space for the remaining stacks in the presentation. -</p> -<p> -<b>Note:</b> There are two ways to end up with a stack in the trim:</p> -<ul> -<li>Directly minimizing the stack</li> -<li>As the result of another stack being maximized</li> -</ul> - -<p> -Depending on how the Trim Stack was created its behavior is different; when un-maximizing only those -trim stacks that were created during the initial maximize will be restored to the main presentation -while stacks that were independently minimized stay that way. -</p> -<p> -<b><i>Tip:</i></b> This difference is important in that it allows you fine grained control over the presentation. While -using maximize is a one-click operation it's an 'all or nothing' paradigm (i.e. no other stack is allowed -to share the presentation with a maximized stack). While adequate for most tasks you may find yourself wanting to -have the presentation show more than one stack. In these scenarios don't maximize; minimize all the other stacks <i>except</i> -the ones you want in the presentation. Once you have it set up you can still subsequently maximize the editor area but -the un-maximize will only restore the particular stack(s) that were sharing the presentation, not the ones you've -explicitly minimized. -</p> - -<h3 class="related">Related tasks</h3> - <a href="qs-39.htm">Rearranging views and editors</a><br> - <a href="qs-39d.htm">Rearranging view</a><br> - <a href="qs-39e.htm">Tiling editors</a><br> - <a href="qs-39f.htm">Rearranging tabbed views</a> - -</BODY> -</HTML> \ No newline at end of file +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Maximizing and minimizing</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>Maximizing and minimizing elements of the Eclipse presentation</h1> + <p>The eclipse presentation provides a rich environment consisting of (in its basic form) an <i>Editor Area</i> + (containing one or more stacks showing the open editors) surrounded by one or more <i>View Stacks</i> (each + containing one or more views).These various parts compete for valuable screen real-estate and correctly managing the + amount of screen given to each can greatly enhance your productivity within the IDE.</p> + <p>The two most common mechanisms for managing this issue are 'minimize' (i.e. make me use as little space as + possible) and 'maximize' (i.e. give me as much space as you can). The eclipse presentation provides a variety of ways + to access these operations:</p> + <ol> + <li>Using the minimize and maximize buttons provided on a stack's border</li> + <li>Double-clicking on a stack</li> + <li>Using <b>Ctrl + M</b>. This is the key binding for a command that will toggle the currently active part between + its 'maximized' and its 'restored' (i.e. normal) states.</li> + </ol> + <h4>Maximize:</h4> + <p>It is desirable at times to focus your attention on one particular part to the exclusion of the others. The most + popular candidate for this is, of course, maximizing the editor area in order to make as much of the display + available for editing as possible (but there are workflows where it would make sense to focus on a view as well).</p> + <p>The default presentation implements the maximize behavior by minimizing all stacks <i>except</i> the one being + maximized. This allows the maximized stack to completely occupy the main presentation while still allowing access any + open views in your perspective by using the icons in their <i>Trim Stack</i> (the area around the edges of the window + is called the 'trim').</p> + <p>The editor maximization operates on the complete Editor Area (rather than simply maximizing the particular Editor + Stack). This allows for 'compare' workflows which require the ability to see both files in a split editor area at the + same time.</p> + <h4>Minimize:</h4> + <p>Another way to optimize the use of the screen area is to directly minimize stacks that are of no current interest. + The default presentation minimizing a stack will cause it to be moved into the trim area at the edges of the + workbench window, creating a <i>Trim Stack</i>. View Stacks get minimized into a trim representation that contains + the icons for each view in the stack.</p> + <p>The minimize behavior for the Editor Area is somewhat different; minimizing the Editor Area results in a trim + stack containing only a placeholder icon representing the entire editor area rather than icons for each open editor + (since in most cases all the icons would be the same, making them essentially useless).</p> + <p>If your particular workflow is such that you need to have more than one element (i.e. having the Editor Area + <i>and</i> a View Stack in the presentation at the same time) you can still gain additional screen space by + minimizing the stacks that aren't of current interest. This will remove them from the main presentation and place + them on the outer edge of the workbench window as <i>Trim Stacks</i>, allowing more space for the remaining stacks in + the presentation.</p> + <p><b>Note:</b> There are two ways to end up with a stack in the trim:</p> + <ul> + <li>Directly minimizing the stack</li> + <li>As the result of another stack being maximized</li> + </ul> + <p>Depending on how the Trim Stack was created its behavior is different; when un-maximizing only those trim stacks + that were created during the initial maximize will be restored to the main presentation while stacks that were + independently minimized stay that way.</p> + <p><b><i>Tip:</i></b> This difference is important in that it allows you fine grained control over the presentation. + While using maximize is a one-click operation it's an 'all or nothing' paradigm (i.e. no other stack is allowed to + share the presentation with a maximized stack). While adequate for most tasks you may find yourself wanting to have + the presentation show more than one stack. In these scenarios don't maximize; minimize all the other stacks + <i>except</i> the ones you want in the presentation. Once you have it set up you can still subsequently maximize the + editor area but the un-maximize will only restore the particular stack(s) that were sharing the presentation, not the + ones you've explicitly minimized.</p> + <h3 class="related">Related tasks</h3><a href="qs-39.htm">Rearranging views and editors</a><br> + <a href="qs-39d.htm">Rearranging view</a><br> + <a href="qs-39e.htm">Tiling editors</a><br> + <a href="qs-39f.htm">Rearranging tabbed views</a> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-43.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-43.htm index a33b625..5494ef8 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-43.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-43.htm
@@ -1,41 +1,36 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Perspectives</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<h1>Perspectives</h1> - -<p>A perspective defines the initial set and layout of -views in the Workbench window. One or more perspectives can exist in a single -Workbench window.</p> -<p>Perspectives can be opened in one of two ways:</p> -<ul> - <li><p>In the same (existing) Workbench window.</p> </li> - <li><p>In a new Workbench window.</p></li> -</ul> -<p>Perspectives define visible action sets, which can - be changed to customize a perspective. A perspective that is built in this manner - can be saved, creating a custom perspective that can be opened again later.</p> -<p> The Workbench window displays one or more perspectives. Each - product determines initially what default perspective is displayed, in this - example it is the Resource perspective. A perspective consists of views such - as the Project Explorer as well as editors for working with resources. More than one - Workbench window can be open at any given time. </P> -<P> So far, only the Resource perspective (shown below) has been - used in this tutorial. This section will explore how to open and work with other - perspectives. </P> -<P> A perspective provides a set of functionality aimed at accomplishing - a specific type of task, or working with a specific type of resource. -</P> -<P> -<img src="../images/Image1.png" alt="Eclipse Workbench" border="0" width="800"> </P> -</BODY> -</HTML> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Perspectives</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>Perspectives</h1> + <p>A perspective defines the initial set and layout of views in the Workbench window. One or more perspectives can + exist in a single Workbench window.</p> + <p>Perspectives can be opened in one of two ways:</p> + <ul> + <li> + <p>In the same (existing) Workbench window.</p> + </li> + <li> + <p>In a new Workbench window.</p> + </li> + </ul> + <p>Perspectives define visible action sets, which can be changed to customize a perspective. A perspective that is + built in this manner can be saved, creating a custom perspective that can be opened again later.</p> + <p>The Workbench window displays one or more perspectives. Each product determines initially what default perspective + is displayed, in this example it is the Resource perspective. A perspective consists of views such as the Project + Explorer as well as editors for working with resources. More than one Workbench window can be open at any given + time.</p> + <p>So far, only the Resource perspective (shown below) has been used in this tutorial. This section will explore how + to open and work with other perspectives.</p> + <p>A perspective provides a set of functionality aimed at accomplishing a specific type of task, or working with a + specific type of resource.</p> + <p><img src="../images/Image1.png" alt="Eclipse Workbench" border="0" width="800"></p> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-43b.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-43b.htm index 553d99e..2b74152 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-43b.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-43b.htm
@@ -1,64 +1,55 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>New perspectives</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<h1>New perspectives</h1> - -<p CLASS="Head">There are several ways to open a new perspective within this Workbench window:</p> -<ul> - <li> - Using the Open Perspective button <img src="../images/new_persp.svg" alt="Open Perspectives" border="0" > on the shortcut bar. - </li> - <li> - Choosing a perspective from the <b>Window > Perspective > Open Perspective</b> menu.</li> - <li> - Using the Find Actions button <img src="../images/find_actions.svg" alt="Open Perspectives" border="0" > on the shortcut bar and typing the perspective name into the Find Actionds dialog. - </li> -</ul> -<p>To open one by using the shortcut bar button:</p> -<ol> - <li> - <p CLASS="Para">Click on the Open Perspective button <img src="../images/new_persp.svg" alt="Open Perspectives" border="0" >.</p> - </li> - <li> - <p CLASS="Para">In the Select Perspective dialog choose <b>Debug</b> and click - <b>OK</b>.</p> - <p CLASS="Para"> - <img src="../images/Image70_select_pers.png" alt="Select Perspective" border="0" width="350" > - </p> - <p CLASS="Para">The Debug perspective is displayed.</p> - </li> - <img src="../images/Image70_shortcut4.png" alt="Debug Perspective" border="0" width="900"> - <li> - <p CLASS="Para">There are several other interesting things to take note of.</p> - <ul> - <li> - <p CLASS="Para">The title of the window now indicates that the Debug perspective - is in use.</p></li> - <li> - <p CLASS="Para">The shortcut bar now contains the original Resource perspective, - and the new Debug perspective. The Debug perspective button is pressed in, - indicating that it is the current perspective.</p></li> - <li> - <p CLASS="Para">To display the full name of the perspective right click - the perspective bar and check <strong>Show Text</strong>.<br> - </p></li> - </ul> - </li> - <li> - <p CLASS="Para">In the shortcut bar, click on the Resource perspective button. - The Resource perspective is once again the current perspective. Notice that - the set of views is different for each of the perspectives.</p> - </li> -</ol> -</BODY> -</HTML> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>New perspectives</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>New perspectives</h1> + <p class="Head">There are several ways to open a new perspective within this Workbench window:</p> + <ul> + <li>Using the Open Perspective button <img src="../images/new_persp.svg" alt="Open Perspectives" border="0"> on the + shortcut bar.</li> + <li>Choosing a perspective from the <b>Window > Perspective > Open Perspective</b> menu.</li> + <li>Using the Find Actions button <img src="../images/find_actions.svg" alt="Open Perspectives" border="0"> on the + shortcut bar and typing the perspective name into the Find Actionds dialog.</li> + </ul> + <p>To open one by using the shortcut bar button:</p> + <ol> + <li> + <p class="Para">Click on the Open Perspective button <img src="../images/new_persp.svg" alt="Open Perspectives" + border="0">.</p> + </li> + <li> + <p class="Para">In the Select Perspective dialog choose <b>Debug</b> and click <b>OK</b>.</p> + <p class="Para"><img src="../images/Image70_select_pers.png" alt="Select Perspective" border="0" width="350"></p> + <p class="Para">The Debug perspective is displayed.</p><img src="../images/Image70_shortcut4.png" alt= + "Debug Perspective" border="0" width="900"> + </li> + <li> + <p class="Para">There are several other interesting things to take note of.</p> + <ul> + <li> + <p class="Para">The title of the window now indicates that the Debug perspective is in use.</p> + </li> + <li> + <p class="Para">The shortcut bar now contains the original Resource perspective, and the new Debug + perspective. The Debug perspective button is pressed in, indicating that it is the current perspective.</p> + </li> + <li> + <p class="Para">To display the full name of the perspective right click the perspective bar and check + <strong>Show Text</strong>.<br></p> + </li> + </ul> + </li> + <li> + <p class="Para">In the shortcut bar, click on the Resource perspective button. The Resource perspective is once + again the current perspective. Notice that the set of views is different for each of the perspectives.</p> + </li> + </ol> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-43c.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-43c.htm index 9882fc5..d81d543 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-43c.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-43c.htm
@@ -1,21 +1,18 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>New windows</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<h1>New windows</h1> - -<p CLASS="Head">As well as opening a perspective inside the current Workbench - window, new perspectives can also be opened in their own window.</p> -<p CLASS="Head">By default, new perspectives are opened in the current window. - This default behavior can be configured using the <b>General > Perspectives</b> preference page.</p> -</BODY> -</HTML> \ No newline at end of file +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>New windows</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>New windows</h1> + <p class="Head">As well as opening a perspective inside the current Workbench window, new perspectives can also be + opened in their own window.</p> + <p class="Head">By default, new perspectives are opened in the current window. This default behavior can be + configured using the <b>General > Perspectives</b> preference page.</p> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-43e.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-43e.htm index dd6392c..c372157 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-43e.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-43e.htm
@@ -1,77 +1,69 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Saving perspectives</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<h1>Saving perspectives</h1> - -<P CLASS="Para">This tutorial has demonstrated how to add new views to the perspective - and rearrange the views. The Workbench also allows - this layout to be saved for future use.</P> -<ol> - <li> - <p CLASS="Para">In the shortcut bar click on the Resource perspective. The - Resource perspective is now active.</p> - </li> - <li> - <p CLASS="Para">Drag the Outline view and stack it with one of the navigation - views.</p></li> - <li> - <p CLASS="Para">Choose <b>Window > Perspective > Save Perspective As...</b></p> - </li> - <li> - <p CLASS="Para">The Save Perspective As dialog allows for an existing perspective - to be redefined or for a new perspective to be created.</p> - <p CLASS="Para">Click <b>OK</b> to update the Resource perspective and <b>Yes</b> - to the subsequent confirmation dialog. The new perspective layout will be - used if the perspective is reset or if a new one is opened.</p> - </li> - <li> - <P CLASS="Para">In the Resource perspective move the Outline view so that - it is now stacked with the Tasks view.</P> - </li> - <li> - <p CLASS="Para">Choose <b>Window > Perspective > Reset Perspective</b>. Notice the Outline - view is stacked with the navigation view. Originally when the Workbench - was first started it was below the navigation view, but because the perspective - was saved with the navigation view and Outline stacked, it now considers - this its initial layout.</p> - </li> - <li> - <P CLASS="Para">Choose <b>Window > New Window</b> to open a second window - showing the resource perspective. Observe that it uses the newly saved layout.</P> - </li> - <li> - <P CLASS="Para">Close the second window.</P> - </li> -</ol> -<p CLASS="Para">While the Resource perspective has been changed, there is a way - to get back the original layout. To revert the Resource perspective to its original - layout:</p> -<ol> - <li> - <p CLASS="Para">Open the <b>Preferences</b> dialog.</p> - </li> - <li> - <p CLASS="Para">Expand <b>General</b> and select <b>Perspectives</b>.</p> - </li> - <li> - <p CLASS="Para">Select the <b>Resource</b> perspective and then click <b>Revert</b> on the right side.</p> - </li> - <li> - <p CLASS="Para">Any changes to the saved state of the perspective has now - been undone. To update the current copy of the Resource perspective that - is being worked with, also choose <b>Window > Perspective > Reset Perspective...</b> from - the Workbench's menu bar.</p> - </li> -</ol> -</BODY> -</HTML> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Saving perspectives</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>Saving perspectives</h1> + <p class="Para">This tutorial has demonstrated how to add new views to the perspective and rearrange the views. The + Workbench also allows this layout to be saved for future use.</p> + <ol> + <li> + <p class="Para">In the shortcut bar click on the Resource perspective. The Resource perspective is now + active.</p> + </li> + <li> + <p class="Para">Drag the Outline view and stack it with one of the navigation views.</p> + </li> + <li> + <p class="Para">Choose <b>Window > Perspective > Save Perspective As...</b></p> + </li> + <li> + <p class="Para">The Save Perspective As dialog allows for an existing perspective to be redefined or for a new + perspective to be created.</p> + <p class="Para">Click <b>OK</b> to update the Resource perspective and <b>Yes</b> to the subsequent confirmation + dialog. The new perspective layout will be used if the perspective is reset or if a new one is opened.</p> + </li> + <li> + <p class="Para">In the Resource perspective move the Outline view so that it is now stacked with the Tasks + view.</p> + </li> + <li> + <p class="Para">Choose <b>Window > Perspective > Reset Perspective</b>. Notice the Outline view is stacked + with the navigation view. Originally when the Workbench was first started it was below the navigation view, but + because the perspective was saved with the navigation view and Outline stacked, it now considers this its initial + layout.</p> + </li> + <li> + <p class="Para">Choose <b>Window > New Window</b> to open a second window showing the resource perspective. + Observe that it uses the newly saved layout.</p> + </li> + <li> + <p class="Para">Close the second window.</p> + </li> + </ol> + <p class="Para">While the Resource perspective has been changed, there is a way to get back the original layout. To + revert the Resource perspective to its original layout:</p> + <ol> + <li> + <p class="Para">Open the <b>Preferences</b> dialog.</p> + </li> + <li> + <p class="Para">Expand <b>General</b> and select <b>Perspectives</b>.</p> + </li> + <li> + <p class="Para">Select the <b>Resource</b> perspective and then click <b>Revert</b> on the right side.</p> + </li> + <li> + <p class="Para">Any changes to the saved state of the perspective has now been undone. To update the current copy + of the Resource perspective that is being worked with, also choose <b>Window > Perspective > Reset + Perspective...</b> from the Workbench's menu bar.</p> + </li> + </ol> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-43f.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-43f.htm index 2f3b08a..4dc0667 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-43f.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-43f.htm
@@ -1,50 +1,60 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Hiding Menu and Tool Bar Items</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<h1>Turning menu and tool bar items on and off</h1> - -<p CLASS="Para">In addition to configuring the layout of a perspective you can - also control several other key aspects of a perspective. These include:</p> -<ul> - <li> The visibility of individual menu and tool bar items. </li> - <li> The availability of command groups (groupings of menu items, tool bar - items and key bindings).</li> - <li> The items in the <b>New</b>, <b>Window > Perspective > Open Perspective</b> and - <b>Window > Show View</b> menus.</li> -</ul> - -<p CLASS="Para">Try turning off a tool bar item:</p> -<ol> - <li> - <p CLASS="Para">Select <b>Window > Perspective > Customize Perspective...</b></p></li> - <li><p CLASS="Para">Select the <b>Tool Bar Visibility</b> tab.</p></li> - <li><p CLASS="Para">Expand the <b>File</b> item.</p></li> - <li><p CLASS="Para">Uncheck <b>Print</b> and click <b>OK</b>.</p></li> - <li><p CLASS="Para">Observe that the toolbar no longer includes the <b>Print</b> icon.</p></li> -</ol> - -<p CLASS="Para">Try turning off a menu item:</p> -<ol> - <li> - <p CLASS="Para">Select <b>Window > Perspective > Customize Perspective...</b></p></li> - <li><p CLASS="Para">Select the <b>Menu Visibility</b> tab.</p></li> - <li><p CLASS="Para">Expand the <b>File</b> item.</p></li> - <li><p CLASS="Para">Uncheck <b>Print</b> and click <b>OK</b>.</p></li> - <li><p CLASS="Para">Observe that the <b>File</b> menu no longer includes the <b>Print</b> item.</p></li> -</ol> - -<p CLASS="Para">After experimenting with the other options on the Customize - Perspective dialog, choose <b>Window > Perspective > Reset Perspective</b> to return - the perspective to its original state.</p> -</BODY> -</HTML> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Hiding Menu and Tool Bar Items</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>Turning menu and tool bar items on and off</h1> + <p class="Para">In addition to configuring the layout of a perspective you can also control several other key aspects + of a perspective. These include:</p> + <ul> + <li>The visibility of individual menu and tool bar items.</li> + <li>The availability of command groups (groupings of menu items, tool bar items and key bindings).</li> + <li>The items in the <b>New</b>, <b>Window > Perspective > Open Perspective</b> and <b>Window > Show + View</b> menus.</li> + </ul> + <p class="Para">Try turning off a tool bar item:</p> + <ol> + <li> + <p class="Para">Select <b>Window > Perspective > Customize Perspective...</b></p> + </li> + <li> + <p class="Para">Select the <b>Tool Bar Visibility</b> tab.</p> + </li> + <li> + <p class="Para">Expand the <b>File</b> item.</p> + </li> + <li> + <p class="Para">Uncheck <b>Print</b> and click <b>OK</b>.</p> + </li> + <li> + <p class="Para">Observe that the toolbar no longer includes the <b>Print</b> icon.</p> + </li> + </ol> + <p class="Para">Try turning off a menu item:</p> + <ol> + <li> + <p class="Para">Select <b>Window > Perspective > Customize Perspective...</b></p> + </li> + <li> + <p class="Para">Select the <b>Menu Visibility</b> tab.</p> + </li> + <li> + <p class="Para">Expand the <b>File</b> item.</p> + </li> + <li> + <p class="Para">Uncheck <b>Print</b> and click <b>OK</b>.</p> + </li> + <li> + <p class="Para">Observe that the <b>File</b> menu no longer includes the <b>Print</b> item.</p> + </li> + </ol> + <p class="Para">After experimenting with the other options on the Customize Perspective dialog, choose <b>Window > + Perspective > Reset Perspective</b> to return the perspective to its original state.</p> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-52.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-52.htm index 0531f8f..9208ad9 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-52.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-52.htm
@@ -1,53 +1,49 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Comparing</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<h1>Comparing</h1> - -<P CLASS="Para"> The Workbench allows for the comparison of multiple resources - and for the presentation of the results in a special compare editor. </P> -<P CLASS="Para"><b>Setup</b> </P> -<P CLASS="Para">Before commencing with compare a few files must be created. This - will also be a good time to recap some of the basic features that have already - been introduced.</P> -<ol> - <li> - <p CLASS="Para">Start by selecting all of the projects in one of the navigation - views and deleting them by using <b>Delete</b> on the pop-up menu.</p> - </li> - <li> - <p CLASS="Para">Create a new simple project using <b>File > New > Project</b>. - Be sure to give the project a distinct name by typing unique name as the - name of the new project.</p></li> - <li> - <p CLASS="Para">Use the project's pop-up menu to create a file called file1.txt.</p> - <p CLASS="Para">In the editor for file1.txt type the following lines of text - and save the file:</p> - <blockquote> - <p CLASS="Para"><i>This is line 1.<br> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Comparing</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>Comparing</h1> + <p class="Para">The Workbench allows for the comparison of multiple resources and for the presentation of the results + in a special compare editor.</p> + <p class="Para"><b>Setup</b></p> + <p class="Para">Before commencing with compare a few files must be created. This will also be a good time to recap + some of the basic features that have already been introduced.</p> + <ol> + <li> + <p class="Para">Start by selecting all of the projects in one of the navigation views and deleting them by using + <b>Delete</b> on the pop-up menu.</p> + </li> + <li> + <p class="Para">Create a new simple project using <b>File > New > Project</b>. Be sure to give the project + a distinct name by typing unique name as the name of the new project.</p> + </li> + <li> + <p class="Para">Use the project's pop-up menu to create a file called file1.txt.</p> + <p class="Para">In the editor for file1.txt type the following lines of text and save the file:</p> + <blockquote> + <p class="Para"><i>This is line 1.<br> This is line 2.<br> This is line 3.<br> This is line 4.<br> This is line 5.</i></p> - </blockquote> - </li> - <li> - <p CLASS="Para">In one of the navigation views select file1.txt and use Ctrl+C - to copy the file.</p></li> - <li> - <p CLASS="Para">Use Ctrl+V (Paste) to create the copy. In the name conflict - dialog which appears, rename the file to file2.txt.</p></li> -</ol> -<p>(On the Mac, use ⌘+C and ⌘+V.)</p> -<P>There are now two identical files, file1.txt and file2.txt. </P> -</BODY> -</HTML> + </blockquote> + </li> + <li> + <p class="Para">In one of the navigation views select file1.txt and use Ctrl+C to copy the file.</p> + </li> + <li> + <p class="Para">Use Ctrl+V (Paste) to create the copy. In the name conflict dialog which appears, rename the file + to file2.txt.</p> + </li> + </ol> + <p>(On the Mac, use ⌘+C and ⌘+V.)</p> + <p>There are now two identical files, file1.txt and file2.txt.</p> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-52c.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-52c.htm index d103eb4..a10ed8f 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-52c.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-52c.htm
@@ -1,49 +1,38 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Simple compare</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<h1>Simple compare</h1> - -<p CLASS="Head"> In one of the navigation views select file1.txt and file2.txt - choose <b>Compare With > Each Other</b> from the context menu.</p> -<p CLASS="Head"> A dialog will appear indicating that the two files are the same.</p> -<p CLASS="Head">Edit file1.txt as follows:</p> -<ul> - <li> - delete line 1 "<i>This is line 1."</i></li> - <li> - change line 3 to be "This is a much better line - 3."</li> - <li> - insert a line 4a (before line 5) that reads "This is - line 4a and it is new"</li> -</ul> -<p CLASS="Head">The file (file1.txt) should now read as follows:</p> -<blockquote> - <p><i>This is line 2.<br> - This is a much better line 3.<br> - This is line 4.<br> - This is line 4a and it is new<br> - This is line 5.</i></p> -</blockquote> -<p>Save the contents of the file by choosing <b>File > Save</b> (or pressing -Ctrl+S).</p> -<p>To compare the files, once again select file1.txt and file2.txt and choose - <b>Compare With > Each Other</b> in the navigation view context menu.</p> -<p>A special compare editor opens. The next section will explain how to use this - compare editor.</p> -<blockquote> - <P><img src="../images/Image80_compare_editor.png" width="715" alt="Compare Editor" border="0" > - </P> -</blockquote> -</BODY> -</HTML> \ No newline at end of file +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Simple compare</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>Simple compare</h1> + <p class="Head">In one of the navigation views select file1.txt and file2.txt choose <b>Compare With > Each + Other</b> from the context menu.</p> + <p class="Head">A dialog will appear indicating that the two files are the same.</p> + <p class="Head">Edit file1.txt as follows:</p> + <ul> + <li>delete line 1 "<i>This is line 1."</i></li> + <li>change line 3 to be "This is a much better line 3."</li> + <li>insert a line 4a (before line 5) that reads "This is line 4a and it is new"</li> + </ul> + <p class="Head">The file (file1.txt) should now read as follows:</p> + <blockquote> + <p><i>This is line 2.<br> + This is a much better line 3.<br> + This is line 4.<br> + This is line 4a and it is new<br> + This is line 5.</i></p> + </blockquote> + <p>Save the contents of the file by choosing <b>File > Save</b> (or pressing Ctrl+S).</p> + <p>To compare the files, once again select file1.txt and file2.txt and choose <b>Compare With > Each Other</b> in + the navigation view context menu.</p> + <p>A special compare editor opens. The next section will explain how to use this compare editor.</p> + <blockquote> + <p><img src="../images/Image80_compare_editor.png" width="715" alt="Compare Editor" border="0"></p> + </blockquote> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-52d.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-52d.htm index 0f761a9..e8539af 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-52d.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-52d.htm
@@ -1,45 +1,34 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Understanding the comparison</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<h1>Understanding the comparison</h1> - -<p CLASS="Head">Comparing file1.txt and file2.txt resulted in the following -compare editor. The left side shows the contents of file1.txt and the right side -shows the contents of file2.txt. The lines connecting the left and right panes -indicate the differences between the files.</p> -<p CLASS="Head">If more room is needed to look at the comparison, the editor tab - can be double clicked to maximize the editor.</p> -<p CLASS="Head"> -<img src="../images/Image80_compare_editor.png" width="715" alt="Compare editor" border="0" ></p> -<p CLASS="Head"> The numbered changes on the left side of the difference editor - are as follows:</p> -<ul> - <li> Starting with the top line (in the left pane) the difference bar indicates - something is missing from the very top - of the left file. Follow the difference band (see #1) to the right file. It - contains "This is line 1" .</li> - <li> The next line "This is line 2." is white indicating it matches - the right file.</li> - <li> Moving onto the next line, see that the - left file and right file have different contents for this line (see #2).</li> - <li> The next line (This is line 4) is once again in white, so it can be skipped.</li> - <li> The next line exists in the left file but since it is in the background - color its difference bar can be followed to the right (see #3) and notice - that the right file does not contain the line.</li> -</ul> -<p CLASS="Head">Initially the compare editor might seem a bit daunting but when - simply working down the left side and focusing on the items marked as gray, - and those items missing from the left side, it turns out not to be as tricky - as it first seems.</p> -</BODY> -</HTML> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Understanding the comparison</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>Understanding the comparison</h1> + <p class="Head">Comparing file1.txt and file2.txt resulted in the following compare editor. The left side shows the + contents of file1.txt and the right side shows the contents of file2.txt. The lines connecting the left and right + panes indicate the differences between the files.</p> + <p class="Head">If more room is needed to look at the comparison, the editor tab can be double clicked to maximize + the editor.</p> + <p class="Head"><img src="../images/Image80_compare_editor.png" width="715" alt="Compare editor" border="0"></p> + <p class="Head">The numbered changes on the left side of the difference editor are as follows:</p> + <ul> + <li>Starting with the top line (in the left pane) the difference bar indicates something is missing from the very + top of the left file. Follow the difference band (see #1) to the right file. It contains "This is line 1" .</li> + <li>The next line "This is line 2." is white indicating it matches the right file.</li> + <li>Moving onto the next line, see that the left file and right file have different contents for this line (see + #2).</li> + <li>The next line (This is line 4) is once again in white, so it can be skipped.</li> + <li>The next line exists in the left file but since it is in the background color its difference bar can be + followed to the right (see #3) and notice that the right file does not contain the line.</li> + </ul> + <p class="Head">Initially the compare editor might seem a bit daunting but when simply working down the left side and + focusing on the items marked as gray, and those items missing from the left side, it turns out not to be as tricky as + it first seems.</p> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-52e.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-52e.htm index 24b8053..fed0e38 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-52e.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-52e.htm
@@ -1,105 +1,81 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Working with the comparison</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<h1>Working with the comparison</h1> - -<p CLASS="Head">Comparing file1.txt and file2.txt resulted in the following compare - editor. This section demonstrates how to use the compare editor to resolve the - differences between the two files.</p> -<p> -<img src="../images/Image80_compare_editor.png" width="715" alt="Compare editor" border="0" ></p> -<p>There are two parts to the compare editor's local toolbar. Move between changes -and differences using the right group of local toolbar buttons.</p> -<blockquote> -<p> -<img src="../images/next_diff_nav.svg" alt="Compare editor next difference button" border="0"> -<img src="../images/prev_diff_nav.svg" alt="Compare editor next difference button" border="0"> -<img src="../images/next_change_nav.svg" alt="Compare editor next difference button" border="0"> -<img src="../images/prev_change_nav.svg" alt="Compare editor next change button" border="0"> -</p> -</blockquote> -<ol> - <li> - <p CLASS="Para">Click the <b>Select Next Difference</b> button <img - src="../images/next_diff_nav.svg" alt="Compare editor next difference button" - border="0">. Observe how it selects the next difference. - </p></li> - <li> - <p CLASS="Para"> - Click the <b>Select Next Change</b> button <img - src="../images/next_change_nav.svg" - alt="Compare editor next difference button" border="0">. - Observe how it selects the first change in this difference. - </p></li> - <li> - <p CLASS="Para">Click the <b>Select Next Change</b> button again <img - src="../images/next_change_nav.svg" - alt="Compare editor next change button" border="0">. Observe - how it selects the next difference. - </p> - </li> - <li> - <p CLASS="Para">Click the <b>Select Previous Change</b> button <img - src="../images/prev_change_nav.svg" - alt="Compare editor next change button" border="0">. Observe - how it selects the last change in a previous difference. - </p></li> - <li> - <p CLASS="Para"> - Click the <b>Select Previous Difference</b> button <img - src="../images/prev_diff_nav.svg" - alt="Compare editor next difference button" border="0">. - Observe how it selects the previous difference. - </p></li> -</ol> -<p>To merge changes from the left file to the right file and vice versa use the - left group of local toolbar buttons.</p> - <blockquote> - <p> - <img src="../images/copy_r_co.svg" alt="Image of the 'Copy All from Left to Right' button"> - <img src="../images/copy_l_co.svg" alt="Image of the 'Copy All Non-Conflicting Changes from Right to Left' button"> - <img src="../images/copycont_r_co.svg" alt="Image of the 'Copy Current Change from Left to Right' button"> - <img src="../images/copycont_l_co.svg" alt="Image of the 'Copy Current Change from Right to Left' button"> - </p> - </blockquote> - <p>There are four types of merges that can - be performed:</p> -<ul> - <li>Copy whole document from left to right.</li> - <li>Copy whole document from right to left.</li> - <li>Copy current change from left to right.</li> - <li>Copy current change from right to left.</li> -</ul> -<p> Typically the copy whole document actions are used when the entire file on - either the left or right can just be replaced by the contents of the other file.</p> -<p> The Copy current change buttons allow a single change to be merged.</p> -<ol> - <li> - <p CLASS="Para">Ensure that the second difference is selected.</p> - </li> - <li> - - <p CLASS="Para">Click <strong>Copy Current Change from Right to Left - </strong><img src="../images/copycont_l_co.svg" alt="Compare editor right to left button" border="0">. - Observe that the selected text from the right file is copied to the left - file.</p> - </li> - <li> - - <p CLASS="Para">Close the compare editor and choose <b>Yes</b> to save the - changes. Alternatively, save the changes by choosing <b>File > Save</b> - (Ctrl+S).</p> - </li> -</ol> -</BODY> -</HTML> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Working with the comparison</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>Working with the comparison</h1> + <p class="Head">Comparing file1.txt and file2.txt resulted in the following compare editor. This section demonstrates + how to use the compare editor to resolve the differences between the two files.</p> + <p><img src="../images/Image80_compare_editor.png" width="715" alt="Compare editor" border="0"></p> + <p>There are two parts to the compare editor's local toolbar. Move between changes and differences using the right + group of local toolbar buttons.</p> + <blockquote> + <p><img src="../images/next_diff_nav.svg" alt="Compare editor next difference button" border="0"> <img src= + "../images/prev_diff_nav.svg" alt="Compare editor next difference button" border="0"> <img src= + "../images/next_change_nav.svg" alt="Compare editor next difference button" border="0"> <img src= + "../images/prev_change_nav.svg" alt="Compare editor next change button" border="0"></p> + </blockquote> + <ol> + <li> + <p class="Para">Click the <b>Select Next Difference</b> button <img src="../images/next_diff_nav.svg" alt= + "Compare editor next difference button" border="0">. Observe how it selects the next difference.</p> + </li> + <li> + <p class="Para">Click the <b>Select Next Change</b> button <img src="../images/next_change_nav.svg" alt= + "Compare editor next difference button" border="0">. Observe how it selects the first change in this + difference.</p> + </li> + <li> + <p class="Para">Click the <b>Select Next Change</b> button again <img src="../images/next_change_nav.svg" alt= + "Compare editor next change button" border="0">. Observe how it selects the next difference.</p> + </li> + <li> + <p class="Para">Click the <b>Select Previous Change</b> button <img src="../images/prev_change_nav.svg" alt= + "Compare editor next change button" border="0">. Observe how it selects the last change in a previous + difference.</p> + </li> + <li> + <p class="Para">Click the <b>Select Previous Difference</b> button <img src="../images/prev_diff_nav.svg" alt= + "Compare editor next difference button" border="0">. Observe how it selects the previous difference.</p> + </li> + </ol> + <p>To merge changes from the left file to the right file and vice versa use the left group of local toolbar + buttons.</p> + <blockquote> + <p><img src="../images/copy_r_co.svg" alt="Image of the 'Copy All from Left to Right' button"> <img src= + "../images/copy_l_co.svg" alt="Image of the 'Copy All Non-Conflicting Changes from Right to Left' button"> + <img src="../images/copycont_r_co.svg" alt="Image of the 'Copy Current Change from Left to Right' button"> + <img src="../images/copycont_l_co.svg" alt="Image of the 'Copy Current Change from Right to Left' button"></p> + </blockquote> + <p>There are four types of merges that can be performed:</p> + <ul> + <li>Copy whole document from left to right.</li> + <li>Copy whole document from right to left.</li> + <li>Copy current change from left to right.</li> + <li>Copy current change from right to left.</li> + </ul> + <p>Typically the copy whole document actions are used when the entire file on either the left or right can just be + replaced by the contents of the other file.</p> + <p>The Copy current change buttons allow a single change to be merged.</p> + <ol> + <li> + <p class="Para">Ensure that the second difference is selected.</p> + </li> + <li> + <p class="Para">Click <strong>Copy Current Change from Right to Left</strong> <img src= + "../images/copycont_l_co.svg" alt="Compare editor right to left button" border="0">. Observe that the selected + text from the right file is copied to the left file.</p> + </li> + <li> + <p class="Para">Close the compare editor and choose <b>Yes</b> to save the changes. Alternatively, save the + changes by choosing <b>File > Save</b> (Ctrl+S).</p> + </li> + </ol> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-55.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-55.htm index e91d905..bdaaf0e 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-55.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-55.htm
@@ -1,52 +1,38 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<LINK REL="STYLESHEET" HREF="team-cvs.css" CHARSET="ISO-8859-1" TYPE="text/css"> - -<title>Local history</title> - -</HEAD> -<BODY> -<h1>Local history</h1> - -<p> Every time an editable file is saved in the Workbench, the Workbench - updates the local history of that file and logs the changes that have been made. - The local history of a file can then be accessed and a previously saved copy - of the file can be reverted to, as long as the desired state is recent enough - in the save history.</p> -<ol> - <li class="Steps">Create a new file named <em class="FileName">sampleFile.txt</em>. - </li> - <li class="Steps">In the editor for <em class="FileName">sampleFile.txt</em> modify the file by adding the line - "change1" and saving the file. - </li> - <li class="Steps">Repeat this by entering a new line "change2" and saving it again. - </li> - <li class="Steps">Add a third line "change3" and save it again. </li> - <li class="Steps">Right-click the file in a navigation view (e.g. the Project Explorer) and - select <em class="UILabel">Team > Show Local History</em>. - <p><em>Note:</em> Repository tooling may override the <em class="UILabel">Team > Show Local History</em> - operation to provide a unified history for a file.</li> - - <li class="Steps">The History view opens and shows the history for the file.</li> - <li class="Steps">The top entry in the view represents the current contents of the file. - The next represents the previous contents and so on. - Right-click on the previous entry and select <em class="UILabel">Compare Current with Local</em> - to open a Compare editor that displays the differences between - the Workbench file and the specific copy of the file selected in the local - history.</li> - <li class="Steps">Right-click on the previous entry again and select <em class="UILabel">Get Contents</em>. - This replaces the Workbench's copy of - <em class="FileName">sampleFile.txt</em> with the chosen local history item. - </li> - <li class="Steps">Observe that the <em class="FileName">sampleFile.txt</em> editor now contains two lines. - </li> -</ol> - -</BODY> -</HTML> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <link rel="STYLESHEET" href="team-cvs.css" charset="ISO-8859-1" type="text/css"> + <title>Local history</title> +</head> +<body> + <h1>Local history</h1> + <p>Every time an editable file is saved in the Workbench, the Workbench updates the local history of that file and + logs the changes that have been made. The local history of a file can then be accessed and a previously saved copy of + the file can be reverted to, as long as the desired state is recent enough in the save history.</p> + <ol> + <li class="Steps">Create a new file named <em class="FileName">sampleFile.txt</em>.</li> + <li class="Steps">In the editor for <em class="FileName">sampleFile.txt</em> modify the file by adding the line + "change1" and saving the file.</li> + <li class="Steps">Repeat this by entering a new line "change2" and saving it again.</li> + <li class="Steps">Add a third line "change3" and save it again.</li> + <li class="Steps">Right-click the file in a navigation view (e.g. the Project Explorer) and select <em class= + "UILabel">Team > Show Local History</em>. + <p><em>Note:</em> Repository tooling may override the <em class="UILabel">Team > Show Local History</em> + operation to provide a unified history for a file.</p> + </li> + <li class="Steps">The History view opens and shows the history for the file.</li> + <li class="Steps">The top entry in the view represents the current contents of the file. The next represents the + previous contents and so on. Right-click on the previous entry and select <em class="UILabel">Compare Current with + Local</em> to open a Compare editor that displays the differences between the Workbench file and the specific copy + of the file selected in the local history.</li> + <li class="Steps">Right-click on the previous entry again and select <em class="UILabel">Get Contents</em>. This + replaces the Workbench's copy of <em class="FileName">sampleFile.txt</em> with the chosen local history item.</li> + <li class="Steps">Observe that the <em class="FileName">sampleFile.txt</em> editor now contains two lines.</li> + </ol> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-55b.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-55b.htm index 8b29b0d..0750df4 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-55b.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-55b.htm
@@ -1,30 +1,24 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Exiting the Workbench</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<h1>Exiting the Workbench</h1> - -<P CLASS="Para"> Each time the Workbench is exited, the Workbench is automatically - saved, including all open perspectives and windows. The next time the Workbench - is reopened, it will appear exactly as it was when it was last closed.</P> -<p> To exit the Workbench, select <b>File > Exit</b> from the menu bar or close - the workbench with the window close button (x). When the latter option is used - a prompt will ask if you really wish to exit the workbench. </p> -<p><strong>Note: </strong>This dialog also presents an option to turn off the - prompting. To turn it back on, open the <strong>Preferences</strong> dialog - and choose the <a class="command-link" - href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Startup)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> - <strong>General > Startup and Shutdown</strong></a> preferences page. - Check the <b>Confirm exit when closing last window</b> checkbox.</p> -</BODY> -</HTML> \ No newline at end of file +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Exiting the Workbench</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>Exiting the Workbench</h1> + <p class="Para">Each time the Workbench is exited, the Workbench is automatically saved, including all open + perspectives and windows. The next time the Workbench is reopened, it will appear exactly as it was when it was last + closed.</p> + <p>To exit the Workbench, select <b>File > Exit</b> from the menu bar or close the workbench with the window close + button (x). When the latter option is used a prompt will ask if you really wish to exit the workbench.</p> + <p><strong>Note:</strong> This dialog also presents an option to turn off the prompting. To turn it back on, open the + <strong>Preferences</strong> dialog and choose the <a class="command-link" href= + 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Startup)")'> + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>General > Startup and + Shutdown</strong></a> preferences page. Check the <b>Confirm exit when closing last window</b> checkbox.</p> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-60_team.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-60_team.htm index a347ef0..2ec7f2b 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-60_team.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-60_team.htm
@@ -1,31 +1,23 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Team CVS tutorial</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<H1 CLASS="Head"> Team CVS tutorial</H1> -<P>This chapter will explain how to use the CVS team capabilities built into the - Workbench. The steps in this chapter are team oriented; it will be difficult - to complete these tutorials if others are not simultaneously working through - this chapter. </P> - - -<P>You will learn how to work on a project and then commit - changes to the repository for others on the team to use. By continuing to work - on the project alongside other users, this section will demonstrate how to commit - resources that other users may be simultaneously working on, and how to update - a workspace with changes others make in the project. </P> -<P>Remember, before getting started, that you need to entice at least one co-worker into working - through these steps as well. Another option is to start up two Eclipse instances - at once and step through both roles yourself.</P> - -</BODY> -</HTML> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Team CVS tutorial</title> +</head> +<body bgcolor="#FFFFFF"> + <h1 class="Head">Team CVS tutorial</h1> + <p>This chapter will explain how to use the CVS team capabilities built into the Workbench. The steps in this chapter + are team oriented; it will be difficult to complete these tutorials if others are not simultaneously working through + this chapter.</p> + <p>You will learn how to work on a project and then commit changes to the repository for others on the team to use. + By continuing to work on the project alongside other users, this section will demonstrate how to commit resources + that other users may be simultaneously working on, and how to update a workspace with changes others make in the + project.</p> + <p>Remember, before getting started, that you need to entice at least one co-worker into working through these steps + as well. Another option is to start up two Eclipse instances at once and step through both roles yourself.</p> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-60a_setup.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-60a_setup.htm index 68e952f..35d615b 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-60a_setup.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-60a_setup.htm
@@ -1,23 +1,20 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2015. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Setting up a CVS repository</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<h1> Setting up a CVS repository</h1> -<P CLASS="Para"> -A repository is a persistent store that coordinates multi-user access to the -resources being developed by a team. The Workbench comes with CVS support -built-in. You can find more information on CVS at <a href="https://directory.fsf.org/wiki/CVS" target="_blank">https://directory.fsf.org/wiki/CVS</a>.</P> -<P CLASS="Para"> Refer to this site for information on how to install and configure - a CVS repository including user access and passwords.</P> -<p>In order to continue with this tutorial, access to a CVS repository is required.</p> -</BODY> -</HTML> \ No newline at end of file +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2015. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Setting up a CVS repository</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>Setting up a CVS repository</h1> + <p class="Para">A repository is a persistent store that coordinates multi-user access to the resources being + developed by a team. The Workbench comes with CVS support built-in. You can find more information on CVS at <a href= + "https://directory.fsf.org/wiki/CVS" target="_blank">https://directory.fsf.org/wiki/CVS</a>.</p> + <p class="Para">Refer to this site for information on how to install and configure a CVS repository including user + access and passwords.</p> + <p>In order to continue with this tutorial, access to a CVS repository is required.</p> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-61c_offline.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-61c_offline.htm index c619880..5f42427 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-61c_offline.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-61c_offline.htm
@@ -1,50 +1,37 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Starting offline</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> - -<h1>Starting offline</h1> - -<P CLASS="Para">The team CVS tutorial will start by working offline and creating - a simple project. Once the project is created, instructions will be given explaining - how to commit it to the repository.</P> -<ol> - <li> - Create a new "General" project using <b>File > - New > Project > General > Project</b>. Use a unique name as the project name (e.g. JanesTeamProject). - </li> - <li>Create a folder named folder1. </li> - <li>Create two text files (.txt) in folder1 called file1.txt and file2.txt. - Their contents should be as follows: - <p>file1.txt</p> - <blockquote> - <p><i>This is the contents<br> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Starting offline</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>Starting offline</h1> + <p class="Para">The team CVS tutorial will start by working offline and creating a simple project. Once the project + is created, instructions will be given explaining how to commit it to the repository.</p> + <ol> + <li>Create a new "General" project using <b>File > New > Project > General > Project</b>. Use a unique + name as the project name (e.g. JanesTeamProject).</li> + <li>Create a folder named folder1.</li> + <li>Create two text files (.txt) in folder1 called file1.txt and file2.txt. Their contents should be as follows: + <p>file1.txt</p> + <blockquote> + <p><i>This is the contents<br> of file 1.</i></p> - </blockquote> - <p>file2.txt</p> - <blockquote> - <p><i>File2 is a small file<br> + </blockquote> + <p>file2.txt</p> + <blockquote> + <p><i>File2 is a small file<br> with simple text.</i></p> - </blockquote> - <p>The navigation view should now appear as follows:</p> - <p> <img src="../images/Image82_nav.png" alt="Project Explorer view" border="0"></p> - </li> -</ol> - - -<P>The project can be continued within this mode but unless the project is committed - into the repository, others on the team will be unable to work on the project - as well. </P> - - -</BODY> -</HTML> \ No newline at end of file + </blockquote> + <p>The navigation view should now appear as follows:</p> + <p><img src="../images/Image82_nav.png" alt="Project Explorer view" border="0"></p> + </li> + </ol> + <p>The project can be continued within this mode but unless the project is committed into the repository, others on + the team will be unable to work on the project as well.</p> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-61d_repoloca.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-61d_repoloca.htm index 244a07a..1db4d0c 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-61d_repoloca.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-61d_repoloca.htm
@@ -1,32 +1,24 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html lang="en"> <head> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - - <meta content="text/html; charset=ISO-8859-1" - http-equiv="Content-Type"> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta content="text/html; charset=utf-8" http-equiv="Content-Type"> <meta content="text/css" http-equiv="Content-Style-Type"> - <link type="text/css" charset="ISO-8859-1" href="../book.css" - rel="STYLESHEET"> + <link type="text/css" charset="ISO-8859-1" href="../book.css" rel="STYLESHEET"> <title>Sharing the project</title> </head> -<body bgcolor="#ffffff"> -<h1> Sharing the project</h1> - -<div class="Subtopic">Now that a project has been created in the -workspace you can make it available to other Team members. To do this -the following steps will have to occur:<br> -<br> -<ol> - <li>Create a CVS location identifying the team's shared CVS -repository.<br> +<body bgcolor="#FFFFFF"> + <h1>Sharing the project</h1> + <div class="Subtopic"> + Now that a project has been created in the workspace you can make it available to other Team members. To do this + the following steps will have to occur:<br> <br> - </li> - <li>Share the project with the CVS location and commit the changes.<br> - </li> -</ol> -</div> - + <ol> + <li>Create a CVS location identifying the team's shared CVS repository.<br> + <br></li> + <li>Share the project with the CVS location and commit the changes.<br></li> + </ol> + </div> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-61d_repolocb.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-61d_repolocb.htm index 6d4de40..8d7567c 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-61d_repolocb.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-61d_repolocb.htm
@@ -1,96 +1,67 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html lang="en"> <head> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - - <meta content="text/html; charset=ISO-8859-1" - http-equiv="Content-Type"> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta content="text/html; charset=utf-8" http-equiv="Content-Type"> <meta content="text/css" http-equiv="Content-Style-Type"> - <link type="text/css" charset="ISO-8859-1" href="../book.css" - rel="STYLESHEET"> + <link type="text/css" charset="ISO-8859-1" href="../book.css" rel="STYLESHEET"> <title>Specifying a repository location</title> </head> -<body bgcolor="#ffffff"> -<h1>Specifying a repository location</h1> - -<p class="Head">You must specify an available repository before it -is possible to share the project with others. -</p> -<ol> - <li>Open the CVS Repository Exploring perspective. The top left view -shows all of the CVS repositories that are currently being worked with. -As you can see, the view is empty, meaning a repository still needs to -be specified.<br> - <br> - </li> - <li>In the context menu of the CVS Repositories view choose <b>New -> Repository Location</b>. - <p> <img border="0" - alt="CVS Repositories view" src="../images/Image82_repo_new.png"></p> - </li> - <li>In the CVS Repository Location wizard, the location of the -repository and the login information needs to be filled in. You may need -assistance from a repository administrator in order to fill in the necessary information. - <p> <img border="0" - alt="Add CVS Repository dialog" src="../images/Image82_repo_new3.png"></p> - </li> - <li> - <p class="Para"> In the <b> Host </b> field, type the address of -the host (for example, "teamsamples.com").<br> - <br> - </p> - </li> - <li> - <p class="Para"> In the <b> Repository path </b> field, type the -path for the repository at the host address (for example, -"/home/cvsroot/repositoryName").<br> - <br> - </p> - </li> - <li> - <p class="Para">In the <b> User </b> field, type the user name -under which to connect.<br> - <br> - </p> - </li> - <li> - <p class="Para">In the <b>Password</b> field, type the password.<br> - <br> - </p> - </li> - <li> - <p class="Para"> In the <b> Connection type </b> field, select -the type of CVS connection for the repository (The default is pserver).<br> - <br> - </p> - </li> - <li> - <p class="Para"> Leave<b> Use Default Port</b> enabled. <br> - <br> - </p> - </li> - <li>By default the <b>Validate Connection on Finish<b> option </b></b>is -checked. <br> - <br> - </li> - <li> - <p class="Para"> Click <b>Finish</b> when done.</p> - <p class="Para"> Since <b>Validate location on finish </b>was -checked,<b> </b>the wizard will now attempt to validate the -information by connecting to the repository. In doing so it may prompt -for a password. <strong>Note: </strong>The repository connection is -only used to validate the information.<br> - <br> - </p> - </li> - <li> - <p class="Para">Observe that the CVS Repositories view now shows -the new repository location.</p> - <p class="Para"> <img border="0" - alt="CVS Repositories view" src="../images/Image82_repo_view1.png"></p> - </li> -</ol> - +<body bgcolor="#FFFFFF"> + <h1>Specifying a repository location</h1> + <p class="Head">You must specify an available repository before it is possible to share the project with others.</p> + <ol> + <li>Open the CVS Repository Exploring perspective. The top left view shows all of the CVS repositories that are + currently being worked with. As you can see, the view is empty, meaning a repository still needs to be + specified.<br> + <br></li> + <li>In the context menu of the CVS Repositories view choose <b>New > Repository Location</b>. + <p><img border="0" alt="CVS Repositories view" src="../images/Image82_repo_new.png"></p> + </li> + <li>In the CVS Repository Location wizard, the location of the repository and the login information needs to be + filled in. You may need assistance from a repository administrator in order to fill in the necessary information. + <p><img border="0" alt="Add CVS Repository dialog" src="../images/Image82_repo_new3.png"></p> + </li> + <li> + <p class="Para">In the <b>Host</b> field, type the address of the host (for example, "teamsamples.com").<br> + <br></p> + </li> + <li> + <p class="Para">In the <b>Repository path</b> field, type the path for the repository at the host address (for + example, "/home/cvsroot/repositoryName").<br> + <br></p> + </li> + <li> + <p class="Para">In the <b>User</b> field, type the user name under which to connect.<br> + <br></p> + </li> + <li> + <p class="Para">In the <b>Password</b> field, type the password.<br> + <br></p> + </li> + <li> + <p class="Para">In the <b>Connection type</b> field, select the type of CVS connection for the repository (The + default is pserver).<br> + <br></p> + </li> + <li> + <p class="Para">Leave <b>Use Default Port</b> enabled.<br> + <br></p> + </li> + <li>By default the <b>Validate Connection on Finish</b> option is checked.<br> + <br></li> + <li> + <p class="Para">Click <b>Finish</b> when done.</p> + <p class="Para">Since <b>Validate location on finish</b> was checked, the wizard will now attempt to validate the + information by connecting to the repository. In doing so it may prompt for a password. <strong>Note:</strong> The + repository connection is only used to validate the information.<br> + <br></p> + </li> + <li> + <p class="Para">Observe that the CVS Repositories view now shows the new repository location.</p> + <p class="Para"><img border="0" alt="CVS Repositories view" src="../images/Image82_repo_view1.png"></p> + </li> + </ol> </body> -</html> \ No newline at end of file +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-61e_whatisloc.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-61e_whatisloc.htm index bd6787e..83dc32a 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-61e_whatisloc.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-61e_whatisloc.htm
@@ -1,33 +1,26 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> -<HEAD> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> -<title>Repository locations</title> - -</HEAD> -<BODY BGCOLOR="#ffffff"> -<h1>Repository locations</h1> -<DIV CLASS="Subtopic"> - - <p CLASS="Para">Now that a new repository location has been added to the CVS - Repositories view, the following will explain what a repository location is - or, more importantly, what it isn't.</p> - <p CLASS="Para">A repository location is not an actual live connection. Instead, - it is a description of where the repository is located. At a later time, when - instructions are given explaining how to commit work to the repository or - update with work done by others, the Workbench will create a connection based - on this location information. Connections will be opened and closed as required - when performing CVS team operations, and those connections will be based on - the information provided in the repository location. </p> - <p CLASS="Para">When disconnected from the network the CVS Repositories view - continues to display the list of known repository locations. In addition, - the projects themselves will still know the repository location they are associated - with.</p> -</DIV> -</BODY> -</HTML> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> +<head> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Repository locations</title> +</head> +<body bgcolor="#FFFFFF"> + <h1>Repository locations</h1> + <div class="Subtopic"> + <p class="Para">Now that a new repository location has been added to the CVS Repositories view, the following will + explain what a repository location is or, more importantly, what it isn't.</p> + <p class="Para">A repository location is not an actual live connection. Instead, it is a description of where the + repository is located. At a later time, when instructions are given explaining how to commit work to the repository + or update with work done by others, the Workbench will create a connection based on this location information. + Connections will be opened and closed as required when performing CVS team operations, and those connections will + be based on the information provided in the repository location.</p> + <p class="Para">When disconnected from the network the CVS Repositories view continues to display the list of known + repository locations. In addition, the projects themselves will still know the repository location they are + associated with.</p> + </div> +</body> +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-61f_syncproject.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-61f_syncproject.htm index 2b146a3..6ebfea7 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-61f_syncproject.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-61f_syncproject.htm
@@ -1,63 +1,42 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html lang="en"> <head> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - - <meta content="text/html; charset=ISO-8859-1" - http-equiv="Content-Type"> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta content="text/html; charset=utf-8" http-equiv="Content-Type"> <meta content="text/css" http-equiv="Content-Style-Type"> - <link type="text/css" charset="ISO-8859-1" href="../book.css" - rel="STYLESHEET"> + <link type="text/css" charset="ISO-8859-1" href="../book.css" rel="STYLESHEET"> <title>Sharing a project</title> </head> -<body bgcolor="#ffffff"> -<h1> Sharing a project</h1> - -<p class="Para"> Now that a project has been created and a repository -location has been specified, the project can be made available to other -team members.</p> -<ol> - <li> - <p class="Para"> In one of the navigation views select the project -JanesTeamProject.</p> - </li> - <li> - <p class="Para">From the project's context menu choose <b>Team -> Share Project</b>. If more than one repository provider is -installed, select <strong>CVS </strong>and select <strong>Next</strong>.</p> - </li> - <li> - <p class="Para"> In the sharing wizard page, select the location -that was previously created.</p> - <p><img border="0" - alt="Set Project Sharing" src="../images/Image82_repo_sync1.png"></p> - </li> - <li>The next page will ask you the module name to create on the -server. Simply use the default value and use the name of the project -you are sharing. Click <span style="font-weight: bold;">Next</span>. - <p> - <img alt="Set Module Name" src="../images/Image82_repo_sync2.png"> - </p> - <br> - </li> - <li>The next page will allow you to see the files that are going to -be shared with your team. The arrows with the plus sign show that the -files are new outgoing additions. They have never existed on the server -yet. - <p> - <img alt="File sharing preview" src="../images/Image82_repo_team.png"> - </p> - </li> - <li>Press <span style="font-weight: bold;">Finish</span> and you will be prompted - to commit the files. Enter a commit comment to describe the commit you are - making. You can enter anything you like. Press <strong>Finish</strong> when - you are done and the files will be committed.<br> - </li> - <li>Now you have shared the project and all the files have been -committed to the CVS repository. Others can now see your files!<br> - </li> -</ol> - +<body bgcolor="#FFFFFF"> + <h1>Sharing a project</h1> + <p class="Para">Now that a project has been created and a repository location has been specified, the project can be + made available to other team members.</p> + <ol> + <li> + <p class="Para">In one of the navigation views select the project JanesTeamProject.</p> + </li> + <li> + <p class="Para">From the project's context menu choose <b>Team > Share Project</b>. If more than one + repository provider is installed, select <strong>CVS</strong> and select <strong>Next</strong>.</p> + </li> + <li> + <p class="Para">In the sharing wizard page, select the location that was previously created.</p> + <p><img border="0" alt="Set Project Sharing" src="../images/Image82_repo_sync1.png"></p> + </li> + <li>The next page will ask you the module name to create on the server. Simply use the default value and use the + name of the project you are sharing. Click <span style="font-weight: bold;">Next</span>. + <p><img alt="Set Module Name" src="../images/Image82_repo_sync2.png"></p><br> + </li> + <li>The next page will allow you to see the files that are going to be shared with your team. The arrows with the + plus sign show that the files are new outgoing additions. They have never existed on the server yet. + <p><img alt="File sharing preview" src="../images/Image82_repo_team.png"></p> + </li> + <li>Press <span style="font-weight: bold;">Finish</span> and you will be prompted to commit the files. Enter a + commit comment to describe the commit you are making. You can enter anything you like. Press + <strong>Finish</strong> when you are done and the files will be committed.<br></li> + <li>Now you have shared the project and all the files have been committed to the CVS repository. Others can now see + your files!<br></li> + </ol> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-64a_another.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-64a_another.htm index 928560d..f3677e6 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-64a_another.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-64a_another.htm
@@ -1,60 +1,49 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html lang="en"> <head> - <meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Style-Type" content="text/css"> <link type="text/css" charset="ISO-8859-1" href="../book.css" rel="STYLESHEET"> <link type="text/css" charset="ISO-8859-1" href="team-cvs.css" rel="STYLESHEET"> <title>Working with another user</title> </head> - <body> -<h1>Working with another user</h1> - -<p>Instructions were given explaining how to create a project and -commit it to the repository. First a repository location was specified. -Next the project was shared with that location and the HEAD branch and -the resources were added then committed.</p> - -<p>The repository currently contains the project and the two files -that were committed (<em class="FileName">file1.txt</em> and <em class="FileName">file2.txt</em>). </p> -<p>It's time to find that co-worker (let's call him Fred) to work -through some steps with you (for the remainder your name is Jane). This -section will demonstrate how two -people can work on the same project and simultaneously commit changes -to the repository. Specifically, the following actions will be taken: </p> -<ul> - <li>Fred will import the project to his Workbench</li> - <li>Fred will make changes to <em class="FileName">file1.txt</em> and <em class="FileName">file2.txt</em>.</li> - <li>You will update these new changes and also add a new file called -<em class="FileName">file3.txt</em>.</li> - <li>Fred will make more changes to some files while you change the -same files. Fred will release his changes first. - </li> - <li>You will have to resolve the conflicts between files that you -both changed.</li> -</ul> -Here is some terminology commonly used to describe changes:<br> -<table border="0" cellspacing="0" cellpadding="3" width="568"> - <tbody> - <tr> - <td valign="top" width="71" align="left"> <b>incoming</b> </td> - <td valign="top" width="481" align="left">Changes that are in the -repository, which you have not yet updated to. </td> - </tr> - <tr> - <td valign="top" width="71" align="left"> <b>outgoing</b> </td> - <td valign="top" width="481" align="left">Changes that you are -committing. </td> - </tr> - <tr> - <td valign="top" width="71" align="left"> <b>conflict</b> </td> - <td valign="top" width="481" align="left">Both you and the -repository have modifications to the same resource. </td> - </tr> - </tbody> -</table> - + <h1>Working with another user</h1> + <p>Instructions were given explaining how to create a project and commit it to the repository. First a repository + location was specified. Next the project was shared with that location and the HEAD branch and the resources were + added then committed.</p> + <p>The repository currently contains the project and the two files that were committed (<em class= + "FileName">file1.txt</em> and <em class="FileName">file2.txt</em>).</p> + <p>It's time to find that co-worker (let's call him Fred) to work through some steps with you (for the remainder your + name is Jane). This section will demonstrate how two people can work on the same project and simultaneously commit + changes to the repository. Specifically, the following actions will be taken:</p> + <ul> + <li>Fred will import the project to his Workbench</li> + <li>Fred will make changes to <em class="FileName">file1.txt</em> and <em class="FileName">file2.txt</em>.</li> + <li>You will update these new changes and also add a new file called <em class="FileName">file3.txt</em>.</li> + <li>Fred will make more changes to some files while you change the same files. Fred will release his changes + first.</li> + <li>You will have to resolve the conflicts between files that you both changed.</li> + </ul>Here is some terminology commonly used to describe changes:<br> + <table border="0" cellspacing="0" cellpadding="3" width="568"> + <tbody> + <tr> + <td valign="top" width="71" align="left"><b>incoming</b></td> + <td valign="top" width="481" align="left">Changes that are in the repository, which you have not yet updated + to.</td> + </tr> + <tr> + <td valign="top" width="71" align="left"><b>outgoing</b></td> + <td valign="top" width="481" align="left">Changes that you are committing.</td> + </tr> + <tr> + <td valign="top" width="71" align="left"><b>conflict</b></td> + <td valign="top" width="481" align="left">Both you and the repository have modifications to the same + resource.</td> + </tr> + </tbody> + </table> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-64b_fredadd.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-64b_fredadd.htm index 75930c0..c5de9c5 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-64b_fredadd.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-64b_fredadd.htm
@@ -1,54 +1,41 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html lang="en"> <head> - <meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Style-Type" content="text/css"> <link type="text/css" charset="ISO-8859-1" href="../book.css" rel="STYLESHEET"> <link type="text/css" charset="ISO-8859-1" href="team-cvs.css" rel="STYLESHEET"> <title>Checking out a project</title> </head> - <body> -<h1> Checking out a project</h1> - -<p>Coworker Fred has several tasks in front of him:</p> -<ul> - <li>Fred will import the project that Jane committed to the CVS -repository into his Workbench.</li> - <li>Fred will make changes to <em class="FileName">file1.txt</em> and <em class="FileName">file2.txt</em>.</li> - <li>Fred will synchronize and commit his outgoing changes to the two -files.</li> -</ul> -<p>Fred's first step is to import the project into his workspace as -follows:</p> -<ol> - <li class="Steps">Run the import wizard via the - <em class="UILabel">File > Import</em> menu item. - <img class="Big" src="../images/Image82_import_project_fred.png" alt="Screenshot of Import type selection"> - </li> - <li class="Steps">Select the <em class="UILabel">Projects from CVS</em> - item and press <em class="UILabel">Next</em>. - </li> - <li class="Steps">Create a repository location as described when Jane <a - href="qs-61d_repolocb.htm">created a repository</a>. - </li> - <li class="Steps">On the next page select the "Use an existing module" radio button - and wait while the repository is contacted. - <img class="Big" src="../images/Image82_import2_project_fred.png" alt="Screenshot of CVS module selection page"> - </li> - <li class="Steps">From the list of available projects, select <em class="ProjectName">JanesTeamProject</em> - and press <em class="UILabel">Finish</em>. A progress dialog will - appear showing the progress of the import operation.<br> - <img class="Big" src="../images/Image82_import3_project_fred.png" alt="Screenshot of progress dialog"> - </li> - <li class="Steps">Open one of the navigation views and observe that it now includes - the project <em class="ProjectName">JanesTeamProject</em>. - Notice that there are CVS decorators indicating the file revisions, the - repository name, and the file types. - <img class="Big" src="../images/Image82_import4_project_fred.png" alt="Screenshot of Fred's Project Explorer after checkout"> - </li> -</ol> - + <h1>Checking out a project</h1> + <p>Coworker Fred has several tasks in front of him:</p> + <ul> + <li>Fred will import the project that Jane committed to the CVS repository into his Workbench.</li> + <li>Fred will make changes to <em class="FileName">file1.txt</em> and <em class="FileName">file2.txt</em>.</li> + <li>Fred will synchronize and commit his outgoing changes to the two files.</li> + </ul> + <p>Fred's first step is to import the project into his workspace as follows:</p> + <ol> + <li class="Steps">Run the import wizard via the <em class="UILabel">File > Import</em> menu item. <img class= + "Big" src="../images/Image82_import_project_fred.png" alt="Screenshot of Import type selection"></li> + <li class="Steps">Select the <em class="UILabel">Projects from CVS</em> item and press <em class= + "UILabel">Next</em>.</li> + <li class="Steps">Create a repository location as described when Jane <a href="qs-61d_repolocb.htm">created a + repository</a>.</li> + <li class="Steps">On the next page select the "Use an existing module" radio button and wait while the repository + is contacted. <img class="Big" src="../images/Image82_import2_project_fred.png" alt= + "Screenshot of CVS module selection page"></li> + <li class="Steps">From the list of available projects, select <em class="ProjectName">JanesTeamProject</em> and + press <em class="UILabel">Finish</em>. A progress dialog will appear showing the progress of the import + operation.<br> + <img class="Big" src="../images/Image82_import3_project_fred.png" alt="Screenshot of progress dialog"></li> + <li class="Steps">Open one of the navigation views and observe that it now includes the project <em class= + "ProjectName">JanesTeamProject</em>. Notice that there are CVS decorators indicating the file revisions, the + repository name, and the file types. <img class="Big" src="../images/Image82_import4_project_fred.png" alt= + "Screenshot of Fred's Project Explorer after checkout"></li> + </ol> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-64b_fredmod.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-64b_fredmod.htm index c9bca4f..cdb5642 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-64b_fredmod.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-64b_fredmod.htm
@@ -1,83 +1,74 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html lang="en"> <head> - <meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - <meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type"> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta content="text/html; charset=utf-8" http-equiv="Content-Type"> <meta content="text/css" http-equiv="Content-Style-Type"> <link type="text/css" charset="ISO-8859-1" href="../book.css" rel="STYLESHEET"> <link type="text/css" charset="ISO-8859-1" href="team-cvs.css" rel="STYLESHEET"> <title>Another user making changes</title> </head> - <body> -<h1>Another user making changes</h1> - -<p>Now that Fred has the project in his Workbench he needs -to modify several of the files and synchronize with the repository in -order to commit them.</p> -<ul> - <li>Fred will make changes to <em class="FileName">file1.txt</em> and <em class="FileName">file2.txt</em></li> - <li>Fred will synchronize and commit his outgoing changes to the two files.</li> -</ul> -<p>Fred should proceed as follows:</p> -<ol> - <li class="Steps">Modify <em class="FileName">file1.txt</em> as follows - <div class="FileContentsDescription">Original contents: - <pre class="FileContents"> + <h1>Another user making changes</h1> + <p>Now that Fred has the project in his Workbench he needs to modify several of the files and synchronize with the + repository in order to commit them.</p> + <ul> + <li>Fred will make changes to <em class="FileName">file1.txt</em> and <em class="FileName">file2.txt</em></li> + <li>Fred will synchronize and commit his outgoing changes to the two files.</li> + </ul> + <p>Fred should proceed as follows:</p> + <ol> + <li class="Steps">Modify <em class="FileName">file1.txt</em> as follows + <div class="FileContentsDescription"> + Original contents: + <pre class="FileContents"> This is the contents of file 1. </pre> - </div> - <div class="FileContentsDescription">New contents (changes shown in bold): - <pre class="FileContents"> + </div> + <div class="FileContentsDescription"> + New contents (changes shown in bold): + <pre class="FileContents"> This is the contents <b>Fred-update</b> of file 1. </pre> - </div> - </li> - <li class="Steps">Modify <em class="FileName">file2.txt</em> as follows - <div class="FileContentsDescription">Original contents: - <pre class="FileContents"> + </div> + </li> + <li class="Steps">Modify <em class="FileName">file2.txt</em> as follows + <div class="FileContentsDescription"> + Original contents: + <pre class="FileContents"> File2 is a small file with simple text. </pre> - </div> - <div class="FileContentsDescription">New contents (changes shown in bold): - <pre class="FileContents"> + </div> + <div class="FileContentsDescription"> + New contents (changes shown in bold): + <pre class="FileContents"> File2 is a (<b>Fred was here)</b> small file with simple text. </pre> - </div> - </li> - <li class="Steps">Observe that the Project Explorer updates the CVS state of a resource. - Notice that the two files which Fred has changed are preceded by ">". - <img class="Big" src="../images/Image83_fred_verson.png" alt="Project Explorer View"> - </li> - <li class="Steps">To commit his changes to the repository Fred can either: - <ul> - <li>Select the two files and choose - <em class="UILabel">Team > Synchronize with Repository</em> or,</li> - <li>Select the project and choose - <em class="UILabel">Team > Synchronize with Repository</em></li> - </ul> - <p>Often choosing the project is the easiest thing to do. Let's do -that. Select the project and choose <em class="UILabel">Team > Synchronize with -Repository</em> from its context menu. When you are asked to switch to -the Team Synchronizing perspective select -<em class="UILabel">Yes</em>. - <img class="Big" alt="Team Synchronizing preview" src="../images/Image83_fred_verson2.png"> - </p> - </li> - <li class="Steps">When the Synchronize View opens Fred can browse the changes he -made and at the end should commit his changes to -<em class="FileName">file1.txt</em> and <em class="FileName">file2.txt</em> by selecting -<em class="ProjectName">JanesTeamProject</em> in the -Synchronize View and from the context menu select -<em class="UILabel">Commit</em>. You will have to enter a -commit comment before committing the changes. - </li> -</ol> - + </div> + </li> + <li class="Steps">Observe that the Project Explorer updates the CVS state of a resource. Notice that the two files + which Fred has changed are preceded by ">". <img class="Big" src="../images/Image83_fred_verson.png" alt= + "Project Explorer View"></li> + <li class="Steps">To commit his changes to the repository Fred can either: + <ul> + <li>Select the two files and choose <em class="UILabel">Team > Synchronize with Repository</em> or,</li> + <li>Select the project and choose <em class="UILabel">Team > Synchronize with Repository</em></li> + </ul> + <p>Often choosing the project is the easiest thing to do. Let's do that. Select the project and choose <em class= + "UILabel">Team > Synchronize with Repository</em> from its context menu. When you are asked to switch to the + Team Synchronizing perspective select <em class="UILabel">Yes</em>. <img class="Big" alt= + "Team Synchronizing preview" src="../images/Image83_fred_verson2.png"></p> + </li> + <li class="Steps">When the Synchronize View opens Fred can browse the changes he made and at the end should commit + his changes to <em class="FileName">file1.txt</em> and <em class="FileName">file2.txt</em> by selecting <em class= + "ProjectName">JanesTeamProject</em> in the Synchronize View and from the context menu select <em class= + "UILabel">Commit</em>. You will have to enter a commit comment before committing the changes.</li> + </ol> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-64c_catch_mod.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-64c_catch_mod.htm index 6723d79..c2899ef 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-64c_catch_mod.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-64c_catch_mod.htm
@@ -1,82 +1,62 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html lang="en"> <head> - <meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - <meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type"> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta content="text/html; charset=utf-8" http-equiv="Content-Type"> <meta content="text/css" http-equiv="Content-Style-Type"> <link type="text/css" charset="ISO-8859-1" href="../book.css" rel="STYLESHEET"> <link type="text/css" charset="ISO-8859-1" href="team-cvs.css" rel="STYLESHEET"> <title>Making our own changes</title> </head> <body> - -<h1>Making our own changes</h1> - -<p>Fred has made several changes to <em class="FileName">file1.txt</em> and -<em class="FileName">file2.txt</em> and committed them to the repository. In this section -additional changes will be made and then synchronized with the -repository. When synchronizing, expect to see the changes made in this -section along with changes that have been made by Fred.</p> -<ol> - <li class="Steps">Add <em class="FileName">file3.txt</em> as follows: - <div class="FileContentsDescription">New contents: (add the following lines to the file) + <h1>Making our own changes</h1> + <p>Fred has made several changes to <em class="FileName">file1.txt</em> and <em class="FileName">file2.txt</em> and + committed them to the repository. In this section additional changes will be made and then synchronized with the + repository. When synchronizing, expect to see the changes made in this section along with changes that have been made + by Fred.</p> + <ol> + <li class="Steps">Add <em class="FileName">file3.txt</em> as follows: + <div class="FileContentsDescription"> + New contents: (add the following lines to the file) <pre class="FileContents"> This is the brief contents of file 3</pre> - </div> - </li> - <li class="Steps">Observe that the Project Explorer displays the CVS state of a resources. Notice - that the new file added by Jane is preceded by ">". - <img class ="Big" src="../images/Image83_jane1.png" alt="Project Explorer View"> - </li> - <li class="Steps">Select the project <em class="ProjectName">JanesTeamProject</em> - and from the project's context menu, select - <em class="UILabel">Team > Synchronize with Repository</em>. - When asked to switch perspective select - <em class="UILabel">Yes</em>. The Team Synchronizing perspective will - open and you will see the files you have changed appear in the Synchronize - View. Double click on <em class="FileName">file1.txt</em> and you should see a compare editor open: - <img class="Big" src="../images/Image83_jane-sync.png" alt="Synchronize View"> - </li> - <li class="Steps">There are a couple of other things worth observing. First, the icon next - to <em class="FileName">file1.txt</em> (in the structured compare area) indicates that <em class="FileName">file1.txt</em> has - an incoming change. This means a change was released to the server which you - need to take. Looking at <em class="FileName">file1.txt</em> we can see the text that Fred has added - to the file. Also, notice at the bottom of the window, in the status line, - there are arrows with numbers beside them. These show the number of files - you have incoming, outgoing, and in conflict. The first number beside a file - is the revision you have in the workspace, and the other is the revision on - the server when you last synchronized. - </li> - <li class="Steps">Normally you should update the changes made by others, then test your workspace - with the changes, then commit your changes once you are sure that the new - changes by others didn't break anything in your workspace. - </li> - <li class="Steps">Before deciding to accept Fred's changes you may want to find out why he - made the changes. Select <em class="FileName">file1.txt</em> and from the context menu select - <em class="UILabel">Show in History</em>. - <img class ="Big" src="../images/Image83_jane-history.png" alt="History View"> - </li> - <li class="Steps">The row starting with a * indicates - that this is the current revision loaded. In this case you can see the comment - made by Fred when he released revision 1.2. - <p class="Tip"> - <b>Tip</b>: You can select the <em class="UILabel">Link with - Editor and Selection</em> toolbar button in the History view to have the history automatically - update when a new editor is opened or when the selection changes. This allows for quick browsing of comments. - </p> - </li> - <li class="Steps">To update simply select <em class="ProjectName">JanesTeamProject</em> - in the Synchronize View and from the context menu select - <em class="UILabel">Update</em>. - </li> - <li class="Steps">The Synchronize View will update to reflect the fact that <em class="FileName">file1.txt</em> and - <em class="FileName">file2.txt</em> are no longer out-of-sync with the repository. You should only have - <em class="FileName">file3.txt</em> visible now. - </li> - <li class="Steps">Next you can commit <em class="FileName">file3.txt</em>. - </li> -</ol> - + </div> + </li> + <li class="Steps">Observe that the Project Explorer displays the CVS state of a resources. Notice that the new file + added by Jane is preceded by ">". <img class="Big" src="../images/Image83_jane1.png" alt= + "Project Explorer View"></li> + <li class="Steps">Select the project <em class="ProjectName">JanesTeamProject</em> and from the project's context + menu, select <em class="UILabel">Team > Synchronize with Repository</em>. When asked to switch perspective + select <em class="UILabel">Yes</em>. The Team Synchronizing perspective will open and you will see the files you + have changed appear in the Synchronize View. Double click on <em class="FileName">file1.txt</em> and you should see + a compare editor open: <img class="Big" src="../images/Image83_jane-sync.png" alt="Synchronize View"></li> + <li class="Steps">There are a couple of other things worth observing. First, the icon next to <em class= + "FileName">file1.txt</em> (in the structured compare area) indicates that <em class="FileName">file1.txt</em> has + an incoming change. This means a change was released to the server which you need to take. Looking at <em class= + "FileName">file1.txt</em> we can see the text that Fred has added to the file. Also, notice at the bottom of the + window, in the status line, there are arrows with numbers beside them. These show the number of files you have + incoming, outgoing, and in conflict. The first number beside a file is the revision you have in the workspace, and + the other is the revision on the server when you last synchronized.</li> + <li class="Steps">Normally you should update the changes made by others, then test your workspace with the changes, + then commit your changes once you are sure that the new changes by others didn't break anything in your + workspace.</li> + <li class="Steps">Before deciding to accept Fred's changes you may want to find out why he made the changes. Select + <em class="FileName">file1.txt</em> and from the context menu select <em class="UILabel">Show in History</em>. + <img class="Big" src="../images/Image83_jane-history.png" alt="History View"></li> + <li class="Steps">The row starting with a * indicates that this is the current revision loaded. In this case you + can see the comment made by Fred when he released revision 1.2. + <p class="Tip"><b>Tip</b>: You can select the <em class="UILabel">Link with Editor and Selection</em> toolbar + button in the History view to have the history automatically update when a new editor is opened or when the + selection changes. This allows for quick browsing of comments.</p> + </li> + <li class="Steps">To update simply select <em class="ProjectName">JanesTeamProject</em> in the Synchronize View and + from the context menu select <em class="UILabel">Update</em>.</li> + <li class="Steps">The Synchronize View will update to reflect the fact that <em class="FileName">file1.txt</em> and + <em class="FileName">file2.txt</em> are no longer out-of-sync with the repository. You should only have <em class= + "FileName">file3.txt</em> visible now.</li> + <li class="Steps">Next you can commit <em class="FileName">file3.txt</em>.</li> + </ol> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-64c_catch_sync_view.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-64c_catch_sync_view.htm index 1d0e2d0..3430009 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-64c_catch_sync_view.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-64c_catch_sync_view.htm
@@ -1,80 +1,69 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html lang="en"> <head> - <meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - <meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type"> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta content="text/html; charset=utf-8" http-equiv="Content-Type"> <meta content="text/css" http-equiv="Content-Style-Type"> <link type="text/css" charset="ISO-8859-1" href="../book.css" rel="STYLESHEET"> <link type="text/css" charset="ISO-8859-1" href="team-cvs.css" rel="STYLESHEET"> <title>Working with conflicting changes</title> </head> <body> -<h1>Working with conflicting changes</h1> - -<p>There are cases where two users are editing the same files and - when the second to commit to the repository tries to commit their changes, the - repository won't allow the commit to succeed because of the conflict. Let's - simulate this by making Fred and Jane change the same files.<br> -</p> -<ol> - <li class="Steps">In Fred's workspace open one of the navigation views and edit - <em class="FileName">file1.txt</em>. Make the text the following: -<pre class="FileContents"> + <h1>Working with conflicting changes</h1> + <p>There are cases where two users are editing the same files and when the second to commit to the repository tries + to commit their changes, the repository won't allow the commit to succeed because of the conflict. Let's simulate + this by making Fred and Jane change the same files.<br></p> + <ol> + <li class="Steps">In Fred's workspace open one of the navigation views and edit <em class= + "FileName">file1.txt</em>. Make the text the following: + <pre class="FileContents"> Fred line 1 This is the contents Fred-update of file 1. </pre> - </li> - <li class="Steps">Fred will also change <em class="FileName">file2.txt</em> with the following change: -<pre class="FileContents"> + </li> + <li class="Steps">Fred will also change <em class="FileName">file2.txt</em> with the following change: + <pre class="FileContents"> File2 is a (Fred was here again) with simple text. </pre> - </li> - <li class="Steps">Fred committed his changes to the repository. - </li> - <li class="Steps">Next, at the same time Jane was making changes to <em class="FileName">file1.txt</em>. She - added the following line to the end of the file: -<pre class="FileContents"> + </li> + <li class="Steps">Fred committed his changes to the repository.</li> + <li class="Steps">Next, at the same time Jane was making changes to <em class="FileName">file1.txt</em>. She added + the following line to the end of the file: + <pre class="FileContents"> This is the contents Fred-update of file 1. Jane was at the end </pre> - </li> - <li class="Steps">And finally, Jane changed <em class="FileName">file2.txt</em> to the following: -<pre class="FileContents"> + </li> + <li class="Steps">And finally, Jane changed <em class="FileName">file2.txt</em> to the following: + <pre class="FileContents"> File2 is a (Jane was here) small file with simple text. </pre> - </li> - <li class="Steps">When Jane was finished making changes she synchronized the -project and found the following appear in the Synchronize View: - <img class="Big" src="../images/Image83_jane3_conflict.png" alt="Conflict shown in Synchronize view and Compare editor"> - </li> - <li class="Steps">Both <em class="FileName">file1.txt</em> and <em class="FileName">file2.txt</em> - show with a red icon indicating that they have - conflicting changes. You can't commit the files until the conflicts are resolved. - Click on <em class="FileName">file1.txt</em> and notice that Fred and Jane made changes to two different - parts of the file. In this case, Jane can simply update the file and the lines - added by Fred will be merged into Jane's local file. Select <em class="FileName">file1.txt</em> and - from the context menu select <em class="UILabel">Update</em>. - </li> - <li class="Steps">Next, double on <em class="FileName">file2.txt</em> to see the conflict. In this case you can see - that both Jane and Fred changed the same line. For this type of conflicting - change a regular update can't resolve the conflict. Here you have three options - (with the command to use in brackets): accept the changes from Fred (<em class="UILabel">Override - and Update</em>), ignore Fred's changes (<em class="UILabel">Mark - as Merged</em>), or manually merge the files within the compare editor. - <img class="Big" src="../images/Image83_jane3_conflict2.png" alt="Compare editor showing conflict"> - </li> - <li class="Steps">For this example, let's say Jane updated <em class="FileName">file1.txt</em> and selected -override and update for <em class="FileName">file2.txt</em>. After the operations are run the -conflicts turn into outgoing changes. Jane can review the changes and -commit them.<br> - </li> -</ol> - + </li> + <li class="Steps">When Jane was finished making changes she synchronized the project and found the following appear + in the Synchronize View: <img class="Big" src="../images/Image83_jane3_conflict.png" alt= + "Conflict shown in Synchronize view and Compare editor"></li> + <li class="Steps">Both <em class="FileName">file1.txt</em> and <em class="FileName">file2.txt</em> show with a red + icon indicating that they have conflicting changes. You can't commit the files until the conflicts are resolved. + Click on <em class="FileName">file1.txt</em> and notice that Fred and Jane made changes to two different parts of + the file. In this case, Jane can simply update the file and the lines added by Fred will be merged into Jane's + local file. Select <em class="FileName">file1.txt</em> and from the context menu select <em class= + "UILabel">Update</em>.</li> + <li class="Steps">Next, double on <em class="FileName">file2.txt</em> to see the conflict. In this case you can see + that both Jane and Fred changed the same line. For this type of conflicting change a regular update can't resolve + the conflict. Here you have three options (with the command to use in brackets): accept the changes from Fred + (<em class="UILabel">Override and Update</em>), ignore Fred's changes (<em class="UILabel">Mark as Merged</em>), or + manually merge the files within the compare editor. <img class="Big" src="../images/Image83_jane3_conflict2.png" + alt="Compare editor showing conflict"></li> + <li class="Steps">For this example, let's say Jane updated <em class="FileName">file1.txt</em> and selected + override and update for <em class="FileName">file2.txt</em>. After the operations are run the conflicts turn into + outgoing changes. Jane can review the changes and commit them.<br></li> + </ol> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-70_replace.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-70_replace.htm index 1f30e03..2d3285e 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-70_replace.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-70_replace.htm
@@ -1,51 +1,41 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html lang="en"> - <head> - <meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - <meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type"> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta content="text/html; charset=utf-8" http-equiv="Content-Type"> <meta content="text/css" http-equiv="Content-Style-Type"> <link type="text/css" charset="ISO-8859-1" href="../book.css" rel="STYLESHEET"> <link type="text/css" charset="ISO-8859-1" href="team-cvs.css" rel="STYLESHEET"> <title>Replacing</title> </head> - <body> -<h1> Replacing</h1> - -<p>Suppose after further reflection, it becomes apparent -to Jane that the revision of <em class="FileName">file1.txt</em> that was just received is incorrect and -an earlier revision is required. A Workbench resource can be replaced -with an earlier revision of the resource from the repository. To roll -back to an earlier revision:</p> -<ol> - <li class="Steps">In one of the navigation views select the <em class="FileName">file1.txt</em>. - </li> - <li class="Steps"> From the file's context menu, select <em class="UILabel">Replace With > History....</em> - </li> - <li class="Steps">The history view will open and display the revisions available for the - selected file. Make sure that the history view is in Remote Revisions mode. (If it is not you can put it in - Remote mode by clicking on the <em class="UILabel">Remote Revisions</em> button in the History view toolbar.) - Select revision <b>1.3</b> in the - table and from the pop-up menu choose <em class="UILabel">Get Contents</em>. - <img class="Big" src="../images/Image84_replace3.png" alt="History View"> - </li> - <li class="Steps">Observe that the navigation view updates to show the CVS state of a resource. - Notice that the modified file is preceded by ">" indicating - that <em class="FileName">file1.txt</em> has changed (by replacing it with the earlier version). - <img class="Big" src="../images/Image84_replace2.png" alt="File selection"> - </li> - <li class="Steps">Now assume that this older revision is not as good as it initially seemed - and in fact the revision in the repository is better after all. - <p>Instead of choosing <em class="UILabel">Team > Synchronize with Repository</em>, choose - <em class="UILabel">Replace With > Latest from HEAD</em>.</p> - <p>Observe that <em class="FileName">file1.txt</em> is updated to have the same contents as the latest revision from the repository, - and that the leading indicator ">" has been removed since it is now the - same revision as the repository. </p> - </li> -</ol> -<p>Now that you have a file's revisions displayed in the History View, it is possible to compare revisions directly + <h1>Replacing</h1> + <p>Suppose after further reflection, it becomes apparent to Jane that the revision of <em class= + "FileName">file1.txt</em> that was just received is incorrect and an earlier revision is required. A Workbench + resource can be replaced with an earlier revision of the resource from the repository. To roll back to an earlier + revision:</p> + <ol> + <li class="Steps">In one of the navigation views select the <em class="FileName">file1.txt</em>.</li> + <li class="Steps">From the file's context menu, select <em class="UILabel">Replace With > History....</em></li> + <li class="Steps">The history view will open and display the revisions available for the selected file. Make sure + that the history view is in Remote Revisions mode. (If it is not you can put it in Remote mode by clicking on the + <em class="UILabel">Remote Revisions</em> button in the History view toolbar.) Select revision <b>1.3</b> in the + table and from the pop-up menu choose <em class="UILabel">Get Contents</em>. <img class="Big" src= + "../images/Image84_replace3.png" alt="History View"></li> + <li class="Steps">Observe that the navigation view updates to show the CVS state of a resource. Notice that the + modified file is preceded by ">" indicating that <em class="FileName">file1.txt</em> has changed (by replacing + it with the earlier version). <img class="Big" src="../images/Image84_replace2.png" alt="File selection"></li> + <li class="Steps">Now assume that this older revision is not as good as it initially seemed and in fact the + revision in the repository is better after all. + <p>Instead of choosing <em class="UILabel">Team > Synchronize with Repository</em>, choose <em class= + "UILabel">Replace With > Latest from HEAD</em>.</p> + <p>Observe that <em class="FileName">file1.txt</em> is updated to have the same contents as the latest revision + from the repository, and that the leading indicator ">" has been removed since it is now the same revision as + the repository.</p> + </li> + </ol> + <p>Now that you have a file's revisions displayed in the History View, it is possible to compare revisions directly by selecting the revisions in the table and choosing <em class="UILabel">Compare With Each Other.</em></p> - </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-70_workingWithHistory.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-70_workingWithHistory.htm index d963ce3..e4d3fc2 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-70_workingWithHistory.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-70_workingWithHistory.htm
@@ -1,52 +1,46 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html lang="en"> <head> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - <meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type"> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta content="text/html; charset=utf-8" http-equiv="Content-Type"> <meta content="text/css" http-equiv="Content-Style-Type"> <link type="text/css" charset="ISO-8859-1" href="../book.css" rel="STYLESHEET"> <link type="text/css" charset="ISO-8859-1" href="team-cvs.css" rel="STYLESHEET"> <title>Working With CVS History</title> </head> -<body bgcolor="#ffffff"> - -<h1>Working With CVS History</h1> - -<p>Projects that are managed by CVS now have their file local history and remote history -appear together in the same view. To view the consolidated history for a shared file in the History View, -perform the following steps:</p> -<ol> - <li class="Steps">In any navigation view, select a file that is contained in a project that is shared using CVS.<br> - </li> - <li class="Steps">Right-click the file in order to access one of the following history related options: - <ul> - <li><em class="UILabel">Team>Show History...</em> which opens the History View - with the revisions of the selected file displayed in the table.</li> - <li><em class="UILabel">Compare With>History...</em> which does the same as <em class="UILabel">Show History</em> - but which launches comparisons when entries in the history table are double-clicked (for more info see - <a href="../reference/ref-32a.htm">CVS History View</a>).</li> +<body bgcolor="#FFFFFF"> + <h1>Working With CVS History</h1> + <p>Projects that are managed by CVS now have their file local history and remote history appear together in the same + view. To view the consolidated history for a shared file in the History View, perform the following steps:</p> + <ol> + <li class="Steps">In any navigation view, select a file that is contained in a project that is shared using + CVS.<br></li> + <li class="Steps">Right-click the file in order to access one of the following history related options: + <ul> + <li><em class="UILabel">Team>Show History...</em> which opens the History View with the revisions of the + selected file displayed in the table.</li> + <li><em class="UILabel">Compare With>History...</em> which does the same as <em class="UILabel">Show + History</em> but which launches comparisons when entries in the history table are double-clicked (for more info + see <a href="../reference/ref-32a.htm">CVS History View</a>).</li> <li><em class="UILabel">Replace With>History...</em> which does the same as the comparison operation.</li> </ul> - </li> - <li class="Steps">The history view will open and display the revisions available for the - selected file. You can control what type of revisions are shown in the table by selecting - the appropriate toggle button in the History View tooblar. The options are: <em class="UILabel">Local and Remote - Revisions</em>, <em class="UILabel">Local Revisions</em> and <em class="UILabel">Remote Revisions</em>. - <img class="Big" src="../images/Image84_replace3.png" alt="History View"> - </li> - <li class="Steps">The following operations are available when right-clicking the entries in the History view: - <ul> - <li><em class="UILabel">Open</em>: opens the selected revision</li> - <li><em class="UILabel">Compare Current with Revision</em>: compares the selected file with - the current revision of the file that resides in the workspace</li> - <li><em class="UILabel">Compare with Each Other</em>: compares two selected revisions</li> - <li><em class="UILabel">Get Contents</em>: replaces the current workspace file with the contents - of the selected revision.</li> - </ul> - </li> -</ol> - - + </li> + <li class="Steps">The history view will open and display the revisions available for the selected file. You can + control what type of revisions are shown in the table by selecting the appropriate toggle button in the History + View tooblar. The options are: <em class="UILabel">Local and Remote Revisions</em>, <em class="UILabel">Local + Revisions</em> and <em class="UILabel">Remote Revisions</em>. <img class="Big" src="../images/Image84_replace3.png" + alt="History View"></li> + <li class="Steps">The following operations are available when right-clicking the entries in the History view: + <ul> + <li><em class="UILabel">Open</em>: opens the selected revision</li> + <li><em class="UILabel">Compare Current with Revision</em>: compares the selected file with the current + revision of the file that resides in the workspace</li> + <li><em class="UILabel">Compare with Each Other</em>: compares two selected revisions</li> + <li><em class="UILabel">Get Contents</em>: replaces the current workspace file with the contents of the + selected revision.</li> + </ul> + </li> + </ol> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-74_review.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-74_review.htm index 8672006..b6aed14 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-74_review.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-74_review.htm
@@ -1,46 +1,35 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html lang="en"> <head> - <meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - <meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type"> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta content="text/html; charset=utf-8" http-equiv="Content-Type"> <meta content="text/css" http-equiv="Content-Style-Type"> <link type="text/css" charset="ISO-8859-1" href="../book.css" rel="STYLESHEET"> <title>A quick review</title> </head> <body> -<h1>A quick review</h1> - -<p> Here are some of the more important but subtle issues -associated with working in a repository . </p> -<ul> - <li>The project was tagged as a version by versioning the project as -it appeared in the Workbench. For this reason it is important to -synchronize the project with the repository (that is the HEAD or the -branch that is being worked in) prior to versioning it. Otherwise -another user may have committed interesting changes to the project -which have yet to be updated in the Workbench. By proceeding to version -the project without updating, it will be versioned without these -changes.</li> - <li>The repository contains all projects in the repository. -Individuals pick the projects they are interested in and check -them out into the workspace. From that point on they are synchronizing -those projects (only) with respect to the repository.</li> - <li>The repository represents a large in-progress collection of all -known projects. From the repository's perspective, everything in HEAD -or on a branch is always open for change.</li> - <li>The act of versioning a project effectively snapshots it and -places it into the Versions section of the repository, however the -repository branches are still open for change.</li> - <li>It is important to first update to changes made to the -repository, retest with those changes and the soon to be committed -changes and then commit the changes. By first taking the latest -changes in the branch, and retesting, it helps to ensure that the -changes about to be committed will actually work with the current state -of the branch.</li> - <li>Each project is associated with a specific repository. Different -projects can be associated with different repositories that may be on -completely different servers.</li> -</ul> - + <h1>A quick review</h1> + <p>Here are some of the more important but subtle issues associated with working in a repository .</p> + <ul> + <li>The project was tagged as a version by versioning the project as it appeared in the Workbench. For this reason + it is important to synchronize the project with the repository (that is the HEAD or the branch that is being worked + in) prior to versioning it. Otherwise another user may have committed interesting changes to the project which have + yet to be updated in the Workbench. By proceeding to version the project without updating, it will be versioned + without these changes.</li> + <li>The repository contains all projects in the repository. Individuals pick the projects they are interested in + and check them out into the workspace. From that point on they are synchronizing those projects (only) with respect + to the repository.</li> + <li>The repository represents a large in-progress collection of all known projects. From the repository's + perspective, everything in HEAD or on a branch is always open for change.</li> + <li>The act of versioning a project effectively snapshots it and places it into the Versions section of the + repository, however the repository branches are still open for change.</li> + <li>It is important to first update to changes made to the repository, retest with those changes and the soon to be + committed changes and then commit the changes. By first taking the latest changes in the branch, and retesting, it + helps to ensure that the changes about to be committed will actually work with the current state of the + branch.</li> + <li>Each project is associated with a specific repository. Different projects can be associated with different + repositories that may be on completely different servers.</li> + </ul> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-74_version.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-74_version.htm index 03cf059..696783f 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-74_version.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-74_version.htm
@@ -1,39 +1,30 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html lang="en"> - <head> - <meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - <meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type"> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta content="text/html; charset=utf-8" http-equiv="Content-Type"> <meta content="text/css" http-equiv="Content-Style-Type"> <link type="text/css" charset="ISO-8859-1" href="../book.css" rel="STYLESHEET"> <link type="text/css" charset="ISO-8859-1" href="team-cvs.css" rel="STYLESHEET"> <title>Versioning a project</title> </head> - <body> -<h1>Versioning a project</h1> - -<p> Now that the project is complete it is time to version -it. While committing the file resources the repository automatically -assigned them version numbers, or to be more accurate "revision -numbers". As the files were committed the only information supplied was -a commit comment.</p> -<p>To version a project proceed as follows:</p> -<ol> - <li class="Steps">Select the project <em class="ProjectName">JanesTeamProject</em>. - </li> - <li class="Steps">In one of the navigation views select <em class="UILabel">Team > Tag as Version...</em> - </li> - <li class="Steps">When the Tag Resources dialog opens enter the version name <em>A1</em> and click <em class="UILabel">OK</em>. - </li> - <li class="Steps">Select the CVS Repositories view.</li> - <li class="Steps">Expand <b>Versions</b>, and <em class="ProjectName">JanesTeamProject</em>. - Observe that under <em class="ProjectName">JanesTeamProject</em> there is now a version of this project - whose version number is <em>A1</em>. Looking closely at the contents of <em class="FileName">folder1</em> note - that the version numbers of the individual files match the version numbers - in the Workbench. - </li> -</ol> - + <h1>Versioning a project</h1> + <p>Now that the project is complete it is time to version it. While committing the file resources the repository + automatically assigned them version numbers, or to be more accurate "revision numbers". As the files were committed + the only information supplied was a commit comment.</p> + <p>To version a project proceed as follows:</p> + <ol> + <li class="Steps">Select the project <em class="ProjectName">JanesTeamProject</em>.</li> + <li class="Steps">In one of the navigation views select <em class="UILabel">Team > Tag as Version...</em></li> + <li class="Steps">When the Tag Resources dialog opens enter the version name <em>A1</em> and click <em class= + "UILabel">OK</em>.</li> + <li class="Steps">Select the CVS Repositories view.</li> + <li class="Steps">Expand <b>Versions</b>, and <em class="ProjectName">JanesTeamProject</em>. Observe that under + <em class="ProjectName">JanesTeamProject</em> there is now a version of this project whose version number is + <em>A1</em>. Looking closely at the contents of <em class="FileName">folder1</em> note that the version numbers of + the individual files match the version numbers in the Workbench.</li> + </ol> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-80_ant.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-80_ant.htm index 6e44130..d23f04f 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-80_ant.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-80_ant.htm
@@ -1,32 +1,27 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> <head> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<meta http-equiv="Content-Style-Type" content="text/css"> - -<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> -<title>Ant & external tools tutorial</title> - + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Ant & external tools tutorial</title> </head> <body> - <h1>Ant & external tools tutorial</h1> - <p> - This chapter covers Eclipse's external tools framework, and its - integration with <a href="http://ant.apache.org/">Ant</a>, the build tool from - the <a href="http://www.apache.org/">Apache Software Foundation</a>. For more - information on Ant, see the <a href="http://ant.apache.org/manual/index.html">Apache - Ant manual</a> for documentation. This chapter assumes a basic knowledge of - Ant. - </p> - <p> - This chapter is split into three main sections. - </p> - <ol> - <li><a href="qs-81_basics.htm">Eclipse Ant basics</a>: the basics of working with Ant buildfiles in Eclipse are covered</li> - <li><a href="qs-92_project_builders.htm">Ant build files as project builders</a>: several Eclipse use cases are discussed</li> - <li><a href="qs-95_external_tools.htm">External tools</a>: the external tools framework and how to use non-Ant tools are covered</li> - </ol> + <h1>Ant & external tools tutorial</h1> + <p>This chapter covers Eclipse's external tools framework, and its integration with <a href= + "http://ant.apache.org/">Ant</a>, the build tool from the <a href="http://www.apache.org/">Apache Software + Foundation</a>. For more information on Ant, see the <a href="http://ant.apache.org/manual/index.html">Apache Ant + manual</a> for documentation. This chapter assumes a basic knowledge of Ant.</p> + <p>This chapter is split into three main sections.</p> + <ol> + <li><a href="qs-81_basics.htm">Eclipse Ant basics</a>: the basics of working with Ant buildfiles in Eclipse are + covered</li> + <li><a href="qs-92_project_builders.htm">Ant build files as project builders</a>: several Eclipse use cases are + discussed</li> + <li><a href="qs-95_external_tools.htm">External tools</a>: the external tools framework and how to use non-Ant + tools are covered</li> + </ol> </body> -</html> \ No newline at end of file +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-81_basics.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-81_basics.htm index ed03ceb..6d5f0f7 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-81_basics.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-81_basics.htm
@@ -1,31 +1,23 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html lang="en"> <head> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<meta http-equiv="Content-Style-Type" content="text/css"> - -<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> -<title>Eclipse Ant basics</title> - + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Eclipse Ant basics</title> </head> <body> -<h1>Eclipse Ant basics</h1> - -<p>This section covers the basics of working with Ant buildfiles - in Eclipse. -</p> -<p> - Specifically, the following topics are covered: -</p> + <h1>Eclipse Ant basics</h1> + <p>This section covers the basics of working with Ant buildfiles in Eclipse.</p> + <p>Specifically, the following topics are covered:</p> <ul> - <li><a href="qs-82_create.htm">Creating</a></li> - <li><a href="qs-83_edit.htm">Editing</a></li> - <li><a href="qs-84_run_ant.htm">Running Ant buildfiles</a></li> - <li><a href="qs-85_ant_configs.htm">Saving & Reusing Ant options</a></li> - <li><a href="qs-85a_ant_view.htm">Using the Ant view</a></li> + <li><a href="qs-82_create.htm">Creating</a></li> + <li><a href="qs-83_edit.htm">Editing</a></li> + <li><a href="qs-84_run_ant.htm">Running Ant buildfiles</a></li> + <li><a href="qs-85_ant_configs.htm">Saving & Reusing Ant options</a></li> + <li><a href="qs-85a_ant_view.htm">Using the Ant view</a></li> </ul> </body> -</html> \ No newline at end of file +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-82_create.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-82_create.htm index 3c8aeb5..e09fac3 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-82_create.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-82_create.htm
@@ -1,51 +1,47 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html lang="en"> <head> -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<meta http-equiv="Content-Style-Type" content="text/css"> -<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> -<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"> </script> -<title>Creating Ant buildfiles</title> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script> + <title>Creating Ant buildfiles</title> </head> <body> -<h1>Creating Ant buildfiles</h1> - -<p> Ant buildfiles are just text files, so the most straightforward - way to create an Ant buildfile in Eclipse is:</p> -<ol> - <li><b>File > New > File</b>.</li> - <li>Enter a name for the file.</li> - <li>Click <b>Finish</b>.</li> -</ol> -<p> - By default the <a href="../reference/ref-anteditor.htm">Ant editor</a> only has an association with <code>build.xml</code> named files. - As the user you can designate the Ant editor to be considered for all xml - files. -</p> -<ol> - <li>File associations can be set using the <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.FileEditors)")'> + <h1>Creating Ant buildfiles</h1> + <p>Ant buildfiles are just text files, so the most straightforward way to create an Ant buildfile in Eclipse is:</p> + <ol> + <li><b>File > New > File</b>.</li> + <li>Enter a name for the file.</li> + <li>Click <b>Finish</b>.</li> + </ol> + <p>By default the <a href="../reference/ref-anteditor.htm">Ant editor</a> only has an association with + <code>build.xml</code> named files. As the user you can designate the Ant editor to be considered for all xml + files.</p> + <ol> + <li>File associations can be set using the <a class="command-link" href= + 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.FileEditors)")'> <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="Opens the File Associations preference page"> <b>General > Editors >File Associations</b></a> preference page.</li> - <li>Add an association between <code>*.xml</code> and the <a href="../reference/ref-anteditor.htm">Ant editor</a>.</li> -</ol> - -<p>Now, as long as the file has a .xml extension, Eclipse will consider it to be a - possible Ant buildfile, and will enable Ant-related actions when it is selected. - Until a file has Ant buildfile content, you will need to open it using <b>Open With > <a href="../reference/ref-anteditor.htm">Ant Editor</a></b>.</p> -<p>An example is the use of <a href="qs-92_project_builders.htm">project builders</a>, where an Ant buildfile is created - for an Eclipse plug-in that contains predefined targets that are useful for deploying the plug-in.</p> - -<h3 class="related">Related tasks</h3> - <a href="qs-83_edit.htm">Editing Ant buildfiles</a><br> - <a href="qs-84_run_ant.htm">Running Ant buildfiles</a><br> - <a href="qs-85_ant_configs.htm">Saving & Reusing Ant options</a><br> - <a href="qs-84_run_ant.htm">Running Ant buildfiles</a><br> - <a href="qs-93_project_builder.htm">Creating a project builder Ant buildfile</a><br> - <a href="qs-92_project_builders.htm">Ant buildfiles as project builders</a><br> - <a href="qs-94_run_pj.htm">Executing project builders</a><br> - <a href="qs-95_external_tools.htm">External tools</a><br> - <a href="qs-96_non_ant_pjs.htm">Non-Ant project builders</a><br> - <a href="qs-97_standalone_ets.htm">Stand-alone external tools</a> + <li>Add an association between <code>*.xml</code> and the <a href="../reference/ref-anteditor.htm">Ant + editor</a>.</li> + </ol> + <p>Now, as long as the file has a .xml extension, Eclipse will consider it to be a possible Ant buildfile, and will + enable Ant-related actions when it is selected. Until a file has Ant buildfile content, you will need to open it + using <b>Open With > <a href="../reference/ref-anteditor.htm">Ant Editor</a></b>.</p> + <p>An example is the use of <a href="qs-92_project_builders.htm">project builders</a>, where an Ant buildfile is + created for an Eclipse plug-in that contains predefined targets that are useful for deploying the plug-in.</p> + <h3 class="related">Related tasks</h3><a href="qs-83_edit.htm">Editing Ant buildfiles</a><br> + <a href="qs-84_run_ant.htm">Running Ant buildfiles</a><br> + <a href="qs-85_ant_configs.htm">Saving & Reusing Ant options</a><br> + <a href="qs-84_run_ant.htm">Running Ant buildfiles</a><br> + <a href="qs-93_project_builder.htm">Creating a project builder Ant buildfile</a><br> + <a href="qs-92_project_builders.htm">Ant buildfiles as project builders</a><br> + <a href="qs-94_run_pj.htm">Executing project builders</a><br> + <a href="qs-95_external_tools.htm">External tools</a><br> + <a href="qs-96_non_ant_pjs.htm">Non-Ant project builders</a><br> + <a href="qs-97_standalone_ets.htm">Stand-alone external tools</a> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-83_edit.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-83_edit.htm index b9e5dfc..734b9c5 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-83_edit.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-83_edit.htm
@@ -1,96 +1,99 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html lang="en"> <head> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<meta http-equiv="Content-Style-Type" content="text/css"> - -<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> -<title>Editing Ant buildfiles</title> - + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Editing Ant buildfiles</title> </head> <body> -<h1>Editing Ant buildfiles</h1> -<p class="Para">Because Ant buildfiles are simple text files, any text editor - can be used to edit them. But there are several advantages to using the Eclipse - Ant editor, including syntax coloring, content assist, navigation, occurrence marking and an outline view. To - get familiar with the Eclipse <b><a href="../reference/ref-anteditor.htm">Ant editor</a></b>, create a simple Ant buildfile using - this editor.</p> -<ol> - <li>Create an Ant buildfile called <code>HelloWorld.xml</code>.</li> - <li>Open the <b><a href="../reference/ref-anteditor.htm">Ant editor</a></b> on the file by selecting <b>Open With > Ant Editor</b> - from the file's context menu. <br> - <strong>Note:</strong> The default editor for a <code>.xml</code> file is a simple text - editor until it has buildfile content - which can be changed on the <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.FileEditors)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="Opens the File Associations preference page"><b>General > Editors >File Associations</b></a> preference page.</li> - <li>Enter the following content in the editor: -<pre> -<?xml version="1.0" encoding="UTF-8"?> -<project name="Hello World" default="Hello" basedir="."> - <property name="HelloText" value="Hello"/> - <target name="Hello"> + <h1>Editing Ant buildfiles</h1> + <p class="Para">Because Ant buildfiles are simple text files, any text editor can be used to edit them. But there are + several advantages to using the Eclipse Ant editor, including syntax coloring, content assist, navigation, occurrence + marking and an outline view. To get familiar with the Eclipse <b><a href="../reference/ref-anteditor.htm">Ant + editor</a></b>, create a simple Ant buildfile using this editor.</p> + <ol> + <li>Create an Ant buildfile called <code>HelloWorld.xml</code>.</li> + <li>Open the <b><a href="../reference/ref-anteditor.htm">Ant editor</a></b> on the file by selecting <b>Open With + > Ant Editor</b> from the file's context menu.<br> + <strong>Note:</strong> The default editor for a <code>.xml</code> file is a simple text editor until it has + buildfile content - which can be changed on the <a class="command-link" href= + 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.FileEditors)")'> + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= + "Opens the File Associations preference page"><b>General > Editors >File Associations</b></a> preference + page.</li> + <li>Enter the following content in the editor: + <pre> +<?xml version="1.0" encoding="UTF-8"?> +<project name="Hello World" default="Hello" basedir="."> + <property name="HelloText" value="Hello"/> + <target name="Hello"> <echo>${HelloText}</echo> </target> </project> </pre> - <p><img src="../images/first_anteditor.png" alt="HelloWorld.xml file content" border="0" ></p> - </li> - <li>Notice the syntax coloring for property values.</li> - <li>Begin to enter a second target by typing <code><tar</code>, then hit <strong>Ctrl-Space</strong> - to activate content assist. A list of valid completions is presented. Select the <code><target></code> completion and - notice that the editor inserts both the opening and closing tags and leaves - the cursor positioned to enter attributes for this tag.</li> - <li>Name this target <code>World</code>.</li> - <li>Enter an <code>echo</code> task for this target similar to that for the Hello target, - but change the text to <code>${WorldText}</code>.</li> - <li>Add a dependency on the <code>World</code> target from the <code>Hello</code> target. Place the cursor after the definition of the name attribute, hit <strong>Ctrl-Space</strong> - and select the <code>depends</code> attribute completion. Hit <strong>Ctrl-Space</strong> again to get the completion for the other target <code>World</code> in the buildfile.</li> + <p><img src="../images/first_anteditor.png" alt="HelloWorld.xml file content" border="0"></p> + </li> + <li>Notice the syntax coloring for property values.</li> + <li>Begin to enter a second target by typing <code><tar</code>, then hit <strong>Ctrl-Space</strong> to activate + content assist. A list of valid completions is presented. Select the <code><target></code> completion and + notice that the editor inserts both the opening and closing tags and leaves the cursor positioned to enter + attributes for this tag.</li> + <li>Name this target <code>World</code>.</li> + <li>Enter an <code>echo</code> task for this target similar to that for the Hello target, but change the text to + <code>${WorldText}</code>.</li> + <li>Add a dependency on the <code>World</code> target from the <code>Hello</code> target. Place the cursor after + the definition of the name attribute, hit <strong>Ctrl-Space</strong> and select the <code>depends</code> attribute + completion. Hit <strong>Ctrl-Space</strong> again to get the completion for the other target <code>World</code> in + the buildfile.</li> <li>Save the buildfile contents.</li> <li>The full content will now be: -<pre> -<?xml version="1.0" encoding="UTF-8"?> -<project name="Hello World" default="Hello" basedir="."> - <property name="HelloText" value="Hello"/> - <property name="WorldText" value="World"/> - <target name="Hello"> + <pre> +<?xml version="1.0" encoding="UTF-8"?> +<project name="Hello World" default="Hello" basedir="."> + <property name="HelloText" value="Hello"/> + <property name="WorldText" value="World"/> + <target name="Hello"> <echo>${HelloText}</echo> </target> - <target name="World"> + <target name="World"> <echo>${WorldText}</echo> </target> </project> </pre> - -</li> - <li>Save the changes to <code>HelloWorld.xml</code>.</li> - <li>Make the <b><a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/ref-view-outline.htm">Outline view</a></b> visible and notice that there are entries for each - property and each target. In addition, each task under a target has an entry.<br><br> - <img src="../images/outline_hello.png" alt="Outline view for an Ant buildfile" border="0" > - <br><br></li> - <li>Clicking on an entry in the <b><a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/ref-view-outline.htm">Outline view</a></b> will scroll the editor to that - entry. In addition, when the <b><a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/ref-view-outline.htm">Outline view</a></b> has focus, typing a character will - move the selection in the view to the next visible entry beginning with that character.</li> - <li>Position the cursor just past the end of one of the <code><target></code> tags, - type <code><tar</code>, then hit <b>Ctrl-Space</b> to activate content assist. Notice that - now the only valid completions are the <code></target></code> and the <code>tar</code> tag. This is because the Ant editor - knows that nested targets are not allowed.<br><br> - <img src="../images/ant_tar_assist.png" alt="Code assist in Ant editor" border="0"> + </li> + <li>Save the changes to <code>HelloWorld.xml</code>.</li> + <li>Make the <b><a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/ref-view-outline.htm">Outline + view</a></b> visible and notice that there are entries for each property and each target. In addition, each task + under a target has an entry.<br> + <br> + <img src="../images/outline_hello.png" alt="Outline view for an Ant buildfile" border="0"><br> <br></li> - <li>Close the editor and do not save changes.</li> -</ol> - -<h3 class="related">Related tasks</h3> - <a href="qs-82_create.htm">Creating Ant buildfiles</a><br> - <a href="qs-84_run_ant.htm">Running Ant buildfiles</a><br> - <a href="qs-85_ant_configs.htm">Saving & Reusing Ant options</a><br> - <a href="qs-84_run_ant.htm">Running Ant buildfiles</a><br> - <a href="qs-93_project_builder.htm">Creating a project builder Ant buildfile</a><br> - <a href="qs-92_project_builders.htm">Ant buildfiles as project builders</a><br> - <a href="qs-94_run_pj.htm">Executing project builders</a><br> - <a href="qs-95_external_tools.htm">External tools</a><br> - <a href="qs-96_non_ant_pjs.htm">Non-Ant project builders</a><br> - <a href="qs-97_standalone_ets.htm">Stand-alone external tools</a> + <li>Clicking on an entry in the <b><a href= + "PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/ref-view-outline.htm">Outline view</a></b> will scroll the + editor to that entry. In addition, when the <b><a href= + "PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/ref-view-outline.htm">Outline view</a></b> has focus, typing + a character will move the selection in the view to the next visible entry beginning with that character.</li> + <li>Position the cursor just past the end of one of the <code><target></code> tags, type + <code><tar</code>, then hit <b>Ctrl-Space</b> to activate content assist. Notice that now the only valid + completions are the <code></target></code> and the <code>tar</code> tag. This is because the Ant editor knows + that nested targets are not allowed.<br> + <br> + <img src="../images/ant_tar_assist.png" alt="Code assist in Ant editor" border="0"><br></li> + <li>Close the editor and do not save changes.</li> + </ol> + <h3 class="related">Related tasks</h3><a href="qs-82_create.htm">Creating Ant buildfiles</a><br> + <a href="qs-84_run_ant.htm">Running Ant buildfiles</a><br> + <a href="qs-85_ant_configs.htm">Saving & Reusing Ant options</a><br> + <a href="qs-84_run_ant.htm">Running Ant buildfiles</a><br> + <a href="qs-93_project_builder.htm">Creating a project builder Ant buildfile</a><br> + <a href="qs-92_project_builders.htm">Ant buildfiles as project builders</a><br> + <a href="qs-94_run_pj.htm">Executing project builders</a><br> + <a href="qs-95_external_tools.htm">External tools</a><br> + <a href="qs-96_non_ant_pjs.htm">Non-Ant project builders</a><br> + <a href="qs-97_standalone_ets.htm">Stand-alone external tools</a> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-84_run_ant.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-84_run_ant.htm index 499003c..56d1f33 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-84_run_ant.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-84_run_ant.htm
@@ -1,48 +1,42 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html lang="en"> <head> - -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<meta http-equiv="Content-Style-Type" content="text/css"> - -<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> -<title>Running Ant buildfiles</title> - + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Running Ant buildfiles</title> </head> <body> -<h1>Running Ant buildfiles</h1> - -<p>Any file with a <code>.xml</code> extension can be run as an Ant buildfile. - Of course, not all such files really are Ant buildfiles, but no harm is done - if an attempt is made to mistakenly run a non-Ant <code>.xml</code> file as an Ant buildfile.</p> -<p>In this section, the basic mechanisms for running Ant buildfiles - in Eclipse will be covered, using the <code>HelloWorld.xml</code> file created in the <a href="qs-83_edit.htm">Editing Ant buildfiles</a> task.</p> -<ol> - <li>Select <code>HelloWorld.xml</code> in one of the navigation views and choose <b>Run As - > Ant Build... </b> from its context menu.</li> - <li>The launch configuration dialog is opened on a launch configuration for this Ant buildfile. - <p><img src="../images/ant_run_dialog.png" alt="Run Ant dialog" border="0"></p> - </li> - <li>This dialog allows the configuration of many aspects of the way an Ant - buildfile is run, but for now concentrate on the <b>Targets</b> tab which - allows the selection of which Ant targets to run and their order. Select both - targets and leave the order as the default. </li> - <li>Click the <b>Run</b> button.</li> - <li>The Ant buildfile is run, and the output is sent to the <b><a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/console/ref-console_view.htm">Console view</a></b>.</li> -</ol> -<h3 class="related">Related tasks</h3> - <a href="qs-82_create.htm">Creating Ant buildfiles</a><br> - <a href="qs-83_edit.htm">Editing Ant buildfiles</a><br> - <a href="qs-85_ant_configs.htm">Saving & Reusing Ant options</a><br> - <a href="qs-84_run_ant.htm">Running Ant buildfiles</a><br> - <a href="qs-93_project_builder.htm">Creating a project builder Ant buildfile</a><br> - <a href="qs-92_project_builders.htm">Ant buildfiles as project builders</a><br> - <a href="qs-94_run_pj.htm">Executing project builders</a><br> - <a href="qs-95_external_tools.htm">External tools</a><br> - <a href="qs-96_non_ant_pjs.htm">Non-Ant project builders</a><br> - <a href="qs-97_standalone_ets.htm">Stand-alone external tools</a> - + <h1>Running Ant buildfiles</h1> + <p>Any file with a <code>.xml</code> extension can be run as an Ant buildfile. Of course, not all such files really + are Ant buildfiles, but no harm is done if an attempt is made to mistakenly run a non-Ant <code>.xml</code> file as + an Ant buildfile.</p> + <p>In this section, the basic mechanisms for running Ant buildfiles in Eclipse will be covered, using the + <code>HelloWorld.xml</code> file created in the <a href="qs-83_edit.htm">Editing Ant buildfiles</a> task.</p> + <ol> + <li>Select <code>HelloWorld.xml</code> in one of the navigation views and choose <b>Run As > Ant Build...</b> + from its context menu.</li> + <li>The launch configuration dialog is opened on a launch configuration for this Ant buildfile. + <p><img src="../images/ant_run_dialog.png" alt="Run Ant dialog" border="0"></p> + </li> + <li>This dialog allows the configuration of many aspects of the way an Ant buildfile is run, but for now + concentrate on the <b>Targets</b> tab which allows the selection of which Ant targets to run and their order. + Select both targets and leave the order as the default.</li> + <li>Click the <b>Run</b> button.</li> + <li>The Ant buildfile is run, and the output is sent to the <b><a href= + "PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/console/ref-console_view.htm">Console view</a></b>.</li> + </ol> + <h3 class="related">Related tasks</h3><a href="qs-82_create.htm">Creating Ant buildfiles</a><br> + <a href="qs-83_edit.htm">Editing Ant buildfiles</a><br> + <a href="qs-85_ant_configs.htm">Saving & Reusing Ant options</a><br> + <a href="qs-84_run_ant.htm">Running Ant buildfiles</a><br> + <a href="qs-93_project_builder.htm">Creating a project builder Ant buildfile</a><br> + <a href="qs-92_project_builders.htm">Ant buildfiles as project builders</a><br> + <a href="qs-94_run_pj.htm">Executing project builders</a><br> + <a href="qs-95_external_tools.htm">External tools</a><br> + <a href="qs-96_non_ant_pjs.htm">Non-Ant project builders</a><br> + <a href="qs-97_standalone_ets.htm">Stand-alone external tools</a> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-85_ant_configs.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-85_ant_configs.htm index 887a096..3c6fc0c 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-85_ant_configs.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-85_ant_configs.htm
@@ -1,74 +1,63 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html lang="en"> <head> -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<meta http-equiv="Content-Style-Type" content="text/css"> -<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> -<title>Saving & Reusing Ant options</title> - + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Saving & Reusing Ant options</title> </head> <body> -<h1>Saving & Reusing Ant options</h1> - -<p>When we ran the <code>HelloWorld.xml</code> Ant buildfile in the <a href="./qs-84_run_ant.htm">last section</a>, - the choice of targets, along with all other options in the launch configuration dialog were - saved in an entity called a 'launch configuration'. Launch configurations contain - all details necessary to run an Ant buildfile in a particular way. It is - perfectly valid to have multiple launch configurations associated with a single - Ant buildfile. Therefore, in addition to the launch configuration that was created in - the last step, specifying that our <code>HelloWorld.xml</code> buildfile should execute the - targets <code>"Hello"</code> and <code>"World"</code> in that order, a second launch configuration could be created - for the same buildfile specifying different targets or just different ordering. - Creating multiple launch configurations in this manner allows you to quickly run - your Ant buildfile in any configuration by simply specifying the corresponding - launch configuration.</p> -<ol> - <li>From the Workbench toolbar, select <b>Run > External Tools > Open External Tools Dialog...</b>.</li> - <li>The External Tools dialog opens and presents a choice of launch configurations - to view and edit. The launch configuration we created when we ran the <code>HelloWorld.xml</code> - buildfile is selected in the tree at the left, and the tabs on the right show - the options for this launch configuration.<br><br> - <img src="../images/et_dialog.png" alt="External tools dialog" border="0" > - <br><br> - </li> - <li>At the top of the dialog, change the Name to <code>Hello World</code> and <b>Apply</b> - the change.</li> - <li>In the tree at left, bring up on the context menu on the selected launch - configuration and choose <b>Duplicate</b>, or select the <b>Duplicate</b> on the - toolbar above the tree. A copy of the launch configuration - for the Hello World buildfile is created, <code>(1)</code> is appended to the name, and - the new launch configuration is selected in the tree.</li> - <li>Rename the new configuration to <code>World Hello</code>.</li> - <li>In the <b>Targets</b> tab, click the <b>Order...</b> button, change the - order of the targets so that the <code>World</code> target executes first, and <b>Apply</b> - the change.</li> - <li>Click <b>Run</b>.</li> - <li>As before, the <code>HelloWorld.xml</code> buildfile runs and sends its output to the - <b><a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/console/ref-console_view.htm">Console view</a></b>. - This time however, because the targets were reversed, the output is reversed as well.</li> - <li>Go back to the External Tools drop down in the toolbar. <br><br> - <img src="../images/et_dropdown.png" alt="External tools drop-down menu" border="0" > - <br><br> - Notice now that there are two entries in the history, one for <code>Hello World</code> - and one for <code>World Hello</code>. In order to rerun the Ant buildfile so that it outputs - <code>Hello World</code>, just select this launch configuration in the history. To rerun - the launch configuration that outputs <code>World Hello</code>, select this configuration - in the history.<br> - <strong>Note</strong>: The history is ordered so that the most frequently - run configurations are at the top of the drop-down.</li> -</ol> - -<h3 class="related">Related tasks</h3> - <a href="qs-82_create.htm">Creating Ant buildfiles</a><br> - <a href="qs-83_edit.htm">Editing Ant buildfiles</a><br> - <a href="qs-84_run_ant.htm">Running Ant buildfiles</a><br> - <a href="qs-93_project_builder.htm">Creating a project builder Ant buildfile</a><br> - <a href="qs-92_project_builders.htm">Ant buildfiles as project builders</a><br> - <a href="qs-94_run_pj.htm">Executing project builders</a><br> - <a href="qs-95_external_tools.htm">External tools</a><br> - <a href="qs-96_non_ant_pjs.htm">Non-Ant project builders</a><br> - <a href="qs-97_standalone_ets.htm">Stand-alone external tools</a> - + <h1>Saving & Reusing Ant options</h1> + <p>When we ran the <code>HelloWorld.xml</code> Ant buildfile in the <a href="./qs-84_run_ant.htm">last section</a>, + the choice of targets, along with all other options in the launch configuration dialog were saved in an entity called + a 'launch configuration'. Launch configurations contain all details necessary to run an Ant buildfile in a particular + way. It is perfectly valid to have multiple launch configurations associated with a single Ant buildfile. Therefore, + in addition to the launch configuration that was created in the last step, specifying that our + <code>HelloWorld.xml</code> buildfile should execute the targets <code>"Hello"</code> and <code>"World"</code> in + that order, a second launch configuration could be created for the same buildfile specifying different targets or + just different ordering. Creating multiple launch configurations in this manner allows you to quickly run your Ant + buildfile in any configuration by simply specifying the corresponding launch configuration.</p> + <ol> + <li>From the Workbench toolbar, select <b>Run > External Tools > Open External Tools Dialog...</b>.</li> + <li>The External Tools dialog opens and presents a choice of launch configurations to view and edit. The launch + configuration we created when we ran the <code>HelloWorld.xml</code> buildfile is selected in the tree at the left, + and the tabs on the right show the options for this launch configuration.<br> + <br> + <img src="../images/et_dialog.png" alt="External tools dialog" border="0"><br> + <br></li> + <li>At the top of the dialog, change the Name to <code>Hello World</code> and <b>Apply</b> the change.</li> + <li>In the tree at left, bring up on the context menu on the selected launch configuration and choose + <b>Duplicate</b>, or select the <b>Duplicate</b> on the toolbar above the tree. A copy of the launch configuration + for the Hello World buildfile is created, <code>(1)</code> is appended to the name, and the new launch + configuration is selected in the tree.</li> + <li>Rename the new configuration to <code>World Hello</code>.</li> + <li>In the <b>Targets</b> tab, click the <b>Order...</b> button, change the order of the targets so that the + <code>World</code> target executes first, and <b>Apply</b> the change.</li> + <li>Click <b>Run</b>.</li> + <li>As before, the <code>HelloWorld.xml</code> buildfile runs and sends its output to the <b><a href= + "PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/console/ref-console_view.htm">Console view</a></b>. This + time however, because the targets were reversed, the output is reversed as well.</li> + <li>Go back to the External Tools drop down in the toolbar.<br> + <br> + <img src="../images/et_dropdown.png" alt="External tools drop-down menu" border="0"><br> + <br> + Notice now that there are two entries in the history, one for <code>Hello World</code> and one for <code>World + Hello</code>. In order to rerun the Ant buildfile so that it outputs <code>Hello World</code>, just select this + launch configuration in the history. To rerun the launch configuration that outputs <code>World Hello</code>, + select this configuration in the history.<br> + <strong>Note</strong>: The history is ordered so that the most frequently run configurations are at the top of the + drop-down.</li> + </ol> + <h3 class="related">Related tasks</h3><a href="qs-82_create.htm">Creating Ant buildfiles</a><br> + <a href="qs-83_edit.htm">Editing Ant buildfiles</a><br> + <a href="qs-84_run_ant.htm">Running Ant buildfiles</a><br> + <a href="qs-93_project_builder.htm">Creating a project builder Ant buildfile</a><br> + <a href="qs-92_project_builders.htm">Ant buildfiles as project builders</a><br> + <a href="qs-94_run_pj.htm">Executing project builders</a><br> + <a href="qs-95_external_tools.htm">External tools</a><br> + <a href="qs-96_non_ant_pjs.htm">Non-Ant project builders</a><br> + <a href="qs-97_standalone_ets.htm">Stand-alone external tools</a> </body> -</html> \ No newline at end of file +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-85a_ant_view.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-85a_ant_view.htm index 7d4f3f2..07aa7e6 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-85a_ant_view.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-85a_ant_view.htm
@@ -1,72 +1,68 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html lang="en"> <head> -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<meta http-equiv="Content-Style-Type" content="text/css"> -<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> -<title>Using the Ant view</title> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Using the Ant view</title> </head> <body> -<h1>Using the Ant view</h1> - -<p>Eclipse provides a standard view, the <b><a href="../reference/ref-antview.htm">Ant view</a></b>, that lets you - work with your Ant buildfiles. This view is tree-structured, showing Ant buildfiles - as top-level entries and targets & internal targets as children. The main - advantage of this view is that you can work with all of your Ant buildfiles - in one place, as opposed to hunting them down in one of the navigation views.</p> -<ol> - <li>Open the <b><a href="../reference/ref-antview.htm">Ant view</a></b> from the workbench menu by selecting <b>Window > Show - View > Ant</b>.</li> - <li>By default, the Ant view is empty. There are three ways to add Ant buildfiles - to this view: - <ul> - <li>Click <strong>Add Buildfile [<img src="../images/add_co.svg" alt="Add buildfile to Ant view" border="0">]</strong>. - This brings up a dialog in which you explicitly select those Ant buildfiles - you want to add</li> - <li>Click <strong>Add Buildfiles with Search [<img src="../images/search.svg" alt="Add buildfiles with search">]</strong>. - This brings up a search dialog in which you can specify a filename pattern - for your Ant buildfiles and search within the entire workspace or a specified - working set.<br></li> - <li>Drag and drop buildfiles from other views to the <b><a href="../reference/ref-antview.htm">Ant view</a></b>.<br> + <h1>Using the Ant view</h1> + <p>Eclipse provides a standard view, the <b><a href="../reference/ref-antview.htm">Ant view</a></b>, that lets you + work with your Ant buildfiles. This view is tree-structured, showing Ant buildfiles as top-level entries and targets + & internal targets as children. The main advantage of this view is that you can work with all of your Ant + buildfiles in one place, as opposed to hunting them down in one of the navigation views.</p> + <ol> + <li>Open the <b><a href="../reference/ref-antview.htm">Ant view</a></b> from the workbench menu by selecting + <b>Window > Show View > Ant</b>.</li> + <li>By default, the Ant view is empty. There are three ways to add Ant buildfiles to this view: + <ul> + <li>Click <strong>Add Buildfile [<img src="../images/add_co.svg" alt="Add buildfile to Ant view" border= + "0">]</strong>. This brings up a dialog in which you explicitly select those Ant buildfiles you want to + add</li> + <li>Click <strong>Add Buildfiles with Search [<img src="../images/search.svg" alt= + "Add buildfiles with search">]</strong>. This brings up a search dialog in which you can specify a filename + pattern for your Ant buildfiles and search within the entire workspace or a specified working set.<br></li> + <li>Drag and drop buildfiles from other views to the <b><a href="../reference/ref-antview.htm">Ant + view</a></b>.<br> <br> - Once added to the Ant view, Ant buildfile entries remain in the view across - workbench invocations until explicitly removed or the associated project is closed.</li> - </ul> - </li> - <li>Click <strong>Add Buildfiles with Search</strong>. Suppose you only remember - that the buildfile you want to work with starts with <code>H</code>. Enter <code>H*.xml</code> for - the buildfile name. Make sure <b>Workspace</b> is selected for the scope, then click - <b>Search</b>. The <code>HelloWorld.xml</code> file is found and placed in the <b><a href="../reference/ref-antview.htm">Ant view</a></b>.</li> - <li>Expand the top-level entry to see the default target <code>Hello</code>, and the internal - target <code>World</code>. - </li> - <li>Select the <code>World</code> internal target and click <strong>Run the Selected Target [<img src="../images/run_exc.svg" alt="Run selected buildfile or selected target">]</strong>. - Notice that just the <code>World</code> target gets executed. </li> - <li>Select the top-level <code>HelloWorld</code> buildfile and click <strong>Run the Default - Target of the Selected Buildfile [<img src="../images/run_exc.svg" alt="Run selected buildfile or selected target">]</strong>. - Notice that just the default target, <code>Hello</code>, gets executed.</li> - <li>To edit your buildfile, bring up the context menu on the <code>HelloWorld</code> file - and select <b>Open With > Ant Editor</b>.</li> - <li>To edit the default launch configuration, select <strong>Run As > Ant Build...</strong> from - the context menu.</li> - <li>The Run Ant launch configuration dialog appears. Here you can modify the way in which the buildfile - is run from the <b><a href="../reference/ref-antview.htm">Ant view</a></b>.</li> - <li>Select the <code>HelloWorld</code> file, then click the <b>Remove</b> button. The buildfile - is removed from the view.<br> + Once added to the Ant view, Ant buildfile entries remain in the view across workbench invocations until + explicitly removed or the associated project is closed.</li> + </ul> + </li> + <li>Click <strong>Add Buildfiles with Search</strong>. Suppose you only remember that the buildfile you want to + work with starts with <code>H</code>. Enter <code>H*.xml</code> for the buildfile name. Make sure <b>Workspace</b> + is selected for the scope, then click <b>Search</b>. The <code>HelloWorld.xml</code> file is found and placed in + the <b><a href="../reference/ref-antview.htm">Ant view</a></b>.</li> + <li>Expand the top-level entry to see the default target <code>Hello</code>, and the internal target + <code>World</code>.</li> + <li>Select the <code>World</code> internal target and click <strong>Run the Selected Target [<img src= + "../images/run_exc.svg" alt="Run selected buildfile or selected target">]</strong>. Notice that just the + <code>World</code> target gets executed.</li> + <li>Select the top-level <code>HelloWorld</code> buildfile and click <strong>Run the Default Target of the Selected + Buildfile [<img src="../images/run_exc.svg" alt="Run selected buildfile or selected target">]</strong>. Notice that + just the default target, <code>Hello</code>, gets executed.</li> + <li>To edit your buildfile, bring up the context menu on the <code>HelloWorld</code> file and select <b>Open With + > Ant Editor</b>.</li> + <li>To edit the default launch configuration, select <strong>Run As > Ant Build...</strong> from the context + menu.</li> + <li>The Run Ant launch configuration dialog appears. Here you can modify the way in which the buildfile is run from + the <b><a href="../reference/ref-antview.htm">Ant view</a></b>.</li> + <li>Select the <code>HelloWorld</code> file, then click the <b>Remove</b> button. The buildfile is removed from the + view.<br> <strong>Note</strong>: This does not delete the file from the workspace.</li> -</ol> - -<h3 class="related">Related tasks</h3> - <a href="qs-82_create.htm">Creating Ant buildfiles</a><br> - <a href="qs-83_edit.htm">Editing Ant buildfiles</a><br> - <a href="qs-85_ant_configs.htm">Saving & Reusing Ant options</a><br> - <a href="qs-84_run_ant.htm">Running Ant buildfiles</a><br> - <a href="qs-93_project_builder.htm">Creating a project builder Ant buildfile</a><br> - <a href="qs-92_project_builders.htm">Ant buildfiles as project builders</a><br> - <a href="qs-94_run_pj.htm">Executing project builders</a><br> - <a href="qs-95_external_tools.htm">External tools</a><br> - <a href="qs-96_non_ant_pjs.htm">Non-Ant project builders</a><br> - <a href="qs-97_standalone_ets.htm">Stand-alone external tools</a> + </ol> + <h3 class="related">Related tasks</h3><a href="qs-82_create.htm">Creating Ant buildfiles</a><br> + <a href="qs-83_edit.htm">Editing Ant buildfiles</a><br> + <a href="qs-85_ant_configs.htm">Saving & Reusing Ant options</a><br> + <a href="qs-84_run_ant.htm">Running Ant buildfiles</a><br> + <a href="qs-93_project_builder.htm">Creating a project builder Ant buildfile</a><br> + <a href="qs-92_project_builders.htm">Ant buildfiles as project builders</a><br> + <a href="qs-94_run_pj.htm">Executing project builders</a><br> + <a href="qs-95_external_tools.htm">External tools</a><br> + <a href="qs-96_non_ant_pjs.htm">Non-Ant project builders</a><br> + <a href="qs-97_standalone_ets.htm">Stand-alone external tools</a> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-92_project_builders.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-92_project_builders.htm index 8b83197..81ba66d 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-92_project_builders.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-92_project_builders.htm
@@ -1,47 +1,40 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html lang="en"> <head> -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<meta http-equiv="Content-Style-Type" content="text/css"> -<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> -<title>Ant buildfiles as project builders</title> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Ant buildfiles as project builders</title> </head> <body> -<h1>Ant buildfiles as project builders</h1> - -<p>Our second practical example of using Ant buildfiles in Eclipse - is a 'project builder'. This is an Ant buildfile that has been designated to - run whenever a project is built. The uses for such a buildfile are many:</p> -<ul> - <li>Generate a <code>.jar</code> file containing class files from your project</li> - <li>Perform some type of pre- or post-build processing on source or binary files - in your project. For example: - <ul> - <li>Pre-processing source files to instrument them for performance analysis</li> - <li>Obfuscating binary files to prevent reverse engineering</li> - </ul> - </li> - <li>Copy class files to some location (for instance, on a network)</li> -</ul> -<p>For this example, we will create an Ant buildfile that creates a <code>.jar</code> archive - of the class files in a project. Note that this is similar to the example in - the last chapter, in which we used an Ant buildfile to generate <code>.jar</code> files for - an Eclipse plug-in. This example differs in that it works for any Eclipse project, - whether or not it is also an Eclipse plug-in. -</p> - -<h3 class="related">Related tasks</h3> - <a href="qs-82_create.htm">Creating Ant buildfiles</a><br> - <a href="qs-83_edit.htm">Editing Ant buildfiles</a><br> - <a href="qs-84_run_ant.htm">Running Ant buildfiles</a><br> - <a href="qs-85_ant_configs.htm">Saving & Reusing Ant options</a><br> - <a href="qs-93_project_builder.htm">Creating a project builder Ant buildfile</a><br> - <a href="qs-94_run_pj.htm">Executing project builders</a><br> - <a href="qs-93a_project_builder_targets.htm">Project Builder Ant Targets</a><br> - <a href="qs-95_external_tools.htm">External tools</a><br> - <a href="qs-96_non_ant_pjs.htm">Non-Ant project builders</a><br> - <a href="qs-97_standalone_ets.htm">Stand-alone external tools</a> - + <h1>Ant buildfiles as project builders</h1> + <p>Our second practical example of using Ant buildfiles in Eclipse is a 'project builder'. This is an Ant buildfile + that has been designated to run whenever a project is built. The uses for such a buildfile are many:</p> + <ul> + <li>Generate a <code>.jar</code> file containing class files from your project</li> + <li>Perform some type of pre- or post-build processing on source or binary files in your project. For example: + <ul> + <li>Pre-processing source files to instrument them for performance analysis</li> + <li>Obfuscating binary files to prevent reverse engineering</li> + </ul> + </li> + <li>Copy class files to some location (for instance, on a network)</li> + </ul> + <p>For this example, we will create an Ant buildfile that creates a <code>.jar</code> archive of the class files in a + project. Note that this is similar to the example in the last chapter, in which we used an Ant buildfile to generate + <code>.jar</code> files for an Eclipse plug-in. This example differs in that it works for any Eclipse project, + whether or not it is also an Eclipse plug-in.</p> + <h3 class="related">Related tasks</h3><a href="qs-82_create.htm">Creating Ant buildfiles</a><br> + <a href="qs-83_edit.htm">Editing Ant buildfiles</a><br> + <a href="qs-84_run_ant.htm">Running Ant buildfiles</a><br> + <a href="qs-85_ant_configs.htm">Saving & Reusing Ant options</a><br> + <a href="qs-93_project_builder.htm">Creating a project builder Ant buildfile</a><br> + <a href="qs-94_run_pj.htm">Executing project builders</a><br> + <a href="qs-93a_project_builder_targets.htm">Project Builder Ant Targets</a><br> + <a href="qs-95_external_tools.htm">External tools</a><br> + <a href="qs-96_non_ant_pjs.htm">Non-Ant project builders</a><br> + <a href="qs-97_standalone_ets.htm">Stand-alone external tools</a> </body> -</html> \ No newline at end of file +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-93_project_builder.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-93_project_builder.htm index 6ecae3b..dc8991c 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-93_project_builder.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-93_project_builder.htm
@@ -1,28 +1,27 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html lang="en"> <head> -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<meta http-equiv="Content-Style-Type" content="text/css"> -<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> -<title>Creating a project builder Ant buildfile</title> - + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Creating a project builder Ant buildfile</title> </head> <body> -<h1>Creating a project builder Ant buildfile</h1> -<p>To see how project builders work, we will create a simple project - with a single source file and an Ant buildfile that jars up the single class file. - Though this example uses Java, it should be noted that project builders are + <h1>Creating a project builder Ant buildfile</h1> + <p>To see how project builders work, we will create a simple project with a single source file and an Ant buildfile + that jars up the single class file. Though this example uses Java, it should be noted that project builders are available for all projects, Java or otherwise.</p> -<ol> - <li>Create a Java project named <code>HW</code>.</li> - <li>Create a Java source file named <code>HelloWorld</code> with a main method.</li> - <li>Put a single <code>System.out.println()</code> statement in the main method, and make - it print a greeting of your choice.</li> - <li>Save changes.</li> - <li>Create a file named <code>projectBuilder.xml</code>, open the <b><a href="../reference/ref-anteditor.htm">Ant editor</a></b> on it, enter - the following content, and save changes. -<pre> + <ol> + <li>Create a Java project named <code>HW</code>.</li> + <li>Create a Java source file named <code>HelloWorld</code> with a main method.</li> + <li>Put a single <code>System.out.println()</code> statement in the main method, and make it print a greeting of + your choice.</li> + <li>Save changes.</li> + <li>Create a file named <code>projectBuilder.xml</code>, open the <b><a href="../reference/ref-anteditor.htm">Ant + editor</a></b> on it, enter the following content, and save changes. + <pre> <?xml version="1.0" encoding="UTF-8"?> <project name="HW.makejar" default="makejar" basedir="."> <target name ="makejar" description="Create a jar for the HW project"> @@ -30,62 +29,56 @@ </target> </project> </pre> - </li> - <li>In one of the navigation views, select the HW project and choose <b>Properties</b> - from its context menu.</li> - <li>In the project properties dialog, select <b>Builders</b>, then click <b>New...</b>. - </li> - <li>In the <strong>Choose configuration type</strong> dialog, select <strong>Ant - build</strong>, and click <b>OK</b>. </li> - <li>The <strong>External Tools</strong> dialog appears. Set the name to <code>Makejar</code>. - In the <b>Main tab</b>, click the <strong>Buildfile</strong> <b>Browse Workspace...</b> - and set the <b>Location</b> to be the <code>projectBuilder.xml</code> buildfile created - above. Then click the <strong>Base Directory</strong> <b>Browse Workspace...</b> - and set the Base Directory to be the HW project. - <p><img src="../images/ant_builder_main_tab.png" alt="Main tab of External tools dialog" border="0" ></p> - </li> - <li>In the <b>Refresh</b> tab, we want to be sure that when our <code>HelloWorld.jar</code> - is created, we see it in Eclipse. By default, no refreshing is done when a - project builder finishes running, so check <b>Refresh resource upon completion</b>, - then select <b>The project containing the selected resource</b> in the list - of scoped variables. Because refreshing can be expensive, you should, in general, - refresh the smallest entity that contains all resources that will be affected - by your buildfile. - <p><img src="../images/ant_builder_refresh_tab.png" alt="Refresh tab of External tools dialog" border="0"></p> - </li> - <li>In the <b>Targets</b> tab, you can specify when this project builder - is executed and which targets. By default, the <code>default</code> target is set to run <strong>After a "Clean" - </strong> and <strong>Manual Build</strong>. You can specify other targets and other triggers. Running your project builder - during auto builds is possible, though not recommended because of performance - concerns. More information about the build kinds can be found <a href="qs-93a_project_builder_targets.htm">here</a>. - <p><img src="../images/ant_builder_targets_tab.png" alt="Targets tab of External tools dialog" border="0" ></p> - </li> - <li>Apply the changes and click <b>OK</b>.</li> - <li>Back in the project properties dialog, you will now see a project builder - named <code>Makejar</code> that is set to run after the default <b><a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/concepts/concept-java-builder.htm">Java builder</a></b>. Click <b>OK</b> - to save the project builder and close the dialog. <br> - <strong>Note:</strong>You can change the order so that your Ant buildfile runs before - the <b><a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/concepts/concept-java-builder.htm">Java builder</a></b>, though that wouldn't make sense in this example. - <p><img src="../images/builder_property_page.png" alt="Project properties dialog" border="0" ></p> - </li> -</ol> -<p>The <b><a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/concepts/concept-java-builder.htm">Java builder</a></b> runs the internal Eclipse Java compiler which in - turn is responsible for indexing your source so that searching, refactoring and - many other features are available. Thus it is not possible to replace the internal - Eclipse Java compiler by using a project builder. You can disable the <b><a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/concepts/concept-java-builder.htm">Java builder</a></b> and you can control + </li> + <li>In one of the navigation views, select the HW project and choose <b>Properties</b> from its context menu.</li> + <li>In the project properties dialog, select <b>Builders</b>, then click <b>New...</b>.</li> + <li>In the <strong>Choose configuration type</strong> dialog, select <strong>Ant build</strong>, and click + <b>OK</b>.</li> + <li>The <strong>External Tools</strong> dialog appears. Set the name to <code>Makejar</code>. In the <b>Main + tab</b>, click the <strong>Buildfile</strong> <b>Browse Workspace...</b> and set the <b>Location</b> to be the + <code>projectBuilder.xml</code> buildfile created above. Then click the <strong>Base Directory</strong> <b>Browse + Workspace...</b> and set the Base Directory to be the HW project. + <p><img src="../images/ant_builder_main_tab.png" alt="Main tab of External tools dialog" border="0"></p> + </li> + <li>In the <b>Refresh</b> tab, we want to be sure that when our <code>HelloWorld.jar</code> is created, we see it + in Eclipse. By default, no refreshing is done when a project builder finishes running, so check <b>Refresh resource + upon completion</b>, then select <b>The project containing the selected resource</b> in the list of scoped + variables. Because refreshing can be expensive, you should, in general, refresh the smallest entity that contains + all resources that will be affected by your buildfile. + <p><img src="../images/ant_builder_refresh_tab.png" alt="Refresh tab of External tools dialog" border="0"></p> + </li> + <li>In the <b>Targets</b> tab, you can specify when this project builder is executed and which targets. By default, + the <code>default</code> target is set to run <strong>After a "Clean"</strong> and <strong>Manual Build</strong>. + You can specify other targets and other triggers. Running your project builder during auto builds is possible, + though not recommended because of performance concerns. More information about the build kinds can be found + <a href="qs-93a_project_builder_targets.htm">here</a>. + <p><img src="../images/ant_builder_targets_tab.png" alt="Targets tab of External tools dialog" border="0"></p> + </li> + <li>Apply the changes and click <b>OK</b>.</li> + <li>Back in the project properties dialog, you will now see a project builder named <code>Makejar</code> that is + set to run after the default <b><a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/concepts/concept-java-builder.htm"> + Java builder</a></b>. Click <b>OK</b> to save the project builder and close the dialog.<br> + <strong>Note:</strong>You can change the order so that your Ant buildfile runs before the <b><a href= + "PLUGINS_ROOT/org.eclipse.jdt.doc.user/concepts/concept-java-builder.htm">Java builder</a></b>, though that + wouldn't make sense in this example. + <p><img src="../images/builder_property_page.png" alt="Project properties dialog" border="0"></p> + </li> + </ol> + <p>The <b><a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/concepts/concept-java-builder.htm">Java builder</a></b> runs + the internal Eclipse Java compiler which in turn is responsible for indexing your source so that searching, + refactoring and many other features are available. Thus it is not possible to replace the internal Eclipse Java + compiler by using a project builder. You can disable the <b><a href= + "PLUGINS_ROOT/org.eclipse.jdt.doc.user/concepts/concept-java-builder.htm">Java builder</a></b> and you can control when the Java Builder runs with respect to the project builders that you define.</p> - -<h3 class="related">Related tasks</h3> - <a href="qs-82_create.htm">Creating Ant buildfiles</a><br> - <a href="qs-93a_project_builder_targets.htm">Project Builder Ant Targets</a><br> - <a href="qs-83_edit.htm">Editing Ant buildfiles</a><br> - <a href="qs-85_ant_configs.htm">Saving & Reusing Ant options</a><br> - <a href="qs-84_run_ant.htm">Running Ant buildfiles</a><br> - <a href="qs-92_project_builders.htm">Ant buildfiles as project builders</a><br> - <a href="qs-94_run_pj.htm">Executing project builders</a><br> - <a href="qs-95_external_tools.htm">External tools</a><br> - <a href="qs-96_non_ant_pjs.htm">Non-Ant project builders</a><br> - <a href="qs-97_standalone_ets.htm">Stand-alone external tools</a> - + <h3 class="related">Related tasks</h3><a href="qs-82_create.htm">Creating Ant buildfiles</a><br> + <a href="qs-93a_project_builder_targets.htm">Project Builder Ant Targets</a><br> + <a href="qs-83_edit.htm">Editing Ant buildfiles</a><br> + <a href="qs-85_ant_configs.htm">Saving & Reusing Ant options</a><br> + <a href="qs-84_run_ant.htm">Running Ant buildfiles</a><br> + <a href="qs-92_project_builders.htm">Ant buildfiles as project builders</a><br> + <a href="qs-94_run_pj.htm">Executing project builders</a><br> + <a href="qs-95_external_tools.htm">External tools</a><br> + <a href="qs-96_non_ant_pjs.htm">Non-Ant project builders</a><br> + <a href="qs-97_standalone_ets.htm">Stand-alone external tools</a> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-93a_project_builder_targets.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-93a_project_builder_targets.htm index 40f0574..999c372 100755 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-93a_project_builder_targets.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-93a_project_builder_targets.htm
@@ -1,76 +1,59 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html lang="en"> <head> -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<meta http-equiv="Content-Style-Type" content="text/css"> -<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> -<title>Project Builder Ant Targets</title> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Project Builder Ant Targets</title> </head> <body> -<h1>Project Builder Ant Targets</h1> -<p> - When creating a new project builder using an Ant build file, one of the key pieces of information to set - up and understand is the targets and when they will be executed. -</p> -<p> - When you create a new Ant buildfile project builder, the default target is set to be run for <b>After a "Clean"</b> - and <b>Manual Build</b> and the remaining two kinds; <b>Auto Build</b> and <b>During a "Clean"</b> are set to not be executed. If you want - to configure your builder to execute specific targets from your buildfile for specific build kinds then more understanding of what the build - kinds are, and more importantly, when they will be executed is required. -</p> -<p> - The following sections describe each build kind and when it is executed. -</p> -<h3>After a "Clean"</h3> -<p> - This build kind is executed <i>after</i> a project has been cleaned via the <b>Project > Clean...</b> command. -</p> -<p> - <b>After a "Clean"</b> will execute during the next build immediately following the clean regardless of your workspace auto-build settings. - If you have workspace auto-build <i>on</i> this will execute automatically following the clean, otherwise you will have to invoke - one of the manual build commands; <b>Project > Build Project</b>, <b>Project > Build All</b> or enable <b>Project > Build Automatically</b>. -</p> - -<h3>Manual Build</h3> -<p> - This build kind is executed when you have workspace auto-build (<b>Project > Build Automatically</b>) turned <i>off</i> and you invoke a build via the <b>Project > Build Project</b> - or <b>Project > Build All</b> (<b>Ctrl+B</b>) command. -</p> -<p> - There are three exceptions to when <b>Manual Build</b> targets execute: -</p> -<ol> - <li>If the build is the first build following a clean (<b>Project > Clean...</b>) then an <b>After a "Clean"</b> build will be executed instead</li> - <li>If there are no targets set to run for <b>After a "Clean"</b>, then the <b>Manual Build</b> targets will be executed following a clean (<b>Project > Clean...</b>)</li> - <li>If there is nothing to be built, i.e. no changes have been made to the project, then <b>Manual Build</b> targets will <i>not</i> be executed</li> -</ol> - -<h3>Auto Build</h3> -<p> - This build kind is executed when you have workspace auto-build (<b>Project > Build Automatically</b>) turned <i>on</i> and you make changes in your - project and save them. -</p> - -<h3>During a "Clean"</h3> -<p> - This build kind is executed when you invoke a clean build via the (<b>Project > Clean...</b>) command. -</p> -<p> - <b>During a "Clean"</b> does not depend on the workspace auto-build setting (<b>Project > Build Automatically</b>) as it executes - during the clean build, not after, like <b>After a "Clean"</b> or <b>Manual Build</b>. -</p> - -<h3 class="related">Related tasks</h3> - <a href="qs-82_create.htm">Creating Ant buildfiles</a><br> - <a href="qs-83_edit.htm">Editing Ant buildfiles</a><br> - <a href="qs-85_ant_configs.htm">Saving & Reusing Ant options</a><br> - <a href="qs-84_run_ant.htm">Running Ant buildfiles</a><br> - <a href="qs-92_project_builders.htm">Ant buildfiles as project builders</a><br> - <a href="qs-94_run_pj.htm">Executing project builders</a><br> - <a href="qs-95_external_tools.htm">External tools</a><br> - <a href="qs-96_non_ant_pjs.htm">Non-Ant project builders</a><br> - <a href="qs-97_standalone_ets.htm">Stand-alone external tools</a> - + <h1>Project Builder Ant Targets</h1> + <p>When creating a new project builder using an Ant build file, one of the key pieces of information to set up and + understand is the targets and when they will be executed.</p> + <p>When you create a new Ant buildfile project builder, the default target is set to be run for <b>After a + "Clean"</b> and <b>Manual Build</b> and the remaining two kinds; <b>Auto Build</b> and <b>During a "Clean"</b> are + set to not be executed. If you want to configure your builder to execute specific targets from your buildfile for + specific build kinds then more understanding of what the build kinds are, and more importantly, when they will be + executed is required.</p> + <p>The following sections describe each build kind and when it is executed.</p> + <h3>After a "Clean"</h3> + <p>This build kind is executed <i>after</i> a project has been cleaned via the <b>Project > Clean...</b> + command.</p> + <p><b>After a "Clean"</b> will execute during the next build immediately following the clean regardless of your + workspace auto-build settings. If you have workspace auto-build <i>on</i> this will execute automatically following + the clean, otherwise you will have to invoke one of the manual build commands; <b>Project > Build Project</b>, + <b>Project > Build All</b> or enable <b>Project > Build Automatically</b>.</p> + <h3>Manual Build</h3> + <p>This build kind is executed when you have workspace auto-build (<b>Project > Build Automatically</b>) turned + <i>off</i> and you invoke a build via the <b>Project > Build Project</b> or <b>Project > Build All</b> + (<b>Ctrl+B</b>) command.</p> + <p>There are three exceptions to when <b>Manual Build</b> targets execute:</p> + <ol> + <li>If the build is the first build following a clean (<b>Project > Clean...</b>) then an <b>After a "Clean"</b> + build will be executed instead</li> + <li>If there are no targets set to run for <b>After a "Clean"</b>, then the <b>Manual Build</b> targets will be + executed following a clean (<b>Project > Clean...</b>)</li> + <li>If there is nothing to be built, i.e. no changes have been made to the project, then <b>Manual Build</b> + targets will <i>not</i> be executed</li> + </ol> + <h3>Auto Build</h3> + <p>This build kind is executed when you have workspace auto-build (<b>Project > Build Automatically</b>) turned + <i>on</i> and you make changes in your project and save them.</p> + <h3>During a "Clean"</h3> + <p>This build kind is executed when you invoke a clean build via the (<b>Project > Clean...</b>) command.</p> + <p><b>During a "Clean"</b> does not depend on the workspace auto-build setting (<b>Project > Build + Automatically</b>) as it executes during the clean build, not after, like <b>After a "Clean"</b> or <b>Manual + Build</b>.</p> + <h3 class="related">Related tasks</h3><a href="qs-82_create.htm">Creating Ant buildfiles</a><br> + <a href="qs-83_edit.htm">Editing Ant buildfiles</a><br> + <a href="qs-85_ant_configs.htm">Saving & Reusing Ant options</a><br> + <a href="qs-84_run_ant.htm">Running Ant buildfiles</a><br> + <a href="qs-92_project_builders.htm">Ant buildfiles as project builders</a><br> + <a href="qs-94_run_pj.htm">Executing project builders</a><br> + <a href="qs-95_external_tools.htm">External tools</a><br> + <a href="qs-96_non_ant_pjs.htm">Non-Ant project builders</a><br> + <a href="qs-97_standalone_ets.htm">Stand-alone external tools</a> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-94_run_pj.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-94_run_pj.htm index d053c38..c30c574 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-94_run_pj.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-94_run_pj.htm
@@ -1,52 +1,44 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html lang="en"> <head> -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<meta http-equiv="Content-Style-Type" content="text/css"> -<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> -<title>Executing project builders</title> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Executing project builders</title> </head> <body> -<h1>Executing project builders</h1> - -<p>The whole point of project builders is that you don't need to -explicitly tell them to run. Instead, they run automatically whenever a qualifying build takes place - for the project that owns the buildfile. Remember that the builders are triggered as indicated - on the <strong>Build Options</strong> tab in the <b>External Tools</b> dialog and can be - any combination of after a clean, during a manual build or during auto builds. Let's see how this works.</p> -<ol> - <li>Select the <code>HW</code> project in one of the navigation views. In the workbench menu - bar, choose <b>Project > Clean...</b> Select <b>Clean selected projects</b> - and click <b>Ok</b></li> - <li>The project is rebuilt and the <code>projectBuilder.xml</code> buildfile is run. Notice - the output from this buildfile in the <b><a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/console/ref-console_view.htm">Console view</a></b>. </li> - <li>Make sure the Autobuild preference is turned on, then make some trivial - change to <code>HelloWorld.java</code> and save the change. The save triggers an auto build, - but the auto build does not trigger the project builder. </li> - <li>Suppose we don't want to see the buildfile output every time it runs. Go - back to the <b>External Tools Builders</b> page of the project properties dialog - on <code>HW</code>. Select the <code>Makejar</code> entry and click <b>Edit...</b>. On the <b>Main</b> - tab, un-check the <b>Capture Output</b> option, apply the change and exit back - to the workbench. </li> -</ol> -<p>This concludes our look at Ant buildfiles as project builders - in Eclipse. It's worth repeating that though this example used a Java project, - project builders are not tied to Java, and may be used for <a href="qs-96_non_ant_pjs.htm">any type of project</a>. -</p> - - -<h3 class="related">Related tasks</h3> - <a href="qs-82_create.htm">Creating Ant buildfiles</a><br> - <a href="qs-83_edit.htm">Editing Ant buildfiles</a><br> - <a href="qs-85_ant_configs.htm">Saving & Reusing Ant options</a><br> - <a href="qs-84_run_ant.htm">Running Ant buildfiles</a><br> - <a href="qs-93_project_builder.htm">Creating a project builder Ant buildfile</a><br> - <a href="qs-93a_project_builder_targets.htm">Project Builder Ant Targets</a><br> - <a href="qs-92_project_builders.htm">Ant buildfiles as project builders</a><br> - <a href="qs-95_external_tools.htm">External tools</a><br> - <a href="qs-96_non_ant_pjs.htm">Non-Ant project builders</a><br> - <a href="qs-97_standalone_ets.htm">Stand-alone external tools</a> - + <h1>Executing project builders</h1> + <p>The whole point of project builders is that you don't need to explicitly tell them to run. Instead, they run + automatically whenever a qualifying build takes place for the project that owns the buildfile. Remember that the + builders are triggered as indicated on the <strong>Build Options</strong> tab in the <b>External Tools</b> dialog and + can be any combination of after a clean, during a manual build or during auto builds. Let's see how this works.</p> + <ol> + <li>Select the <code>HW</code> project in one of the navigation views. In the workbench menu bar, choose <b>Project + > Clean...</b> Select <b>Clean selected projects</b> and click <b>Ok</b></li> + <li>The project is rebuilt and the <code>projectBuilder.xml</code> buildfile is run. Notice the output from this + buildfile in the <b><a href= + "PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/console/ref-console_view.htm">Console view</a></b>.</li> + <li>Make sure the Autobuild preference is turned on, then make some trivial change to <code>HelloWorld.java</code> + and save the change. The save triggers an auto build, but the auto build does not trigger the project builder.</li> + <li>Suppose we don't want to see the buildfile output every time it runs. Go back to the <b>External Tools + Builders</b> page of the project properties dialog on <code>HW</code>. Select the <code>Makejar</code> entry and + click <b>Edit...</b>. On the <b>Main</b> tab, un-check the <b>Capture Output</b> option, apply the change and exit + back to the workbench.</li> + </ol> + <p>This concludes our look at Ant buildfiles as project builders in Eclipse. It's worth repeating that though this + example used a Java project, project builders are not tied to Java, and may be used for <a href= + "qs-96_non_ant_pjs.htm">any type of project</a>.</p> + <h3 class="related">Related tasks</h3><a href="qs-82_create.htm">Creating Ant buildfiles</a><br> + <a href="qs-83_edit.htm">Editing Ant buildfiles</a><br> + <a href="qs-85_ant_configs.htm">Saving & Reusing Ant options</a><br> + <a href="qs-84_run_ant.htm">Running Ant buildfiles</a><br> + <a href="qs-93_project_builder.htm">Creating a project builder Ant buildfile</a><br> + <a href="qs-93a_project_builder_targets.htm">Project Builder Ant Targets</a><br> + <a href="qs-92_project_builders.htm">Ant buildfiles as project builders</a><br> + <a href="qs-95_external_tools.htm">External tools</a><br> + <a href="qs-96_non_ant_pjs.htm">Non-Ant project builders</a><br> + <a href="qs-97_standalone_ets.htm">Stand-alone external tools</a> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-95_external_tools.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-95_external_tools.htm index b0fd4fb..fb68dce 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-95_external_tools.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-95_external_tools.htm
@@ -1,37 +1,32 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html lang="en"> <head> -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<meta http-equiv="Content-Style-Type" content="text/css"> -<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> -<title>External tools</title> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>External tools</title> </head> <body> -<h1>External tools</h1> - -<p>Up to this point in the tutorial, we've discussed Ant as if it - were the only type of external tool available for use in Eclipse. The fact is - that Eclipse's external tools framework handles two broad classes of external - tools:</p> -<ul> - <li>Ant: <a href="qs-82_create.htm">buildfiles</a> and <a href="qs-93_project_builder.htm">project builders</a></li> - <li>Non-Ant: <a href="qs-97_standalone_ets.htm">stand alone tools</a> and <a href="qs-96_non_ant_pjs.htm">non-Ant project builders</a></li> -</ul> -<p> In this section, we look at ways to set up and use non-Ant external - tools. -</p> - -<h3 class="related">Related tasks</h3> - <a href="qs-82_create.htm">Creating Ant buildfiles</a><br> - <a href="qs-83_edit.htm">Editing Ant buildfiles</a><br> - <a href="qs-85_ant_configs.htm">Saving & Reusing Ant options</a><br> - <a href="qs-84_run_ant.htm">Running Ant buildfiles</a><br> - <a href="qs-93_project_builder.htm">Creating a project builder Ant buildfile</a><br> - <a href="qs-92_project_builders.htm">Ant buildfiles as project builders</a><br> - <a href="qs-94_run_pj.htm">Executing project builders</a><br> - <a href="qs-96_non_ant_pjs.htm">Non-Ant project builders</a><br> - <a href="qs-97_standalone_ets.htm">Stand-alone external tools</a> - + <h1>External tools</h1> + <p>Up to this point in the tutorial, we've discussed Ant as if it were the only type of external tool available for + use in Eclipse. The fact is that Eclipse's external tools framework handles two broad classes of external tools:</p> + <ul> + <li>Ant: <a href="qs-82_create.htm">buildfiles</a> and <a href="qs-93_project_builder.htm">project + builders</a></li> + <li>Non-Ant: <a href="qs-97_standalone_ets.htm">stand alone tools</a> and <a href="qs-96_non_ant_pjs.htm">non-Ant + project builders</a></li> + </ul> + <p>In this section, we look at ways to set up and use non-Ant external tools.</p> + <h3 class="related">Related tasks</h3><a href="qs-82_create.htm">Creating Ant buildfiles</a><br> + <a href="qs-83_edit.htm">Editing Ant buildfiles</a><br> + <a href="qs-85_ant_configs.htm">Saving & Reusing Ant options</a><br> + <a href="qs-84_run_ant.htm">Running Ant buildfiles</a><br> + <a href="qs-93_project_builder.htm">Creating a project builder Ant buildfile</a><br> + <a href="qs-92_project_builders.htm">Ant buildfiles as project builders</a><br> + <a href="qs-94_run_pj.htm">Executing project builders</a><br> + <a href="qs-96_non_ant_pjs.htm">Non-Ant project builders</a><br> + <a href="qs-97_standalone_ets.htm">Stand-alone external tools</a> </body> -</html> \ No newline at end of file +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-96_non_ant_pjs.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-96_non_ant_pjs.htm index 6390f18..f533243 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-96_non_ant_pjs.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-96_non_ant_pjs.htm
@@ -1,66 +1,58 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html lang="en"> <head> -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<meta http-equiv="Content-Style-Type" content="text/css"> -<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> -<title>Non-Ant project builders</title> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Non-Ant project builders</title> </head> <body> -<h1>Non-Ant project builders</h1> -<p> When we worked through our <a href="qs-93_project_builder.htm">project builder example</a>, you may have - noticed that when we created our project builder as an Ant buildfile kind. This time we will choose the Program kind when we create a - project builder. -</p> -<p>The <b>Program</b> option is essentially a catch-all, allowing you - to define an external tool for any executable file that is accessible on your - local or network file system. Suppose that instead of Ant, you prefer to use - your own shell scripts or Windows <code>.bat</code> files to jar up and deploy your Eclipse - projects. You would then create a <b>Program</b> external tool that specified where - and how to execute your script. </p> -<ol> - <li>Create a script that performs your preferred deployment steps.</li> - <li>Select the project that you wish to build in one of the navigation views, - and choose <b>Properties</b> from the context menu.</li> - <li>Select <b>Builders</b>, click <b>New...</b>, select <b>Program</b> and click - <b>OK</b>.</li> - <li>The <b>External Tools</b> dialog appears, configured for <b>Program</b> type tools.</li> - <li>Enter the location of your script, its working directory, and any required - arguments. <br><br> - <img src="../images/et_builder_main_tab.png" alt="External tools dialog for program type tools" border="0" > - <br><br> - </li> - <li>In this case, the script is a Windows <code>.bat</code> file, but it could be a Linux - shell script, a Perl script or just about anything else that can be executed - on your system. </li> - <li>The <b>Refresh</b> and <b>Build Options</b> tabs are identical to the tabs - we saw for Ant project builders. In particular, the <b>Build Options</b> tab - allows us to control what types of builds trigger our project builder buildfile.</li> - <li>Apply the changes, and click <b>OK</b>.</li> - <li>As with Ant project builders, we can control the ordering of this project - builder with respect to other project builders (such as the default <b><a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/concepts/concept-java-builder.htm">Java builder</a></b> - for Java projects).</li> - <li>Rebuild your project. This will trigger your script to execute. Any output - it generates will be sent to the <b><a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/console/ref-console_view.htm">Console view</a></b>.</li> -</ol> -<p>Ant is a popular tool for configuring and deploying projects. But if you prefer - some other tool, or prefer to do it yourself, you can set up a Program external - tool project builder. This allows you customize the deployment of your project - as you see fit, while keeping the convenience of automatically running your - script every time your project is built. -</p> - -<h3 class="related">Related tasks</h3> - <a href="qs-82_create.htm">Creating Ant buildfiles</a><br> - <a href="qs-83_edit.htm">Editing Ant buildfiles</a><br> - <a href="qs-85_ant_configs.htm">Saving & Reusing Ant options</a><br> - <a href="qs-84_run_ant.htm">Running Ant buildfiles</a><br> - <a href="qs-93_project_builder.htm">Creating a project builder Ant buildfile</a><br> - <a href="qs-92_project_builders.htm">Ant buildfiles as project builders</a><br> - <a href="qs-94_run_pj.htm">Executing project builders</a><br> - <a href="qs-95_external_tools.htm">External tools</a><br> - <a href="qs-97_standalone_ets.htm">Stand-alone external tools</a> - + <h1>Non-Ant project builders</h1> + <p>When we worked through our <a href="qs-93_project_builder.htm">project builder example</a>, you may have noticed + that when we created our project builder as an Ant buildfile kind. This time we will choose the Program kind when we + create a project builder.</p> + <p>The <b>Program</b> option is essentially a catch-all, allowing you to define an external tool for any executable + file that is accessible on your local or network file system. Suppose that instead of Ant, you prefer to use your own + shell scripts or Windows <code>.bat</code> files to jar up and deploy your Eclipse projects. You would then create a + <b>Program</b> external tool that specified where and how to execute your script.</p> + <ol> + <li>Create a script that performs your preferred deployment steps.</li> + <li>Select the project that you wish to build in one of the navigation views, and choose <b>Properties</b> from the + context menu.</li> + <li>Select <b>Builders</b>, click <b>New...</b>, select <b>Program</b> and click <b>OK</b>.</li> + <li>The <b>External Tools</b> dialog appears, configured for <b>Program</b> type tools.</li> + <li>Enter the location of your script, its working directory, and any required arguments.<br> + <br> + <img src="../images/et_builder_main_tab.png" alt="External tools dialog for program type tools" border="0"><br> + <br></li> + <li>In this case, the script is a Windows <code>.bat</code> file, but it could be a Linux shell script, a Perl + script or just about anything else that can be executed on your system.</li> + <li>The <b>Refresh</b> and <b>Build Options</b> tabs are identical to the tabs we saw for Ant project builders. In + particular, the <b>Build Options</b> tab allows us to control what types of builds trigger our project builder + buildfile.</li> + <li>Apply the changes, and click <b>OK</b>.</li> + <li>As with Ant project builders, we can control the ordering of this project builder with respect to other project + builders (such as the default <b><a href= + "PLUGINS_ROOT/org.eclipse.jdt.doc.user/concepts/concept-java-builder.htm">Java builder</a></b> for Java + projects).</li> + <li>Rebuild your project. This will trigger your script to execute. Any output it generates will be sent to the + <b><a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/console/ref-console_view.htm">Console + view</a></b>.</li> + </ol> + <p>Ant is a popular tool for configuring and deploying projects. But if you prefer some other tool, or prefer to do + it yourself, you can set up a Program external tool project builder. This allows you customize the deployment of your + project as you see fit, while keeping the convenience of automatically running your script every time your project is + built.</p> + <h3 class="related">Related tasks</h3><a href="qs-82_create.htm">Creating Ant buildfiles</a><br> + <a href="qs-83_edit.htm">Editing Ant buildfiles</a><br> + <a href="qs-85_ant_configs.htm">Saving & Reusing Ant options</a><br> + <a href="qs-84_run_ant.htm">Running Ant buildfiles</a><br> + <a href="qs-93_project_builder.htm">Creating a project builder Ant buildfile</a><br> + <a href="qs-92_project_builders.htm">Ant buildfiles as project builders</a><br> + <a href="qs-94_run_pj.htm">Executing project builders</a><br> + <a href="qs-95_external_tools.htm">External tools</a><br> + <a href="qs-97_standalone_ets.htm">Stand-alone external tools</a> </body> -</html> \ No newline at end of file +</html>
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-97_standalone_ets.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-97_standalone_ets.htm index 0c54085..5df7044 100644 --- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-97_standalone_ets.htm +++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-97_standalone_ets.htm
@@ -1,66 +1,57 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html lang="en"> <head> -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<meta http-equiv="Content-Style-Type" content="text/css"> -<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> -<title>Stand-alone external tools</title> + <meta name="copyright" content= + "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <title>Stand-alone external tools</title> </head> <body> -<h1>Stand-alone external tools</h1> - -<p>For the ultimate in external tool flexibility, create a 'stand-alone' - external tool launch configuration. This is similar to the project builder launch - configurations discussed in the last section, except that it need have nothing - to do with project building, and you can explicitly run it whenever you choose. - Suppose you wanted to have a way to quickly see the contents of a <code>.jar</code> file - in your workspace using the jar utility. </p> -<ol> - <li>Select some <code>.jar</code> file in your workspace.</li> - <li>Select <b>Run > External Tools > Open External Tools Dialog...</b> from the workbench - toolbar.<br><br> - <img src="../images/et_run_dropdown.png" alt="External tools drop-down menu" border="0" > - <br><br> - </li> - <li>Select <b>Program</b> in the tree, then click <b>New</b>.<br><br> - <img src="../images/et_standalone.png" alt="External tools dialog for jar inspector script" border="0" > - <br><br> - </li> - <li>Name the launch configuration <code>jar inspector</code>.</li> - <li>Use the first <b>Browse File System...</b> button to locate the jar executable.</li> - <li>In the <b>Arguments</b> field, type <code>-tvf</code> and a space, then click <b>Variables...</b>.</li> - <li>In the Select Variable dialog, you will see a number of variables you can - pass as arguments to the program specified in Location. Select <b>resource_loc</b> - and click <b>OK</b>. </li> - <li>When this buildfile is run, the absolute path of the resource selected in - the workbench will be passed to the jar utility in the position specified. - </li> - <li>Click <b>Run</b>.</li> - <li>Notice that the buildfile sends the jar utility output to the <b><a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/console/ref-console_view.htm">Console view</a></b>.</li> - <li>Select a different <code>.jar</code> file in your workspace.</li> - <li>Click the External Tools button in the toolbar. Notice the contents of this - jar are sent to the <b><a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/console/ref-console_view.htm">Console view</a></b> as well. - Now you have a quick and easy way to see the output of the jar utility for any <code>.jar</code> file in your workspace.</li> -</ol> -<p>This example has only scratched the surface of what you can do with external - tools. The important things to remember are that you can create an external - tool for anything you can run on your system, and that you can pass arguments - to the external tool related to the current workbench selection. In many cases, - this allows you to loosely integrate tools that do not have corresponding Eclipse - plug-ins. -</p> - -<h3 class="related">Related tasks</h3> - <a href="qs-82_create.htm">Creating Ant buildfiles</a><br> - <a href="qs-83_edit.htm">Editing Ant buildfiles</a><br> - <a href="qs-85_ant_configs.htm">Saving & Reusing Ant options</a><br> - <a href="qs-84_run_ant.htm">Running Ant buildfiles</a><br> - <a href="qs-93_project_builder.htm">Creating a project builder Ant buildfile</a><br> - <a href="qs-92_project_builders.htm">Ant buildfiles as project builders</a><br> - <a href="qs-94_run_pj.htm">Executing project builders</a><br> - <a href="qs-95_external_tools.htm">External tools</a><br> - <a href="qs-96_non_ant_pjs.htm">Non-Ant project builders</a> - + <h1>Stand-alone external tools</h1> + <p>For the ultimate in external tool flexibility, create a 'stand-alone' external tool launch configuration. This is + similar to the project builder launch configurations discussed in the last section, except that it need have nothing + to do with project building, and you can explicitly run it whenever you choose. Suppose you wanted to have a way to + quickly see the contents of a <code>.jar</code> file in your workspace using the jar utility.</p> + <ol> + <li>Select some <code>.jar</code> file in your workspace.</li> + <li>Select <b>Run > External Tools > Open External Tools Dialog...</b> from the workbench toolbar.<br> + <br> + <img src="../images/et_run_dropdown.png" alt="External tools drop-down menu" border="0"><br> + <br></li> + <li>Select <b>Program</b> in the tree, then click <b>New</b>.<br> + <br> + <img src="../images/et_standalone.png" alt="External tools dialog for jar inspector script" border="0"><br> + <br></li> + <li>Name the launch configuration <code>jar inspector</code>.</li> + <li>Use the first <b>Browse File System...</b> button to locate the jar executable.</li> + <li>In the <b>Arguments</b> field, type <code>-tvf</code> and a space, then click <b>Variables...</b>.</li> + <li>In the Select Variable dialog, you will see a number of variables you can pass as arguments to the program + specified in Location. Select <b>resource_loc</b> and click <b>OK</b>.</li> + <li>When this buildfile is run, the absolute path of the resource selected in the workbench will be passed to the + jar utility in the position specified.</li> + <li>Click <b>Run</b>.</li> + <li>Notice that the buildfile sends the jar utility output to the <b><a href= + "PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/console/ref-console_view.htm">Console view</a></b>.</li> + <li>Select a different <code>.jar</code> file in your workspace.</li> + <li>Click the External Tools button in the toolbar. Notice the contents of this jar are sent to the <b><a href= + "PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/console/ref-console_view.htm">Console view</a></b> as well. + Now you have a quick and easy way to see the output of the jar utility for any <code>.jar</code> file in your + workspace.</li> + </ol> + <p>This example has only scratched the surface of what you can do with external tools. The important things to + remember are that you can create an external tool for anything you can run on your system, and that you can pass + arguments to the external tool related to the current workbench selection. In many cases, this allows you to loosely + integrate tools that do not have corresponding Eclipse plug-ins.</p> + <h3 class="related">Related tasks</h3><a href="qs-82_create.htm">Creating Ant buildfiles</a><br> + <a href="qs-83_edit.htm">Editing Ant buildfiles</a><br> + <a href="qs-85_ant_configs.htm">Saving & Reusing Ant options</a><br> + <a href="qs-84_run_ant.htm">Running Ant buildfiles</a><br> + <a href="qs-93_project_builder.htm">Creating a project builder Ant buildfile</a><br> + <a href="qs-92_project_builders.htm">Ant buildfiles as project builders</a><br> + <a href="qs-94_run_pj.htm">Executing project builders</a><br> + <a href="qs-95_external_tools.htm">External tools</a><br> + <a href="qs-96_non_ant_pjs.htm">Non-Ant project builders</a> </body> -</html> \ No newline at end of file +</html>