Merge branch 'next' of https://github.com/eclipse/ice.git into next

docs/geometryEditor/src/content.tex

@@ -145,7 +145,7 @@ You can systematically create many copies of a shape with the Replicate Shape
 button highlighted above. This will open a new dialog.
 
 \begin{center}
-\includegraphics[width=12cm]{images/GeometryReplicateDialog.jpg}
+\includegraphics[width=8cm]{images/GeometryReplicateDialog.jpg}
 \end{center}
 
 The quantity is the number of desired copies of the shape which should be in the
@@ -171,6 +171,6 @@ and clicking the Delete button, highlighted below.
 \subsubsection{Saving}
 
 You may save the contents of the Geometry Editor. This can be done as normal for
-an Eclipse file, using the Save button or Ctrl + S. The result will be a file
-named Geometry\_Editor.xml in the ItemDB folder. The Geometry Editor can be
+an Eclipse file, using the Save button or \texttt{Ctrl + S}. The result will be
+a file named Geometry\_Editor.xml in the ItemDB folder. The Geometry Editor can be
 reponed by double clicking on this file. 

docs/newItemGeneration/src/usingDashboard.tex

@@ -2,9 +2,9 @@
 
 In order to use the functionality you've added to ICE, it is necessary to start
 a new \textit{instance} of ICE, called the \textit{runtime} instance. This will
-be a completely new copy of ICE that has your new plugins actived. This new
+be a completely new copy of ICE that has your new plugins activated. This new
 instance is how you and your users will typically interact with your
-application. Once you are statisfied with the functionality you have added, you
+application. Once you are satisfied with the functionality you have added, you
 can create a new \texttt{runtime application} that can be deployed to users.
 Creating runtime applications is beyond the scope of this tutorial.
 
@@ -159,7 +159,9 @@ A Parallel launch configuration for your application is created as follows:
   
   \item Switch to the \texttt{Arguments} tab and enter the name of the
   outputfile you chose in the \texttt{FernModel} file
-  \item Uncheck \texttt{Use default working directory}
+  \item Uncheck \texttt{Use default working directory}, click on the
+  \texttt{Browse} button, select the \texttt{fern} directory in the browser and
+  click \texttt{OK}
   
   \begin{center} \includegraphics[width=300]{figures/argumentsTab}
   \end{center}
@@ -169,7 +171,7 @@ A Parallel launch configuration for your application is created as follows:
 
 During the job submission, you will be asked if you would like to switch to the
 \texttt{System Monitoring} perspecive. Click \texttt{Yes} to see this feature.
-The image belows shows a typical instance of this perspective in action.
+The image below shows a typical instance of this perspective in action.
 
 \begin{center} \includegraphics[width=\textwidth]{figures/sysMon}
 \end{center}

docs/newItemGeneration/src/xsedeContent.tex

@@ -65,9 +65,9 @@ the \texttt{FernLauncher} and \texttt{FernModel} classes.
 The \texttt{FernModel} will be responsible for creating and
 validating input parameters for FERN, in the form of a new FERN input file.  In
 order to make the generated code run there are several pieces of information that need to be changed.  First, we
-will need to set up the basic Item idenfification information. This information
+will need to set up the basic Item identification information. This information
 is set in the setupItemInfo() method. Modify the outputName to match the
-following (or something of your choosing, with a .ini file extenstion).
+following (or something of your choosing, with a .ini file extension).
 
 \begin{lstlisting}[language=Java]
 outputName = "fern_config.ini";

docs/resourceComponents/src/xsedeContent.tex

@@ -14,7 +14,7 @@ other OSs can just copy the appropriate folder onto their machine.
 
 We will be adding the visualization components to the model made in the
 previous section, so return to your original ICE window, closing the launched
-instance. For convienence, you can copy and paste the code from the
+instance. For convenience, you can copy and paste the code from the
 XSEDEVisualizationeModel.java in the org.eclipse.ice.demo.visualization.model
 package. Its location can be seen in figure \ref{fig:demostructure}.
 
