diff --git a/org.eclipse.ice.io.test/src/org/eclipse/ice/io/ini/test/INIReaderTester.java b/org.eclipse.ice.io.test/src/org/eclipse/ice/io/ini/test/INIReaderTester.java
index f44bca9ab760e4cf76258955c27f65b0cc5b0236..9ce2d3b14cdac055c3729b202ff011e3f2bac07f 100644
--- a/org.eclipse.ice.io.test/src/org/eclipse/ice/io/ini/test/INIReaderTester.java
+++ b/org.eclipse.ice.io.test/src/org/eclipse/ice/io/ini/test/INIReaderTester.java
@@ -110,7 +110,7 @@ public class INIReaderTester {
// Create an IPSReader to test
INIReader reader = new INIReader("!");
assertNotNull(reader);
- assertEquals(reader.getReaderType(), "INIReader");
+ assertEquals(reader.getReaderType(), "INI");
// Try to read in invalid INI file
IFile fakeFile = null;
diff --git a/org.eclipse.ice.io.test/src/org/eclipse/ice/io/ini/test/INIWriterTester.java b/org.eclipse.ice.io.test/src/org/eclipse/ice/io/ini/test/INIWriterTester.java
index 549520f0a5ff124f0a8b50c59d97805fdb833443..9296899828220209da3513d4f2290110f145f315 100644
--- a/org.eclipse.ice.io.test/src/org/eclipse/ice/io/ini/test/INIWriterTester.java
+++ b/org.eclipse.ice.io.test/src/org/eclipse/ice/io/ini/test/INIWriterTester.java
@@ -117,7 +117,7 @@ public class INIWriterTester {
INIReader reader = new INIReader();
INIWriter writer = new INIWriter();
assertNotNull(writer);
- assertEquals(writer.getWriterType(), "INIWriter");
+ assertEquals(writer.getWriterType(), "INI");
// Try to read in invalid INI file
Form form = null;
diff --git a/org.eclipse.ice.io.test/src/org/eclipse/ice/io/ips/test/IPSReaderTester.java b/org.eclipse.ice.io.test/src/org/eclipse/ice/io/ips/test/IPSReaderTester.java
index 398146450aae1dd6d83bc85838f349fe549963ef..cf5b20999bedb79a2859049892853e7be55db30c 100644
--- a/org.eclipse.ice.io.test/src/org/eclipse/ice/io/ips/test/IPSReaderTester.java
+++ b/org.eclipse.ice.io.test/src/org/eclipse/ice/io/ips/test/IPSReaderTester.java
@@ -117,7 +117,7 @@ public class IPSReaderTester {
// Create an IPSReader to test
IPSReader reader = new IPSReader();
assertNotNull(reader);
- assertEquals(reader.getReaderType(), "IPSReader");
+ assertEquals(reader.getReaderType(), "IPS");
// Try to read in invalid INI file
IFile fakeFile = null;
diff --git a/org.eclipse.ice.io/src/org/eclipse/ice/io/ini/INIReader.java b/org.eclipse.ice.io/src/org/eclipse/ice/io/ini/INIReader.java
index f2978ab910e504999cdda5da10f98217364a8f47..af929edddf42b34c1399dec25f1e48c979f33369 100644
--- a/org.eclipse.ice.io/src/org/eclipse/ice/io/ini/INIReader.java
+++ b/org.eclipse.ice.io/src/org/eclipse/ice/io/ini/INIReader.java
@@ -496,7 +496,7 @@ public class INIReader implements ITemplatedReader {
*/
@Override
public String getReaderType() {
- return "INIReader";
+ return "INI";
}
}
diff --git a/org.eclipse.ice.io/src/org/eclipse/ice/io/ini/INIWriter.java b/org.eclipse.ice.io/src/org/eclipse/ice/io/ini/INIWriter.java
index 488960995ad72a7e8551e5f3cdc15a2528addabe..0018cb95a7f6366d7425bd335484da76be1ec23b 100644
--- a/org.eclipse.ice.io/src/org/eclipse/ice/io/ini/INIWriter.java
+++ b/org.eclipse.ice.io/src/org/eclipse/ice/io/ini/INIWriter.java
@@ -183,7 +183,7 @@ public class INIWriter implements IWriter {
*/
@Override
public String getWriterType() {
- return "INIWriter";
+ return "INI";
}
}
diff --git a/org.eclipse.ice.io/src/org/eclipse/ice/io/ips/IPSReader.java b/org.eclipse.ice.io/src/org/eclipse/ice/io/ips/IPSReader.java
index c0a4a0962867b86d7b67a16fa2410b90413d9bb6..83e29dd821c2dbe7634a9b46f8fb6108db63e05f 100644
--- a/org.eclipse.ice.io/src/org/eclipse/ice/io/ips/IPSReader.java
+++ b/org.eclipse.ice.io/src/org/eclipse/ice/io/ips/IPSReader.java
@@ -210,7 +210,7 @@ public class IPSReader implements IReader {
*/
@Override
public String getReaderType() {
- return "IPSReader";
+ return "IPS";
}
/**
diff --git a/org.eclipse.ice.io/src/org/eclipse/ice/io/ips/IPSWriter.java b/org.eclipse.ice.io/src/org/eclipse/ice/io/ips/IPSWriter.java
index 5110659a874233c51d304eb1795eafb1b65827f6..086d159b5f4a92bdb88f5ff9be7a03013572ac2b 100644
--- a/org.eclipse.ice.io/src/org/eclipse/ice/io/ips/IPSWriter.java
+++ b/org.eclipse.ice.io/src/org/eclipse/ice/io/ips/IPSWriter.java
@@ -231,7 +231,7 @@ public class IPSWriter implements IWriter {
*/
@Override
public String getWriterType() {
- return "IPSWriter";
+ return "IPS";
}
/**
diff --git a/org.eclipse.ice.product/ice.product_linux.launch b/org.eclipse.ice.product/ice.product_linux.launch
index b2ae28dbba2ea1f689456d757942b22ca78723db..61a930a4ef693efecc004f8258622d5259e04458 100644
--- a/org.eclipse.ice.product/ice.product_linux.launch
+++ b/org.eclipse.ice.product/ice.product_linux.launch
@@ -22,8 +22,8 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.platform.ide"/>
<stringAttribute key="productFile" value="/org.eclipse.ice.repository/ice.product"/>
-<stringAttribute key="selected_target_plugins" value="ca.odell.glazedlists@default:default,ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.google.gson@default:default,com.google.guava@default:default,com.google.inject.multibindings@default:false,com.google.inject@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.spotify.docker-client.shaded@default:default,com.sun.jersey@default:default,gov.lbnl.visit.swt@default:default,javaewah@default:default,javax.annotation@default:default,javax.el@default:default,javax.inject@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.ws.rs@default:default,javax.xml@default:default,net.sourceforge.lpg.lpgjavaruntime@default:default,org.antlr.runtime@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.cli@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.io@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging*1.0.4.v201101211617@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.apache.commons.math@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.log4j@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.cdt.autotools.core@default:default,org.eclipse.cdt.autotools.ui@default:default,org.eclipse.cdt.codan.checkers.ui@default:default,org.eclipse.cdt.codan.checkers@default:default,org.eclipse.cdt.codan.core.cxx@default:default,org.eclipse.cdt.codan.core@default:default,org.eclipse.cdt.codan.ui.cxx@default:default,org.eclipse.cdt.codan.ui@default:default,org.eclipse.cdt.core.lrparser@default:default,org.eclipse.cdt.core.native@default:default,org.eclipse.cdt.core.parser.upc@default:default,org.eclipse.cdt.core@default:default,org.eclipse.cdt.debug.core@default:default,org.eclipse.cdt.debug.mi.core@default:default,org.eclipse.cdt.debug.mi.ui@default:default,org.eclipse.cdt.debug.ui@default:default,org.eclipse.cdt.doc.user@default:default,org.eclipse.cdt.gdb.ui@default:default,org.eclipse.cdt.gdb@default:default,org.eclipse.cdt.launch@default:default,org.eclipse.cdt.make.core@default:default,org.eclipse.cdt.make.ui@default:default,org.eclipse.cdt.managedbuilder.core@default:default,org.eclipse.cdt.managedbuilder.gnu.ui@default:default,org.eclipse.cdt.managedbuilder.ui@default:default,org.eclipse.cdt.remote.core@default:default,org.eclipse.cdt.ui@default:default,org.eclipse.cdt@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.java7@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:true,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.draw2d@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ease.help@default:default,org.eclipse.ease.lang.javascript.rhino.debugger@default:default,org.eclipse.ease.lang.javascript.rhino@default:default,org.eclipse.ease.lang.javascript.ui@default:default,org.eclipse.ease.lang.javascript@default:default,org.eclipse.ease.lang.python@default:default,org.eclipse.ease.modules.charting@default:default,org.eclipse.ease.modules.help@default:default,org.eclipse.ease.modules.platform@default:default,org.eclipse.ease.modules.team.svn@default:default,org.eclipse.ease.ui.scripts@default:default,org.eclipse.ease.ui@default:default,org.eclipse.ease@default:default,org.eclipse.eavp.viz.datastructures@default:default,org.eclipse.eavp.viz.modeling@default:default,org.eclipse.eavp.viz.service.geometry@default:default,org.eclipse.eavp.viz.service.javafx.geometry@default:true,org.eclipse.eavp.viz.service.javafx.mesh@default:true,org.eclipse.eavp.viz.service.javafx@default:default,org.eclipse.eavp.viz.service.mesh@default:default,org.eclipse.eavp.viz.service.paraview.web@default:default,org.eclipse.eavp.viz.service.paraview@default:true,org.eclipse.eavp.viz.service.visit@default:true,org.eclipse.eavp.viz.service@default:true,org.eclipse.eavp.viz@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.egit.core@default:default,org.eclipse.egit.github.core@default:default,org.eclipse.egit.ui@default:default,org.eclipse.egit@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.emf.mwe2.language.ui@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.emf.mwe2.launch.ui@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.emf.mwe2.lib@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.epp.mpc.core@default:default,org.eclipse.epp.mpc.help.ui@default:default,org.eclipse.epp.mpc.ui@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:true,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.discovery.compatibility@default:default,org.eclipse.equinox.p2.discovery@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.p2.ui.discovery@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.region@default:false,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.servletbridge@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.util@default:default,org.eclipse.equinox.weaving.hook@default:false,org.eclipse.fx.javafx@default:default,org.eclipse.fx.osgi@default:false,org.eclipse.gef@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help@default:default,org.eclipse.jdt.annotation*2.0.100.v20150311-1658@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.jem.util@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jgit@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.linuxtools.cdt.autotools.core@default:default,org.eclipse.linuxtools.cdt.libhover.glibc@default:default,org.eclipse.linuxtools.cdt.libhover.library.docs@default:default,org.eclipse.linuxtools.cdt.libhover@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.m2e.archetype.common@default:default,org.eclipse.m2e.core.ui@default:default,org.eclipse.m2e.core@default:default,org.eclipse.m2e.maven.indexer@default:default,org.eclipse.m2e.maven.runtime.slf4j.simple@default:default,org.eclipse.m2e.maven.runtime@default:default,org.eclipse.m2e.model.edit@default:default,org.eclipse.m2e.workspace.cli@default:default,org.eclipse.mylyn.commons.core@default:default,org.eclipse.mylyn.commons.identity.core@default:default,org.eclipse.mylyn.commons.net@default:default,org.eclipse.mylyn.commons.notifications.core@default:default,org.eclipse.mylyn.commons.notifications.feed@default:default,org.eclipse.mylyn.commons.notifications.ui@default:default,org.eclipse.mylyn.commons.repositories.core@default:default,org.eclipse.mylyn.commons.repositories.ui@default:default,org.eclipse.mylyn.commons.screenshots@default:default,org.eclipse.mylyn.commons.ui@default:default,org.eclipse.mylyn.commons.workbench@default:default,org.eclipse.mylyn.context.core@default:default,org.eclipse.mylyn.discovery.core@default:default,org.eclipse.mylyn.discovery.ui@default:default,org.eclipse.mylyn.monitor.core@default:default,org.eclipse.mylyn.monitor.ui@default:default,org.eclipse.mylyn.tasks.bugs@default:default,org.eclipse.mylyn.tasks.core@default:default,org.eclipse.mylyn.tasks.ui@default:default,org.eclipse.nebula.visualization.widgets@default:default,org.eclipse.nebula.visualization.xygraph@default:default,org.eclipse.nebula.widgets.nattable.core@default:default,org.eclipse.nebula.widgets.nattable.extension.glazedlists@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.api.tools.ui@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.pde.ds.ui@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.pde.ua.ui@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde@default:default,org.eclipse.photran.cdtinterface@default:default,org.eclipse.photran.core.vpg@default:default,org.eclipse.photran.core@default:default,org.eclipse.photran.ui@default:default,org.eclipse.platform@default:default,org.eclipse.ptp.aix@default:false,org.eclipse.ptp.cdt.compilers.core@default:default,org.eclipse.ptp.core@default:default,org.eclipse.ptp.debug.core@default:default,org.eclipse.ptp.debug.sdm.core@default:default,org.eclipse.ptp.debug.sdm.ui@default:default,org.eclipse.ptp.debug.sdm@default:default,org.eclipse.ptp.debug.ui@default:default,org.eclipse.ptp.doc.user@default:default,org.eclipse.ptp.ems.core@default:default,org.eclipse.ptp.ems.ui@default:default,org.eclipse.ptp.etfw.doc.user@default:default,org.eclipse.ptp.etfw.feedback.perfsuite.doc.user@default:default,org.eclipse.ptp.etfw.feedback.perfsuite@default:default,org.eclipse.ptp.etfw.feedback@default:default,org.eclipse.ptp.etfw.jaxb@default:default,org.eclipse.ptp.etfw.launch@default:default,org.eclipse.ptp.etfw.parallel@default:default,org.eclipse.ptp.etfw.tau.papiselect@default:default,org.eclipse.ptp.etfw.tau.perfdmf@default:default,org.eclipse.ptp.etfw.tau.selinst@default:default,org.eclipse.ptp.etfw.tau.selinstfort@default:default,org.eclipse.ptp.etfw.tau.ui@default:default,org.eclipse.ptp.etfw.tau@default:default,org.eclipse.ptp.etfw.toolopts@default:default,org.eclipse.ptp.etfw@default:default,org.eclipse.ptp.gem.help@default:default,org.eclipse.ptp.gem@default:default,org.eclipse.ptp.launch@default:default,org.eclipse.ptp.linux@default:false,org.eclipse.ptp.macosx@default:false,org.eclipse.ptp.pldt.common@default:default,org.eclipse.ptp.pldt.doc.user@default:default,org.eclipse.ptp.pldt.mpi.analysis.cdt@default:default,org.eclipse.ptp.pldt.mpi.analysis@default:default,org.eclipse.ptp.pldt.mpi.core@default:default,org.eclipse.ptp.pldt.mpi.fortran@default:default,org.eclipse.ptp.pldt.openacc.fortran@default:default,org.eclipse.ptp.pldt.openacc@default:default,org.eclipse.ptp.pldt.openmp.analysis@default:default,org.eclipse.ptp.pldt.openmp.core@default:default,org.eclipse.ptp.pldt.openmp.fortran@default:default,org.eclipse.ptp.pldt.openmp.ui.pv@default:default,org.eclipse.ptp.pldt.openshmem@default:default,org.eclipse.ptp.pldt.upc@default:default,org.eclipse.ptp.pldt.wizards@default:default,org.eclipse.ptp.proxy.protocol@default:default,org.eclipse.ptp.proxy@default:default,org.eclipse.ptp.rdt.sync.cdt.core@default:default,org.eclipse.ptp.rdt.sync.cdt.ui@default:default,org.eclipse.ptp.rdt.sync.core@default:default,org.eclipse.ptp.rdt.sync.fortran.ui@default:default,org.eclipse.ptp.rdt.sync.git.core@default:default,org.eclipse.ptp.rdt.sync.git.ui@default:default,org.eclipse.ptp.rdt.sync.ui@default:default,org.eclipse.ptp.remote.server.core@default:default,org.eclipse.ptp.remote.terminal@default:default,org.eclipse.ptp.rm.ibm.ll.doc.user@default:default,org.eclipse.ptp.rm.ibm.ll.ui@default:default,org.eclipse.ptp.rm.ibm.pe.doc.user@default:default,org.eclipse.ptp.rm.ibm.pe.ui@default:default,org.eclipse.ptp.rm.ibm.platform.lsf.doc.user@default:default,org.eclipse.ptp.rm.ibm.platform.lsf.ui@default:default,org.eclipse.ptp.rm.jaxb.configs@default:default,org.eclipse.ptp.rm.jaxb.contrib@default:default,org.eclipse.ptp.rm.jaxb.control.core@default:default,org.eclipse.ptp.rm.jaxb.control.ui@default:default,org.eclipse.ptp.rm.jaxb.core@default:default,org.eclipse.ptp.rm.jaxb.doc.user@default:default,org.eclipse.ptp.rm.jaxb.ui@default:default,org.eclipse.ptp.rm.lml.core@default:default,org.eclipse.ptp.rm.lml.da.server@default:default,org.eclipse.ptp.rm.lml.da@default:default,org.eclipse.ptp.rm.lml.monitor.core@default:default,org.eclipse.ptp.rm.lml.monitor.ui@default:default,org.eclipse.ptp.rm.lml.ui@default:default,org.eclipse.ptp.rm.slurm.help@default:default,org.eclipse.ptp.ui@default:default,org.eclipse.ptp.utils@default:default,org.eclipse.ptp@default:default,org.eclipse.rcp@default:default,org.eclipse.remote.core@default:default,org.eclipse.remote.jsch.core@default:default,org.eclipse.remote.jsch.ui@default:default,org.eclipse.remote.ui@default:default,org.eclipse.search@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.swtbot.ant.junit@default:false,org.eclipse.swtbot.eclipse.core@default:default,org.eclipse.swtbot.eclipse.finder@default:default,org.eclipse.swtbot.eclipse.gef.finder@default:default,org.eclipse.swtbot.forms.finder@default:default,org.eclipse.swtbot.go@default:default,org.eclipse.swtbot.junit4_x@default:default,org.eclipse.swtbot.swt.finder@default:default,org.eclipse.team.core@default:default,org.eclipse.team.svn.core@default:default,org.eclipse.team.svn.ui@default:default,org.eclipse.team.svn@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.tm.terminal.connector.remote@default:default,org.eclipse.tm.terminal.control@default:default,org.eclipse.tm.terminal.view.core@default:default,org.eclipse.tm.terminal.view.ui@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:true,org.eclipse.ui@default:default,org.eclipse.update.configurator@3:true,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.wst.common.frameworks.ui@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.wst.common.ui@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.wst.jsdt.core@default:default,org.eclipse.wst.jsdt.manipulation@default:default,org.eclipse.wst.jsdt.ui@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.sse.ui@default:default,org.eclipse.wst.validation.ui@default:default,org.eclipse.wst.validation@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.wst.xml.ui@default:default,org.eclipse.wst.xsd.core@default:default,org.eclipse.wst.xsd.ui@default:default,org.eclipse.xpand@default:default,org.eclipse.xsd.edit@default:default,org.eclipse.xsd@default:default,org.eclipse.xtend.lib.macro@default:default,org.eclipse.xtend.lib@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtext.common.types.edit@default:default,org.eclipse.xtext.common.types.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xtext.ecore@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.xtext.ide@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.smap@default:default,org.eclipse.xtext.ui.codetemplates.ui@default:default,org.eclipse.xtext.ui.codetemplates@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext.xtext.generator@default:default,org.eclipse.xtext.xtext.ui@default:default,org.eclipse.xtext.xtext.wizard@default:default,org.eclipse.xtext@default:default,org.hamcrest.core@default:default,org.hamcrest.library@default:default,org.junit@default:default,org.mozilla.javascript@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.impl.log4j12@default:false,org.tukaani.xz@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.ice.caebat.batml@default:true,org.eclipse.ice.client.compatibility@default:default,org.eclipse.ice.client.rcp@default:true,org.eclipse.ice.client.test@default:false,org.eclipse.ice.client.widgets.moose@default:default,org.eclipse.ice.client.widgets.test.utils@default:default,org.eclipse.ice.client.widgets.test@default:false,org.eclipse.ice.client.widgets@default:true,org.eclipse.ice.client@default:default,org.eclipse.ice.core.test@default:false,org.eclipse.ice.core@default:default,org.eclipse.ice.datastructures@default:true,org.eclipse.ice.filesimulation@default:true,org.eclipse.ice.io.test@default:false,org.eclipse.ice.io@default:true,org.eclipse.ice.item@default:true,org.eclipse.ice.materials.test@default:false,org.eclipse.ice.materials.ui@default:true,org.eclipse.ice.materials@default:true,org.eclipse.ice.mesh.test@default:false,org.eclipse.ice.mesh@default:true,org.eclipse.ice.nek5000.test@default:false,org.eclipse.ice.nek5000@default:true,org.eclipse.ice.parsergenerator@default:default,org.eclipse.ice.persistence.xml@default:true,org.eclipse.ice.projectgeneration@default:default,org.eclipse.ice.proteus.test@default:false,org.eclipse.ice.proteus@default:true,org.eclipse.ice.reactor.plant.test@default:false,org.eclipse.ice.reactor.plant@default:true,org.eclipse.ice.reflectivity.ui@default:default,org.eclipse.ice.reflectivity@default:true,org.eclipse.ice.vibe.test@default:false,org.eclipse.ice.vibe@default:true"/>
+<stringAttribute key="selected_target_plugins" value="bcpkix@default:default,bcprov@default:default,ca.odell.glazedlists@default:default,ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.google.gson@default:default,com.google.guava@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.spotify.docker-client.shaded@default:default,com.sun.jersey@default:default,gov.lbnl.visit.swt@default:default,javax.annotation@default:default,javax.el@default:default,javax.inject@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.ws.rs@default:default,javax.xml@default:default,org.apache.ant@default:default,org.apache.batik.css*1.6.0.v201011041432@default:default,org.apache.batik.css*1.7.0.v201011041433@default:default,org.apache.batik.util*1.6.0.v201011041432@default:default,org.apache.batik.util*1.7.0.v201011041433@default:default,org.apache.batik.util.gui*1.6.0.v201011041432@default:default,org.apache.batik.util.gui*1.7.0.v200903091627@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.compress@default:default,org.apache.commons.io@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.logging*1.0.4.v201101211617@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.apache.commons.math@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.log4j@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.cdt.core.linux.x86_64@default:false,org.eclipse.cdt.core.linux@default:false,org.eclipse.cdt.core.native@default:default,org.eclipse.cdt.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.java7@default:false,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:true,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.draw2d@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.swt.gtk@default:false,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ease.help@default:default,org.eclipse.ease.lang.javascript.rhino.debugger@default:default,org.eclipse.ease.lang.javascript.rhino@default:default,org.eclipse.ease.lang.javascript.ui@default:default,org.eclipse.ease.lang.javascript@default:default,org.eclipse.ease.lang.python@default:default,org.eclipse.ease.modules.charting@default:default,org.eclipse.ease.modules.help@default:default,org.eclipse.ease.modules.platform@default:default,org.eclipse.ease.modules.team.svn@default:default,org.eclipse.ease.ui.scripts@default:default,org.eclipse.ease.ui@default:default,org.eclipse.ease@default:default,org.eclipse.eavp.viz.datastructures@default:default,org.eclipse.eavp.viz.modeling@default:default,org.eclipse.eavp.viz.service.geometry@default:default,org.eclipse.eavp.viz.service.javafx.geometry@default:true,org.eclipse.eavp.viz.service.javafx.mesh@default:true,org.eclipse.eavp.viz.service.javafx@default:default,org.eclipse.eavp.viz.service.mesh@default:default,org.eclipse.eavp.viz.service.paraview.web@default:default,org.eclipse.eavp.viz.service.paraview@default:true,org.eclipse.eavp.viz.service.visit@default:true,org.eclipse.eavp.viz.service@default:true,org.eclipse.eavp.viz@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.emf.cdo.ecore.retrofit@default:false,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.discovery.compatibility@default:default,org.eclipse.equinox.p2.discovery@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.p2.ui.discovery@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.region@default:false,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.servletbridge@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.util@default:default,org.eclipse.equinox.weaving.hook@default:false,org.eclipse.fx.javafx@default:default,org.eclipse.fx.osgi@default:false,org.eclipse.gef@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.jem.util@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jsch.core@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.nebula.visualization.widgets@default:default,org.eclipse.nebula.visualization.xygraph@default:default,org.eclipse.nebula.widgets.nattable.core@default:default,org.eclipse.nebula.widgets.nattable.extension.glazedlists@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.ui@default:default,org.eclipse.platform@default:default,org.eclipse.remote.core@default:default,org.eclipse.remote.jsch.core@default:default,org.eclipse.remote.ui@default:default,org.eclipse.search@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.swtbot.ant.junit@default:false,org.eclipse.swtbot.eclipse.core@default:default,org.eclipse.swtbot.eclipse.finder@default:default,org.eclipse.swtbot.eclipse.gef.finder@default:default,org.eclipse.swtbot.forms.finder@default:default,org.eclipse.swtbot.go@default:default,org.eclipse.swtbot.junit4_x@default:default,org.eclipse.swtbot.swt.finder@default:default,org.eclipse.team.core@default:default,org.eclipse.team.svn.core@default:default,org.eclipse.team.svn.ui@default:default,org.eclipse.team.svn@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:true,org.eclipse.ui@default:default,org.eclipse.update.configurator@3:true,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.wst.jsdt.core@default:default,org.eclipse.wst.jsdt.manipulation@default:default,org.eclipse.wst.jsdt.ui@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.sse.ui@default:default,org.eclipse.wst.validation@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.xsd@default:default,org.eclipse.xtext.logging@default:false,org.hamcrest.core@default:default,org.hamcrest.library@default:default,org.junit@default:default,org.mozilla.javascript@default:default,org.objectweb.asm@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.impl.log4j12@default:false,org.tukaani.xz@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil*1.0.0.v200806040011@default:default,org.w3c.dom.smil*1.0.1.v200903091627@default:default,org.w3c.dom.svg@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.ice.caebat.batml@default:true,org.eclipse.ice.client.compatibility@default:default,org.eclipse.ice.client.rcp@default:true,org.eclipse.ice.client.test@default:false,org.eclipse.ice.client.widgets.moose@default:default,org.eclipse.ice.client.widgets.test.utils@default:default,org.eclipse.ice.client.widgets.test@default:false,org.eclipse.ice.client.widgets@default:true,org.eclipse.ice.client@default:default,org.eclipse.ice.core.test@default:false,org.eclipse.ice.core@default:default,org.eclipse.ice.datastructures@default:true,org.eclipse.ice.filesimulation@default:true,org.eclipse.ice.io.test@default:false,org.eclipse.ice.io@default:true,org.eclipse.ice.item.test@default:false,org.eclipse.ice.item@default:true,org.eclipse.ice.materials.test@default:false,org.eclipse.ice.materials.ui@default:true,org.eclipse.ice.materials@default:true,org.eclipse.ice.mesh.test@default:false,org.eclipse.ice.mesh@default:true,org.eclipse.ice.nek5000.test@default:false,org.eclipse.ice.nek5000@default:true,org.eclipse.ice.persistence.xml@default:true,org.eclipse.ice.projectgeneration@default:default,org.eclipse.ice.proteus.test@default:false,org.eclipse.ice.proteus@default:true,org.eclipse.ice.reactor.plant.test@default:false,org.eclipse.ice.reactor.plant@default:true,org.eclipse.ice.reflectivity.ui@default:default,org.eclipse.ice.reflectivity@default:true,org.eclipse.ice.vibe.test@default:false,org.eclipse.ice.vibe@default:true"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/org.eclipse.ice.projectgeneration.test/src/org/eclipse/ice/projectgeneration/test/NewICEItemProjectTester.java b/org.eclipse.ice.projectgeneration.test/src/org/eclipse/ice/projectgeneration/test/NewICEItemProjectTester.java
index 031dbabc9fe54082a03c306807b669619ddd78d2..d436a136c44c7098c71d651cc885f9f874922d4a 100644
--- a/org.eclipse.ice.projectgeneration.test/src/org/eclipse/ice/projectgeneration/test/NewICEItemProjectTester.java
+++ b/org.eclipse.ice.projectgeneration.test/src/org/eclipse/ice/projectgeneration/test/NewICEItemProjectTester.java
@@ -37,7 +37,7 @@ public class NewICEItemProjectTester {
private static final String SEP = System.getProperty("file.separator");
private static final String PROJECT_NAME = "org.eclipse.ice.newitem";
private static final int MANIFEST_LINE_COUNT = 25;
- private static final int MODEL_LINE_COUNT = 182;
+ private static final int MODEL_LINE_COUNT = 228;
private static final int LAUNCHER_LINE_COUNT = 82;
/**
diff --git a/org.eclipse.ice.projectgeneration/META-INF/MANIFEST.MF b/org.eclipse.ice.projectgeneration/META-INF/MANIFEST.MF
index 7f5d4e15a0628cc4748d8131c19d1220aea182fb..4ad3af3abdbd7b3f965c6ff86d5fd0c836142040 100644
--- a/org.eclipse.ice.projectgeneration/META-INF/MANIFEST.MF
+++ b/org.eclipse.ice.projectgeneration/META-INF/MANIFEST.MF
@@ -14,6 +14,7 @@ Export-Package: org.eclipse.ice.projectgeneration;uses:="org.eclipse.core.resour
Bundle-Vendor: Oak Ridge National Laboratory
Import-Package: org.eclipse.core.resources,
org.eclipse.core.runtime;version="3.5.0",
+ org.eclipse.ice.io.serializable,
org.eclipse.jface,
org.eclipse.jface.dialogs,
org.eclipse.jface.operation,
@@ -27,6 +28,9 @@ Import-Package: org.eclipse.core.resources,
org.eclipse.pde.internal.ui.wizards.plugin,
org.eclipse.pde.ui,
org.eclipse.pde.ui.templates,
+ org.eclipse.swt,
+ org.eclipse.swt.events,
+ org.eclipse.swt.layout,
org.eclipse.swt.widgets,
org.eclipse.ui,
org.eclipse.ui.dialogs,
diff --git a/org.eclipse.ice.projectgeneration/src/org/eclipse/ice/projectgeneration/ICEProjectResources.java b/org.eclipse.ice.projectgeneration/src/org/eclipse/ice/projectgeneration/ICEProjectResources.java
deleted file mode 100644
index bcae000b4e8661080884e548e7d92effaf7dfde8..0000000000000000000000000000000000000000
--- a/org.eclipse.ice.projectgeneration/src/org/eclipse/ice/projectgeneration/ICEProjectResources.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014 UT-Battelle, LLC.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Initial API and implementation and/or initial documentation - Jay Jay Billings,
- * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson,
- * Claire Saunders, Matthew Wang, Anna Wojtowicz
- *******************************************************************************/
-package org.eclipse.ice.projectgeneration;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.ResourceBundle;
-import java.util.Set;
-
-public class ICEProjectResources extends ResourceBundle {
-
- @Override
- protected Object handleGetObject(String key) {
- if (key.equals("okKey")) return "Okay";
- if (key.equals("cancelKey")) return "Cancel";
- return null;
- }
-
- @Override
- public Enumeration<String> getKeys() {
- return Collections.enumeration(keySet());
- }
-
- protected Set<String> handleKeySet() {
- return new HashSet<String>(Arrays.asList("okKey","cancelKey"));
- }
-}
diff --git a/org.eclipse.ice.projectgeneration/src/org/eclipse/ice/projectgeneration/templates/DataFileOption.java b/org.eclipse.ice.projectgeneration/src/org/eclipse/ice/projectgeneration/templates/DataFileOption.java
new file mode 100644
index 0000000000000000000000000000000000000000..96575d915cf849efd20e09fe09ddb427663c0b6c
--- /dev/null
+++ b/org.eclipse.ice.projectgeneration/src/org/eclipse/ice/projectgeneration/templates/DataFileOption.java
@@ -0,0 +1,133 @@
+/*******************************************************************************
+ * Copyright (c) 2014 UT-Battelle, LLC.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Initial API and implementation and/or initial documentation - Jay Jay Billings,
+ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson,
+ * Claire Saunders, Matthew Wang, Anna Wojtowicz
+ *******************************************************************************/
+package org.eclipse.ice.projectgeneration.templates;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import org.eclipse.pde.ui.templates.BaseOptionTemplateSection;
+import org.eclipse.pde.ui.templates.StringOption;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+/**
+ * The DataFileOption is an extension of the StringOption which has
+ * some additional UI components to be used in a specific manner.
+ * The main functionality of the DataFileOption comes from having
+ * the browse button attached, which allows users to select files
+ * from their local machine to be used as the default datasets to
+ * be loaded when no other data is given
+ *
+ * @author arbennett
+ */
+public class DataFileOption extends StringOption {
+
+ private Text locationPathField;
+ private Button browseButton;
+ private Label locationLabel;
+ private FileDialog fileChooser;
+ private String chosenFile;
+ private String description;
+
+ /**
+ * Constructor
+ *
+ * @param section
+ * The wizard section to add the option to
+ * @param name
+ * The variable replacement string
+ * @param label
+ * A description to prompt the user in some way
+ */
+ public DataFileOption(BaseOptionTemplateSection section, String name, String label) {
+ super(section, name, label);
+ description = label;
+ }
+
+
+ /**
+ * Create the user interface for the option
+ */
+ public void createControl(Composite parent, int span) {
+ // Create the descriptive layer
+ locationLabel = new Label(parent, SWT.NONE);
+ locationLabel.setText(description);
+
+ // Create the text entry area where the path to the file will be displayed
+ locationPathField = new Text(parent, SWT.BORDER);
+ GridData data = new GridData(GridData.FILL_HORIZONTAL);
+ data.widthHint = 250;
+ data.horizontalSpan = 2;
+ locationPathField.setLayoutData(data);
+
+ // Create the browse button and add a listener to open a file chooser
+ browseButton = new Button(parent, SWT.PUSH);
+ browseButton.setText("Browse");
+ browseButton.addSelectionListener(new SelectionListener() {
+ @Override
+ public void widgetSelected(SelectionEvent event) {
+ fileChooser = new FileDialog(parent.getShell());
+ fileChooser.setText("Select File");
+ fileChooser.setFilterExtensions(new String[] {"*.*"});
+ chosenFile = fileChooser.open();
+ locationPathField.setText(chosenFile);
+ setValue(chosenFile);
+ }
+
+ @Override public void widgetDefaultSelected(SelectionEvent e) {}
+ });
+ }
+
+
+ /**
+ * Get the path from the location path field
+ *
+ * @return the path
+ */
+ public String getDataFilePath() {
+ URI fieldURI;
+ try {
+ fieldURI = new URI(chosenFile);
+ } catch (URISyntaxException e) {
+ return chosenFile;
+ }
+ String path = fieldURI.getPath();
+ return path != null ? path : chosenFile;
+ }
+
+
+ /**
+ * Check if the value of the option is null
+ */
+ @Override
+ public boolean isEmpty() {
+ return getValue() == null;
+ }
+
+ /**
+ * Set whether the option is usable
+ */
+ @Override
+ public void setEnabled(boolean enabled) {
+ locationLabel.setEnabled(enabled);
+ locationPathField.setEnabled(enabled);
+ browseButton.setEnabled(enabled);
+ }
+}
diff --git a/org.eclipse.ice.projectgeneration/src/org/eclipse/ice/projectgeneration/templates/ICEItemTemplate.java b/org.eclipse.ice.projectgeneration/src/org/eclipse/ice/projectgeneration/templates/ICEItemTemplate.java
index 90ac4a62eaabfe80e8bdb19ed9ba663d64ae0cb6..0b9b56e57856ba3c7cee85f7299be7755b7b9d56 100644
--- a/org.eclipse.ice.projectgeneration/src/org/eclipse/ice/projectgeneration/templates/ICEItemTemplate.java
+++ b/org.eclipse.ice.projectgeneration/src/org/eclipse/ice/projectgeneration/templates/ICEItemTemplate.java
@@ -12,22 +12,32 @@
*******************************************************************************/
package org.eclipse.ice.projectgeneration.templates;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
import java.net.URL;
+import java.nio.file.Path;
+import java.nio.file.Paths;
import java.util.ResourceBundle;
-import java.util.Locale;
+import java.util.ArrayList;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.ice.projectgeneration.ICEProjectResources;
+import org.eclipse.ice.io.serializable.IReader;
+import org.eclipse.ice.io.serializable.IWriter;
+import org.eclipse.ice.projectgeneration.templates.ICEProjectResources;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.pde.core.plugin.IPluginBase;
import org.eclipse.pde.core.plugin.IPluginElement;
import org.eclipse.pde.core.plugin.IPluginExtension;
+import org.eclipse.pde.core.plugin.IPluginModelBase;
import org.eclipse.pde.core.plugin.IPluginModelFactory;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.IPluginFieldData;
import org.eclipse.pde.ui.templates.OptionTemplateSection;
+import org.eclipse.pde.ui.templates.TemplateOption;
/**
* Provides the information for the ICEItemWizard, the final page in the
@@ -37,14 +47,17 @@ import org.eclipse.pde.ui.templates.OptionTemplateSection;
*/
public class ICEItemTemplate extends OptionTemplateSection {
+ protected static final String EXTENSION_POINT = "org.eclipse.ice.item.itemBuilder";
protected static final String BUNDLE_ID = "org.eclipse.ice.projectgeneration";
- // Strings used for templating
- protected static final String EXTENSION_POINT = "org.eclipse.ice.item.itemBuilder";
+ // Replacement strings in template files. See the templates_x.x directory
+ // for the template files.
protected static final String KEY_CLASS_NAME = "className";
protected static final String KEY_EXTENSION_NAME = "packageName";
protected static final String KEY_JOB_LAUNCHER_EXT = "createJobLauncher";
protected static final String KEY_MODEL_EXT = "createModel";
+ protected static final String KEY_IO_FORMAT_EXT = "ioFormat";
+ protected static final String KEY_DEFAULT_FILE_NAME = "defaultFileName";
/**
* Constructor
@@ -56,10 +69,9 @@ public class ICEItemTemplate extends OptionTemplateSection {
/**
- * Add pages to the wizard
+ * Adds the page to the wizard.
*/
public void addPages(Wizard wizard) {
- // create one wizard page for the options
WizardPage p1 = createPage(0);
p1.setPageComplete(false);
p1.setTitle("New ICE Item Project");
@@ -75,52 +87,123 @@ public class ICEItemTemplate extends OptionTemplateSection {
addOption(KEY_CLASS_NAME , "Item Class Base Name" , "" , 0);
addOption(KEY_JOB_LAUNCHER_EXT, "Create Job Launcher?", true, 0);
addOption(KEY_MODEL_EXT, "Create Model?", true, 0);
+ addOption(KEY_IO_FORMAT_EXT, "File Format", getIOFormatOptions(), "", 0);
+ addDataOption(KEY_DEFAULT_FILE_NAME, "Choose a default dataset (leave blank for none):", "", 0);
}
- @Override
- protected URL getInstallURL() {
- return Platform.getBundle(BUNDLE_ID).getEntry("/");
- }
- @Override
- protected ResourceBundle getPluginResourceBundle() {
- return new ICEProjectResources();
- }
-
- @Override public String[] getNewFiles() { return new String[0]; }
- @Override public String getSectionId() { return "ICEItem"; }
- @Override public String getUsedExtensionPoint() { return EXTENSION_POINT; }
-
- public void setExtensionName(String extName) {
- addOption(KEY_EXTENSION_NAME, "Extension Base Name", extName, 0);
- }
-
- protected String getFormattedPackageName(String id) {
- StringBuffer buffer = new StringBuffer();
- for (int i = 0; i < id.length(); i++) {
- char ch = id.charAt(i);
- if (buffer.length() == 0) {
- if (Character.isJavaIdentifierStart(ch))
- buffer.append(Character.toLowerCase(ch));
- } else {
- if (Character.isJavaIdentifierPart(ch) || ch == '.')
- buffer.append(ch);
+ /**
+ * Determines the supported IO formats provided by ICE's IOService. These
+ * are used to provide the option for users to automatically use readers
+ * and writers for their new items.
+ *
+ * @return An array of 2 element arrays with the names of the supported IO formats
+ */
+ private String[][] getIOFormatOptions() {
+ ArrayList<String> readerTypes = new ArrayList<String>();
+ ArrayList<String> writerTypes = new ArrayList<String>();
+ try {
+ // Find readers
+ for (IReader reader : IReader.getIReaders()) {
+ readerTypes.add(reader.getReaderType());
}
+ // Find writers
+ for (IWriter writer : IWriter.getIWriters()) {
+ writerTypes.add(writer.getWriterType());
+ }
+ } catch (CoreException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ // Get IO formats that have both readers and writers
+ ArrayList<String[]> ioFormats = new ArrayList<String[]>();
+ for (String writer : writerTypes) {
+ if (readerTypes.contains(writer))
+ ioFormats.add(new String[] {writer, writer});
}
- return buffer.toString().toLowerCase(Locale.ENGLISH);
+ // Provide a blank option for those that will implement their own readers/writers
+ ioFormats.add(0, new String[] {"", ""});
+ String[][] options = new String[ioFormats.size()][2];
+ options = ioFormats.toArray(options);
+ return options;
}
+ /**
+ * Convert a camel case string to a capitalized title. Example:
+ * `camelCase` -> `Camel Case`
+ *
+ * @param s
+ * The string to convert
+ * @return the converted string
+ */
protected static String splitCamelCase(String s) {
return s.replaceAll(
- String.format("%s|%s|%s",
- "(?<=[A-Z])(?=[A-Z][a-z])",
- "(?<=[^A-Z])(?=[A-Z])",
- "(?<=[A-Za-z])(?=[^A-Za-z])"
- ),
- " "
- ).trim();
+ String.format("%s|%s|%s",
+ "(?<=[A-Z])(?=[A-Z][a-z])",
+ "(?<=[^A-Z])(?=[A-Z])",
+ "(?<=[A-Za-z])(?=[^A-Za-z])"
+ ),
+ " ").trim();
+ }
+
+ /**
+ * Extra code to run when the finish button is pressed. This handles
+ * the creation of the default dataset inside of the newly created plugin,
+ * if one is chosen to be used.
+ */
+ public void execute(IProject project, IPluginModelBase model, IProgressMonitor monitor) throws CoreException {
+ initializeFields(model);
+ super.execute(project, model, monitor);
+ Path filePath = Paths.get(getStringOption(KEY_DEFAULT_FILE_NAME));
+ if (filePath != null && filePath.toFile().exists()) {
+ String fileName = filePath.getFileName().toString();
+ if (project.exists() && !project.isOpen()) {
+ project.open(null);
+ }
+ IFolder dataFolder = project.getFolder("data");
+ if (!dataFolder.exists()) {
+ dataFolder.create(false, true, null);
+ }
+ IFile dataFile = dataFolder.getFile(fileName);
+ FileInputStream dataContents;
+ try {
+ dataContents = new FileInputStream(filePath.toString());
+ dataFile.create(dataContents, false, null);
+ } catch (FileNotFoundException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+ }
+
+
+ /**
+ * Adds a DataFileOption to the section.
+ *
+ * @param name
+ * The name of the variable that will be used in templating
+ * @param label
+ * A label to describe the option
+ * @param value
+ * The default value of the option
+ * @param pageIndex
+ * The page to put the option onto
+ * @return The data file option
+ */
+ protected TemplateOption addDataOption(String name, String label, String value, int pageIndex) {
+ DataFileOption option = new DataFileOption(this, name, label);
+ option.setValue(value);
+ registerOption(option, value, pageIndex);
+ return option;
}
+
+ /**
+ * Additional steps to perform when creating the plugin project. This handles
+ * creation of the extensions that are needed by the new item, including
+ * models and job launchers.
+ */
@Override
protected void updateModel(IProgressMonitor monitor) throws CoreException {
IPluginBase plugin;
@@ -160,4 +243,33 @@ public class ICEItemTemplate extends OptionTemplateSection {
plugin.add(extension);
}
}
+
+ @Override
+ protected URL getInstallURL() {
+ return Platform.getBundle(BUNDLE_ID).getEntry("/");
+ }
+
+ @Override
+ protected ResourceBundle getPluginResourceBundle() {
+ return new ICEProjectResources();
+ }
+
+ @Override
+ public String[] getNewFiles() {
+ return new String[0];
+ }
+
+ @Override
+ public String getSectionId() {
+ return "ICEItem";
+ }
+
+ @Override
+ public String getUsedExtensionPoint() {
+ return EXTENSION_POINT;
+ }
+
+ public void setExtensionName(String extName) {
+ addOption(KEY_EXTENSION_NAME, "Extension Base Name", extName, 0);
+ }
}
diff --git a/org.eclipse.ice.projectgeneration/templates_3.4/ICEItem/src/$className$Model.java b/org.eclipse.ice.projectgeneration/templates_3.4/ICEItem/src/$className$Model.java
index 4164fd89433d1f81e8f429601c14a219a5da1440..5486717da7a8b247257a654e2df252ce2a732c3d 100644
--- a/org.eclipse.ice.projectgeneration/templates_3.4/ICEItem/src/$className$Model.java
+++ b/org.eclipse.ice.projectgeneration/templates_3.4/ICEItem/src/$className$Model.java
@@ -1,5 +1,14 @@
package $packageName$.model;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.file.Paths;
+
import javax.xml.bind.annotation.XmlRootElement;
import org.eclipse.core.resources.IFile;
@@ -17,16 +26,12 @@ import org.eclipse.ice.io.serializable.IReader;
import org.eclipse.ice.io.serializable.IWriter;
import org.eclipse.ice.item.model.Model;
+
@XmlRootElement(name = "$className$Model")
public class $className$Model extends Model {
- // TODO:
- // These need to be filled in before using this item
- // They can be set in the setupItemInfo() method
- private String writerName;
- private String readerName;
+ private String ioFormat;
private String outputName;
- // End required variables
private String exportString;
private IIOService ioService;
@@ -57,11 +62,12 @@ public class $className$Model extends Model {
protected void setupItemInfo() {
setName("$className$ Model");
setDescription("Specify information about $className$");
- writerName = "$className$DefaultWriterName";
- readerName = "$className$DefaultReaderName";
outputName = "$className$DefaultOutputName";
exportString = "Export to $className$ input format";
allowedActions.add(0, exportString);
+ ioFormat = "$ioFormat$";
+ reader = ioService.getReader(ioFormat);
+ writer = ioService.getWriter(ioFormat);
}
/**
@@ -145,9 +151,7 @@ public class $className$Model extends Model {
// setupItemInfo() method defined above.
if (actionName == exportString) {
IFile outputFile = project.getFile(outputName);
- writer = ioService.getWriter(writerName);
retStatus = FormStatus.Processing;
- writer.write(form, outputFile);
refreshProjectSpace();
retStatus = FormStatus.Processed;
} else {
@@ -167,15 +171,57 @@ public class $className$Model extends Model {
*/
@Override
public void loadInput(String fileName) {
+ IFile inputFile = null;
+ File temp = null;
+ if (fileName == null) {
+ try {
+ // Create a filepath for the default file
+ fileName = Paths.get("$defaultFileName$").getFileName().toString();
+ if (fileName.isEmpty()) {
+ return;
+ }
+ String defaultFilePath = project.getLocation().toOSString()
+ + System.getProperty("file.separator")
+ + fileName;
+ // Create a temporary location to load the default file
+ temp = new File(defaultFilePath);
+ if (!temp.exists()) {
+ temp.createNewFile();
+ }
+
+ // Pull the default file from inside the plugin
+ URI uri = new URI(
+ "platform:/plugin/$packageName$/data/" + fileName);
+ InputStream reader = uri.toURL().openStream();
+ FileOutputStream outStream = new FileOutputStream(temp);
- // Read in the file and set up the form
- IFile inputFile = project.getFile(fileName);
- reader = ioService.getReader(readerName);
+ // Write out the default file from the plugin to the temp location
+ int fileByte;
+ while ((fileByte = reader.read()) != -1) {
+ outStream.write(fileByte);
+ }
+ outStream.close();
+ project.refreshLocal(IResource.DEPTH_INFINITE, null);
+ inputFile = project.getFile(fileName);
+
+ } catch (URISyntaxException e) {
+ logger.error(getClass().getName() + " Exception!",e);
+ } catch (MalformedURLException e) {
+ logger.error(getClass().getName() + " Exception!",e);
+ } catch (IOException e) {
+ logger.error(getClass().getName() + " Exception!",e);
+ } catch (CoreException e) {
+ logger.error(getClass().getName() + " Exception!",e);
+ }
+ } else {
+ // Get the file
+ inputFile = project.getFile(fileName);
+ }
+
form = reader.read(inputFile);
form.setName(getName());
form.setDescription(getDescription());
form.setId(getId());
form.setItemID(getId());
-
}
}
diff --git a/org.eclipse.ice.proteus/src/org/eclipse/ice/proteus/PROTEUSModel.java b/org.eclipse.ice.proteus/src/org/eclipse/ice/proteus/PROTEUSModel.java
index 6f3c9122f5a764820b4efc9f1125a2716eb8c437..b218a36c9d541f38cef12cd539943151f255d089 100644
--- a/org.eclipse.ice.proteus/src/org/eclipse/ice/proteus/PROTEUSModel.java
+++ b/org.eclipse.ice.proteus/src/org/eclipse/ice/proteus/PROTEUSModel.java
@@ -152,10 +152,10 @@ public class PROTEUSModel extends Item {
setIOService(new IOService());
ioService = getIOService();
}
- if (ioService.getTemplatedReader("INIReader") == null) {
+ if (ioService.getTemplatedReader("INI") == null) {
ioService.addTemplatedReader(new INIReader());
}
- if (ioService.getWriter("INIWriter") == null) {
+ if (ioService.getWriter("INI") == null) {
ioService.addWriter(new INIWriter());
}
@@ -217,7 +217,7 @@ public class PROTEUSModel extends Item {
if (components.size() > 0) {
// create a new IPSWriter with the output file
- INIWriter writer = (INIWriter) ioService.getWriter("INIWriter");
+ INIWriter writer = (INIWriter) ioService.getWriter("INI");
writer.setSectionPattern("!", " ");
try {
// Write the output file
@@ -273,7 +273,7 @@ public class PROTEUSModel extends Item {
+ inputFile.getLocation().toOSString());
// Set up the reader to use the template if it exists
- ITemplatedReader reader = ioService.getTemplatedReader("INIReader");
+ ITemplatedReader reader = ioService.getTemplatedReader("INI");
reader.setCommentString("!");
reader.setAssignmentPattern("\\s\\s\\s+");
if (new File(templateFile.getLocation().toOSString()).exists()) {
diff --git a/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/launcher/VibeLauncher.java b/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/launcher/VibeLauncher.java
index d33bb628ec06c2fc1448ebf17179fdc254b90263..177bbe669f263a06e9d5414fd5951c086b5b69dc 100644
--- a/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/launcher/VibeLauncher.java
+++ b/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/launcher/VibeLauncher.java
@@ -163,7 +163,7 @@ public class VibeLauncher extends JobLauncher {
@Override
public FormStatus process(String actionName) {
- IReader reader = (IReader) ioService.getReader("IPSReader");
+ IReader reader = (IReader) ioService.getReader("IPS");
DataComponent fileComponent = (DataComponent) form.getComponent(1);
IEntry inputFileEntry = fileComponent.retrieveEntry("Input File");
IEntry kvPairFileEntry = fileComponent.retrieveEntry("Use custom key-value pair file?");
diff --git a/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/model/VibeModel.java b/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/model/VibeModel.java
index d2fd8fc12e96d46d440c84897cbb9633f7820c31..f2b0d2c42ea1d89b131b60c30f1440f2ca1d17e9 100644
--- a/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/model/VibeModel.java
+++ b/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/model/VibeModel.java
@@ -177,7 +177,7 @@ public class VibeModel extends Model {
if (components.size() > 3) {
// create a new IPSWriter with the output file
- IWriter writer = (IWriter) ioService.getWriter("IPSWriter");
+ IWriter writer = (IWriter) ioService.getWriter("IPS");
try {
// Write the output file
writer.write(form, outputFile);
@@ -267,7 +267,7 @@ public class VibeModel extends Model {
// Load the components from the file and setup the form
logger.info("VibeModel Message: Loading " + inputFile.getName());
- IReader reader = (IReader) ioService.getReader("IPSReader"); //new IPSReader();
+ IReader reader = (IReader) ioService.getReader("IPS"); //new IPSReader();
form = reader.read(inputFile);
form.setName(getName());
form.setDescription(getDescription());