Commit fc56ef10 authored by Jay Jay Billings's avatar Jay Jay Billings

Merge branch 'next' into 2.2.1

Signed-off-by: default avatarJay Jay Billings <billingsjj@ornl.gov>
parents ba14c585 3df3f40d
......@@ -22,9 +22,7 @@ ICE application executable.
\end{enumerate}
\subsection{Starting ICE for the first time}
To start ICE, double-click on the application executable to open up ICE. When the workspace chooser
dialog opens, select the default workspace by clicking on the \texttt{OK}
button.
To start ICE, double-click on the application executable, i.e. \textit{ICE_SDK} file, which is located in the \textit{ice.sdk.product*} directory created by opening the zip file referenced in the previous section. The latter operation will open up ICE. When the workspace chooser dialog opens, select the default workspace by clicking on the \texttt{OK} button.
You can enter your own directory for the workspace location, but please make sure that it is writable and readable by you, and you remember where it is.
\begin{center} \includegraphics[width=\textwidth]{figures/workspace}
\end{center}
......
......@@ -138,7 +138,7 @@ and ICE should begin connecting to VisIt.
To open a Plot Editor, a file that uses this editor must first be placed in the
Project Explorer. This view lists files imported into ICE. To access the Project
Explorer, use the the menu bar at the top of the window and navigate to Window
Explorer, use the menu bar at the top of the window and navigate to Window
$\rightarrow$ Show View $\rightarrow$ Project Explorer. Depending on the active
Eclipse perspective, opening this view may require selecting Other\ldots and
finding the Project Explorer in the dialog under the General category in the
......
......@@ -13,49 +13,50 @@
</parent>
<modules>
<module>../org.eclipse.ice.caebat.batml</module>
<module>../org.eclipse.ice.caebat.batml.test</module>
<module>../org.eclipse.ice.tests.caebat.batml</module>
<module>../org.eclipse.ice.client</module>
<module>../org.eclipse.ice.client.compatibility</module>
<module>../org.eclipse.ice.client.rcp</module>
<module>../org.eclipse.ice.client.test</module>
<module>../org.eclipse.ice.tests.client</module>
<module>../org.eclipse.ice.client.widgets</module>
<module>../org.eclipse.ice.client.widgets.moose</module>
<module>../org.eclipse.ice.client.widgets.moose.test</module>
<module>../org.eclipse.ice.client.widgets.test</module>
<module>../org.eclipse.ice.client.widgets.test.utils</module>
<module>../org.eclipse.ice.tests.client.widgets.moose</module>
<module>../org.eclipse.ice.tests.client.widgets</module>
<module>../org.eclipse.ice.tests.client.widgets.utils</module>
<module>../org.eclipse.ice.core</module>
<module>../org.eclipse.ice.core.test</module>
<module>../org.eclipse.ice.tests.core</module>
<module>../org.eclipse.ice.datastructures</module>
<module>../org.eclipse.ice.datastructures.test</module>
<module>../org.eclipse.ice.tests.datastructures</module>
<module>../org.eclipse.ice.developer</module>
<module>../org.eclipse.ice.developer.moose</module>
<module>../org.eclipse.ice.geometry</module>
<module>../org.eclipse.ice.io</module>
<module>../org.eclipse.ice.io.test</module>
<module>../org.eclipse.ice.tests.io</module>
<module>../org.eclipse.ice.item</module>
<module>../org.eclipse.ice.item.test</module>
<module>../org.eclipse.ice.tests.item</module>
<module>../org.eclipse.ice.materials</module>
<module>../org.eclipse.ice.materials.test</module>
<module>../org.eclipse.ice.tests.materials</module>
<module>../org.eclipse.ice.materials.ui</module>
<module>../org.eclipse.ice.materials.feature</module>
<module>../org.eclipse.ice.mesh</module>
<module>../org.eclipse.ice.mesh.test</module>
<module>../org.eclipse.ice.tests.mesh</module>
<module>../org.eclipse.ice.nek5000</module>
<module>../org.eclipse.ice.nek5000.test</module>
<module>../org.eclipse.ice.tests.nek5000</module>
<module>../org.eclipse.ice.parent</module>
<module>../org.eclipse.ice.persistence.xml</module>
<module>../org.eclipse.ice.persistence.xml.test</module>
<module>../org.eclipse.ice.tests.persistence.xml</module>
<module>../org.eclipse.ice.projectgeneration</module>
<module>../org.eclipse.ice.projectgeneration.test</module>
<module>../org.eclipse.ice.tests.projectgeneration</module>
<module>../org.eclipse.ice.proteus</module>
<module>../org.eclipse.ice.proteus.test</module>
<module>../org.eclipse.ice.tests.proteus</module>
<module>../org.eclipse.ice.reactor.plant</module>
<module>../org.eclipse.ice.reactor.plant.test</module>
<module>../org.eclipse.ice.tests.reactor.plant</module>
<module>../org.eclipse.ice.reflectivity</module>
<module>../org.eclipse.ice.reflectivity.test</module>
<module>../org.eclipse.ice.tests.reflectivity</module>
<module>../org.eclipse.ice.reflectivity.ui</module>
<module>../org.eclipse.ice.target.neon</module>
<module>../org.eclipse.ice.target.oxygen</module>
<module>../org.eclipse.ice.vibe</module>
<module>../org.eclipse.ice.vibe.test</module>
<module>../org.eclipse.ice.tests.vibe</module>
<module>../org.eclipse.ice.feature</module>
<module>../org.eclipse.ice.repository</module>
<module>../org.eclipse.ice.product</module>
......
......@@ -99,4 +99,21 @@
</property>
</product>
</extension>
<extension
point="org.eclipse.ui.menus">
<menuContribution
allPopups="false"
locationURI="menu:help?after=additions">
<command
commandId="org.eclipse.equinox.p2.ui.discovery.commands.ShowRepositoryCatalog"
label="Install EASE Components"
style="push"
tooltip="Install EASE Additional Components">
<parameter
name="org.eclipse.equinox.p2.ui.discovery.commands.RepositoryParameter"
value="http://download.eclipse.org/ease/update/release">
</parameter>
</command>
</menuContribution>
</extension>
</plugin>
......@@ -38,24 +38,6 @@ public class MOOSEEclipseFormWidget extends EclipseFormWidget {
private static final Logger logger = LoggerFactory
.getLogger(MOOSEEclipseFormWidget.class);
/**
* The visualization service factory provided to MOOSEFormEditors through
* OSGi.
*/
private final IVizServiceFactory vizServiceFactory;
/**
* The default constructor.
*
* @param factory
* The visualization service factory provided to MOOSEFormEditors
* through OSGi.
*/
public MOOSEEclipseFormWidget(IVizServiceFactory factory) {
// Nothing to do yet.
this.vizServiceFactory = factory;
}
/**
* This operation displays the {@link MOOSEFormEditor} instead of the
* standard ICEFormEditor.
......@@ -81,8 +63,8 @@ public class MOOSEEclipseFormWidget extends EclipseFormWidget {
// FIXME Since this is a static method, it should probably be set
// from a more general OSGi-referencing service in the main widgets
// bundle.
org.eclipse.ice.client.widgets.ICEFormEditor
.setVizServiceFactory(vizServiceFactory);
// org.eclipse.ice.client.widgets.ICEFormEditor
// .setVizServiceFactory(vizServiceFactory);
} catch (PartInitException e) {
// Dump the stacktrace if something happens.
......
......@@ -66,40 +66,7 @@ public class MOOSEFormWidgetBuilder implements IFormWidgetBuilder {
*/
@Override
public IFormWidget build() {
return new MOOSEEclipseFormWidget(vizServiceFactory);
return new MOOSEEclipseFormWidget();
}
/**
* This method is called by the OSGi implementation to bind the
* {@link IVizServiceFactory} (an OSGi service) to this instance.
*
* @param factory
* The factory service available through OSGi.
*/
public void setVizServiceFactory(IVizServiceFactory factory) {
this.vizServiceFactory = factory;
IConfigurationElement[] elements = Platform.getExtensionRegistry()
.getConfigurationElementsFor("org.eclipse.eavp.viz.service.IVizServiceFactory");
logger.info("MOOSEFormWidgetBuilder: Available configuration elements");
for(IConfigurationElement element : elements){
logger.info(element.getName());
}
return;
}
/**
* This method is called by the OSGi implementation to unbind the
* {@link IVizServiceFactory} (an OSGi service) from this instance.
*
* @param factory
* The factory service that is no longer available through OSGi.
*/
public void unsetVizServiceFactory(IVizServiceFactory factory) {
if (factory == this.vizServiceFactory) {
this.vizServiceFactory = null;
}
}
}
......@@ -32,7 +32,7 @@ Import-Package:
org.eclipse.e4.ui.model,
org.eclipse.e4.ui.model.application,
org.eclipse.e4.ui.model.application.ui,
org.eclipse.eavp.viz.datastructures,
org.eclipse.eavp.viz.datastructures.ui,
org.eclipse.eavp.viz.datastructures.VizObject,
org.eclipse.eavp.viz.modeling,
org.eclipse.eavp.viz.modeling.base,
......
......@@ -237,7 +237,7 @@ public class ICEFormEditor extends SharedHeaderFormEditor
* The service factory that should be used for generating
* visualizations.
*/
public static void setVizServiceFactory(IVizServiceFactory factory) {
public void setVizServiceFactory(IVizServiceFactory factory) {
vizFactory = factory;
Logger staticLogger = LoggerFactory.getLogger(ICEFormEditor.class);
staticLogger.info("ICEFormEditor Message: IVizServiceFactory set!");
......
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>default</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>default</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
</natures>
</projectDescription>
......@@ -39,7 +39,7 @@ public class VizServiceFactoryHolder {
* @param input
* the VizServiceFactory to hold
*/
public static void setVizServiceFactory(IVizServiceFactory input) {
public void setVizServiceFactory(IVizServiceFactory input) {
VizServiceFactoryHolder.factory = input;
return;
......@@ -51,7 +51,7 @@ public class VizServiceFactoryHolder {
*
* @input A VizServiceFactory to remove.
*/
public static void unsetVizServiceFactory(IVizServiceFactory input) {
public void unsetVizServiceFactory(IVizServiceFactory input) {
if (input == factory) {
factory = null;
}
......
......@@ -15,7 +15,8 @@ Import-Package: org.eclipse.core.resources,
org.eclipse.e4.core.di.annotations,
org.eclipse.e4.ui.model.application,
org.eclipse.e4.ui.model.application.ui,
org.eclipse.eavp.viz.datastructures,
org.eclipse.eavp.viz.datastructures.ui,
org.eclipse.eavp.viz.datastructures.VizObject,
org.eclipse.eavp.viz.modeling,
org.eclipse.eavp.viz.modeling.base,
org.eclipse.eavp.viz.service,
......
......@@ -34,4 +34,5 @@ Require-Bundle: org.eclipse.cdt;bundle-version="8.7.0",
org.eclipse.core.runtime;bundle-version="3.11.0",
org.eclipse.core.resources;bundle-version="3.10.0",
org.eclipse.egit;bundle-version="4.0.0",
org.eclipse.ice.developer
org.eclipse.ice.developer,
org.eclipse.ui
......@@ -2,23 +2,64 @@
<?eclipse version="3.4"?>
<plugin>
<extension
id="org.eclipse.ice.developer.moose"
name="MOOSE Developer Tooling"
point="org.eclipse.ice.developer.code">
<code
branch="devel"
codeCategory="Framework"
codeName="MOOSE"
repoURL="https://github.com/idaholab/moose">
<command
commandName="Fork the Stork"
implementation="org.eclipse.ice.developer.moose.actions.StorkForkHandler">
</command>
<command
commandName="Clone MOOSE"
implementation="org.eclipse.ice.developer.moose.actions.MooseCloneHandler">
</command>
</code>
point="org.eclipse.ui.menus">
<menuContribution
allPopups="false"
locationURI="menu:org.eclipse.ice.developer.menu.framework">
<menu
label="MOOSE">
<command
commandId="org.eclipse.ice.developer.moose.forkStork"
label="Fork the Stork"
style="push">
</command>
<command
commandId="org.eclipse.ice.developer.moose.clone"
label="Clone"
style="push">
<parameter
name="repoURLID"
value="https://github.com/idaholab/moose">
</parameter>
<parameter
name="branchID"
value="devel">
</parameter>
</command>
</menu>
</menuContribution>
</extension>
<extension
point="org.eclipse.ui.commands">
<command
id="org.eclipse.ice.developer.moose.forkStork"
name="Fork the Stork">
</command>
<command
id="org.eclipse.ice.developer.moose.clone"
name="Clone">
<commandParameter
id="repoURLID"
name="repoURL"
optional="true">
</commandParameter>
<commandParameter
id="branchID"
name="branch"
optional="true">
</commandParameter>
</command>
</extension>
<extension
point="org.eclipse.ui.handlers">
<handler
class="org.eclipse.ice.developer.moose.actions.StorkForkHandler"
commandId="org.eclipse.ice.developer.moose.forkStork">
</handler>
<handler
class="org.eclipse.ice.developer.moose.actions.MooseCloneHandler"
commandId="org.eclipse.ice.developer.moose.clone">
</handler>
</extension>
</plugin>
......@@ -4,7 +4,7 @@
<extension-point id="org.eclipse.ice.developer.code" name="Scientific Code" schema="schema/iceDevCode.exsd"/>
<extension
<!--extension
id="org.eclipse.ice.developer.menu"
name="Developer"
point="org.eclipse.ui.menus">
......@@ -13,67 +13,183 @@
class="org.eclipse.ice.developer.menu.ICEExtensionContributionFactory"
locationURI="menu:org.eclipse.ui.main.menu">
</menuContribution>
</extension>
</extension-->
<extension
id="org.eclipse.ice.developer.icedev"
name="ICE Developer Tooling"
point="org.eclipse.ice.developer.code">
<code
branch="next"
codeCategory="Framework"
codeName="ICE"
repoURL="https://github.com/eclipse/ice">
<command
commandName="Clone"
implementation="org.eclipse.ice.developer.actions.FixMavenLifecycleCloneHandler">
</command>
<command
commandName="Build"
implementation="org.eclipse.ice.developer.actions.BuildICEHandler">
</command>
<command
commandName="Launch New Instance"
implementation="org.eclipse.ice.developer.actions.LaunchNewICEHandler">
</command>
<command
commandName="Import Local Repository"
implementation="org.eclipse.ice.developer.actions.ImportLocalICEHandler">
</command>
</code>
point="org.eclipse.ui.menus">
<menuContribution
allPopups="false"
locationURI="menu:org.eclipse.ui.main.menu?after=project">
<menu
id="org.eclipse.ice.developer.menu"
label="Developer">
<menu
id="org.eclipse.ice.developer.menu.ice"
label="ICE">
<command
commandId="org.eclipse.ice.developer.command.cloneAndFix"
label="Clone"
style="push">
<parameter
name="repoURLID"
value="https://github.com/eclipse/ice">
</parameter>
<parameter
name="branchID"
value="next">
</parameter>
</command>
<command
commandId="org.eclipse.ice.developer.command.build"
label="Build"
style="push">
</command>
<command
commandId="org.eclipse.ice.developer.command.launch"
label="Launch New Instance"
style="push">
</command>
<command
commandId="org.eclipse.ice.developer.command.importLocalRepo"
label="Import Local Repository"
style="push">
</command>
<menu
id="org.eclipse.ice.developer.menu.ice.tests"
label="ICE Tests">
<command
commandId="org.eclipse.ice.developer.command.clone"
label="Clone ICETests to user.home"
style="push">
<parameter
name="repoURLID"
value="https://github.com/jayjaybillings/ICETests">
</parameter>
<parameter
name="branchID"
value="master">
</parameter>
<parameter
name="cloneDirectoryID"
value="@user.home">
</parameter>
</command>
</menu>
</menu>
<menu
id="org.eclipse.ice.developer.menu.framework"
label="Framework">
<menu
id="org.eclipse.ice.developer.menu.framework.eavp"
label="EAVP">
<command
commandId="org.eclipse.ice.developer.command.cloneAndFix"
label="Clone"
style="push">
<parameter
name="repoURLID"
value="https://github.com/eclipse/eavp">
</parameter>
<parameter
name="branchID"
value="next">
</parameter>
</command>
</menu>
</menu>
<menu
id="org.eclipse.ice.developer.menu.nuclear"
label="Nuclear">
</menu>
<menu
id="org.eclipse.ice.developer.menu.molecularDynamics"
label="Molecular Dynamics">
</menu>
<menu
id="org.eclipse.ice.developer.menu.physics"
label="Physics">
</menu>
<menu
id="org.eclipse.ice.developer.menu.densityFunctionalTheory"
label="Density Functional Theory">
</menu>
</menu>
</menuContribution>
</extension>
<extension
id="org.eclipse.ice.developer.icetests"
name="ICE Tests"
point="org.eclipse.ice.developer.code">
<code
branch="master"
codeCategory="ICE"
codeName="ICE Tests"
repoURL="https://github.com/jayjaybillings/ICETests">
<command
commandName="Clone ICETests to user.home"
implementation="org.eclipse.ice.developer.actions.GitCloneHandler">
<parameter
name="cloneDirectory"
value="@user.home">
</parameter>
</command>
</code>
point="org.eclipse.ui.commands">
<command
id="org.eclipse.ice.developer.command.clone"
name="Clone">
<commandParameter
id="repoURLID"
name="repoURL"
optional="true">
</commandParameter>
<commandParameter
id="branchID"
name="branch"
optional="true">
</commandParameter>
<commandParameter
id="cloneDirectoryID"
name="cloneDirectory"
optional="true">
</commandParameter>
</command>
<command
id="org.eclipse.ice.developer.command.cloneAndFix"
name="CloneAndFix">
<commandParameter
id="repoURLID"
name="repoURL"
optional="true">
</commandParameter>
<commandParameter
id="branchID"
name="branch"
optional="true">
</commandParameter>
<commandParameter
id="cloneDirectoryID"
name="cloneDirectory"
optional="true">
</commandParameter>
</command>
<command
id="org.eclipse.ice.developer.command.build"
name="Build">
</command>
<command
id="org.eclipse.ice.developer.command.launch"
name="Launch">
</command>
<command
id="org.eclipse.ice.developer.command.importLocalRepo"
name="Import Local">
</command>
</extension>
<extension
id="org.eclipse.eavp.developer"
name="EAVP Developer Tooling"
point="org.eclipse.ice.developer.code">
<code
branch="next"
codeCategory="Framework"
codeName="EAVP"
repoURL="https://github.com/eclipse/eavp">
<command
commandName="Clone EAVP"
implementation="org.eclipse.ice.developer.actions.FixMavenLifecycleCloneHandler">
</command>
</code>
point="org.eclipse.ui.handlers">