@@ -30,70 +30,72 @@ setupForm() method. You can also find this code in
 XSEDEVisualizationModel's setupForm() method, but be sure to note the
 comments specifying where to begin and end copying. 
 
+{\small
 \begin{verbatim}
-//Create the resource component
-ResourceComponent resourceComponent = new ResourceComponent();
+		//Create the resource component
+		ResourceComponent resourceComponent = new ResourceComponent();
 
-//Set the component's data members
-resourceComponent.setName("Resources");
-resourceComponent.setDescription("Results");
-resourceComponent.setId(2);
+		//Set the component's data members
+		resourceComponent.setName("Resource Component");
+		resourceComponent.setDescription("Results");
+		resourceComponent.setId(1);
 
-//Declare the files and resources
-VizResource csvResource = null;
-VizResource visItResource = null;
-IFile csvFile = null;
-IFile visItFile = null;
+		//Declare the files and resources
+		VizResource csvResource = null;
+		VizResource visItResource = null;
+		IFile csvFile = null;
+		IFile visItFile = null;
 
 
-//If the file was found, create the CSV resource and add it to the component
-try{
+		//If the file was found, create the CSV resource and add it to the component
+		try{
 			
-	//Open the files
-	csvFile = ResourcesPlugin.getWorkspace().getRoot().getProject("itemDB")
-		.getFile("fib8.csv");
-	visItFile = ResourcesPlugin.getWorkspace().getRoot().getProject("itemDB")
-		.getFile("tire.silo");
+			//Open the files
+			csvFile = ResourcesPlugin.getWorkspace().getRoot().getProject("itemDB").getFile("fib8.csv");
+			visItFile = ResourcesPlugin.getWorkspace().getRoot().getProject("itemDB").getFile("tire.silo");
 			
-	//If the file was found, create the CSV resource and add it to the component.
-	if(csvFile.exists()){
-		csvResource = new 
-                    VizResource(csvFile.getLocation()
-                    .toFile());
-    	resourceComponent.addResource(csvResource);
-	}
+			//If the file was found, create the CSV resource and add it to the component.
+			if(csvFile.exists()){
+				csvResource = new 
+		                    VizResource(csvFile.getLocation()
+		                    .toFile());
+		    	resourceComponent.addResource(csvResource);
+			}
 				        
-	//If the file was found, create the VisIt resource and add it to 
-	//the component
-	if(visItFile.exists()){
-		visItResource = new 
-                    VizResource(visItFile.getLocation()
-                    .toFile());
-		resourceComponent.addResource(visItResource);
-	}
-}
-catch(IOException e){
-	e.printStackTrace();
-}
-
-//Create the geometry component
-ShapeController geometryRoot = new ShapeController(new
-    ShapeMesh(), new BasicView());
-GeometryComponent geometryComponent = new 
-    GeometryComponent();
-geometryComponent.setGeometry(geometryRoot);
-
-//Create mesh component
-MeshComponent meshComponent = new MeshComponent();
-
-//Add the components to the form
-form.addComponent(resourceComponent);
-form.addComponent(geometryComponent);
-form.addComponent(meshComponent);	
+			//If the file was found, create the VisIt resource and add it to 
+			//the component
+			if(visItFile.exists()){
+				visItResource = new 
+		                    VizResource(visItFile.getLocation()
+		                    .toFile());
+				resourceComponent.addResource(visItResource);
+			}
+		}
+		catch(IOException e){
+			e.printStackTrace();
+		}
+
+		//Create the geometry component
+		ShapeController geometryRoot = new ShapeController(new
+		    Shape(), new BasicView());
+		GeometryComponent geometryComponent = new 
+		    GeometryComponent();
+		geometryComponent.setGeometry(geometryRoot);
+		geometryComponent.setName("Geometry Editor");
+
+		//Create mesh component
+		MeshComponent meshComponent = new MeshComponent();
+		meshComponent.setName("Mesh Editor");
+
+		//Add the components to the form
+		form.addComponent(resourceComponent);
+		form.addComponent(geometryComponent);
+		form.addComponent(meshComponent);	
 		
-//Set the context on the Form
-form.setContext("visualization");
+		// Set the context on the Form
+		form.setContext("visualization");
 \end{verbatim} 
+}
 
 This will cause errors in your file. To resolve them, first open the MANIFEST.MF
 file in your project's META-INF folder, switch to the \texttt{Dependencies} tab,
@@ -102,7 +104,7 @@ both highlightted in figure \ref{fig:manifest}. Select
 \texttt{org.eclipse.eavp.viz.datastructures}, press \texttt{OK}, and save the
 file. You can then return to your model file, hover over the underlined code
 for each of the errors until a menu pops up, and select the option to add a
-package to the imported packages, as seen in figure \ref{fig:hover}. Save the file when the hover menu no longer appears over
+package to the imported packages, as seen in figure \ref{fig:hover}. Repeat the process, this time choosing the option to import the class. Save the file when the hover menu no longer appears over
 errors.
 
 \begin{figure}[!h]
@@ -210,7 +212,7 @@ Then select \texttt{Visualization Model} and press \texttt{Finish}. You can also
 \texttt{Visualization Model (Pre-completed)} if you skipped the first part of
 the tutorial.
 
-Finally, switch to the ICE Perspective to ensure that the neccesary Views will
+Finally, switch to the ICE Perspective to ensure that the necessary Views will
 be open. To do this, click the \texttt{Open Perspective} button in the upper right
 of the workbench screen.
 
@@ -296,7 +298,7 @@ At the bottom of the plot will be a series of controls for animation. If your
 plot does not have time series data, they will be greyed out. 
 
 \begin{figure}[!h]
-\includegraphics[width=12cm]{images/TimeSliderWidget} 
+\includegraphics[width=8cm]{images/TimeSliderWidget} 
 \centering
 \caption{The \texttt{Plot Editor}'s animation controls.}
 \label{fig:timesliderwidget}
@@ -392,7 +394,7 @@ The \texttt{Mode} button in the top left allows you to switch between
 \texttt{Add Elements} mode, used previously, and \texttt{Edit Elements} mode.
 
 \begin{figure}[!h]
-\includegraphics[width=12cm]{images/EditMode}
+\includegraphics[width=8cm]{images/EditMode}
 \centering
 \caption{The \texttt{Mode} button allows switching between \texttt{Edit
 Elements} mode and \texttt{Add Elements} mode.}

docs/visualization/src/xsedeContent.tex

@@ -181,7 +181,7 @@ drop down menu. The resulting dialog box allows the user to browse the file
 system of the remote machine hosting the VisIt session.
 
 \begin{center}
-\includegraphics[width=12cm]{images/VisualizationAddPlots}
+\includegraphics[width=8cm]{images/VisualizationAddPlots}
 \end{center}
 
 Once a file is in the Visualization File Viewer, create a plot by selecting the
@@ -229,7 +229,7 @@ The Visualization Perspective features a drop down menu at the top of the VisIt
 Plot Viewer which allows for switching between the available representations. 
 
 \begin{center}
-\includegraphics[width=12cm]{images/VisItRepresentationDropDown}
+\includegraphics[width=8cm]{images/VisItRepresentationDropDown}
 \end{center}
 
 \subsection{Animation and Time Data}
@@ -237,7 +237,7 @@ Plot Viewer which allows for switching between the available representations.
 The Plot Editor features a time slider widget at the bottom of the screen. 
 
 \begin{center}
-\includegraphics[width=12cm]{images/TimeSliderWidget}
+\includegraphics[width=8cm]{images/TimeSliderWidget}
 \end{center}
 
 The controls, in order of left to right, are:
@@ -264,7 +264,7 @@ In the Visualization Perspective, the Visit Plot Viewer has a similiar set of
 controls.
 
 \begin{center}
-\includegraphics[width=12cm]{images/VizPerspectiveTimeControls}
+\includegraphics[width=6cm]{images/VizPerspectiveTimeControls}
 \end{center}
 
 The buttons, in order of left to right, are:

docs/xsede/.gitignore

 /bin/
 /tmp/
 /ice-fullTutoria.synctex.gz
-/src/

docs/xsede/src/overview.tex

+\section{Overview}
\ No newline at end of file