Commit 62000d16 authored by Jay Jay Billings's avatar Jay Jay Billings
Browse files

Merge branch 'jay/projectSupport' of https://github.com/eclipse/ice into jay/projectSupport

parents 4fcce4e6 114f8c97
......@@ -30,7 +30,15 @@ import itertools
import subprocess
if sys.version_info >= (3,0):
if sys.version_info < (2,7):
print("")
print("--------------------------- ERROR -----------------------------")
print(" Unsupported Python version: " + sys.version_info.major + "." + sys.version_info.minor)
print(" Please update to Python 2.7 or greater to use the installer.")
print("--------------------------- ERROR -----------------------------")
print("")
exit()
elif sys.version_info >= (3,0):
import urllib.request as urllib2
else:
import urllib2
......
......@@ -12,7 +12,7 @@
*******************************************************************************/
package org.eclipse.ice.parsergenerator.test;
import org.eclipse.ice.parsergenerator.antlr.ANTLRFlatGrammar;
import org.eclipse.ice.parsergenerator.grammars.FlatGrammar;
import org.junit.Test;
/**
......@@ -20,7 +20,7 @@ import org.junit.Test;
*
* @author Andrew Bennett
*/
public class ANTLRGrammarTester {
public class GrammarTester {
private String sep = java.lang.System.lineSeparator();
private String iniGrammar =
......@@ -57,7 +57,7 @@ public class ANTLRGrammarTester {
@Test
public void TestGrammar() {
ANTLRFlatGrammar g = new ANTLRFlatGrammar();
FlatGrammar g = new FlatGrammar();
g.setAssignmentOperator("=");
g.setCommentSymbol("#");
g.setSection("[", "]");
......
......@@ -3,88 +3,5 @@
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry exported="true" kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.item"/>
<classpathentry combineaccessrules="false" kind="src" path="/gov.lbnl.visit.swt"/>
<classpathentry combineaccessrules="false" kind="src" path="/ICEDocCleaner"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.analysistool"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.caebat.batml"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.caebat.batml.test"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.classifier"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.client"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.client.compatibility"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.client.rcp"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.client.test"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.client.widgets"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.client.widgets.moose"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.client.widgets.rcp"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.client.widgets.rcp.test"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.client.widgets.reactoreditor"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.client.widgets.reactoreditor.grid"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.client.widgets.reactoreditor.grid.test"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.client.widgets.reactoreditor.lwr"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.client.widgets.reactoreditor.lwr.test"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.client.widgets.reactoreditor.sfr"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.client.widgets.reactoreditor.sfr.test"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.client.widgets.reactoreditor.test"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.client.widgets.test"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.client.widgets.test.utils"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.core"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.core.jaxrs.test"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.core.test"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.datastructures"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.datastructures.test"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.dependencies"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.filesimulation"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.io"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.io.test"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.item.test"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.kdd"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.kdd.test"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.materials"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.materials.test"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.materials.ui"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.mesh"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.mesh.test"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.nek5000"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.nek5000.test"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.persistence.xml"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.persistence.xml.test"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.poly"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.proteus"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.proteus.test"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.reactor"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.reactor.perspective"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.reactor.plant"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.reactor.plant.test"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.reactor.sfr"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.reactor.sfr.test"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.reactor.test"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.reactorAnalyzer"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.reactorAnalyzer.test"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.reflectivity"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.reflectivity.test"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.reflectivity.ui"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.sassena"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.sassena.test"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.servicetester"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.tablecomponenttester"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.vibe"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.vibe.test"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.viz"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.viz.service"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.viz.service.geometry"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.viz.service.geometry.test"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.viz.service.jme3"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.viz.service.jme3.test"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.viz.service.mesh"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.viz.service.mesh.test"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.viz.service.paraview"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.viz.service.paraview.test"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.viz.service.paraview.web"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.viz.service.test"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.viz.service.visit"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.viz.service.visit.test"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.viz.test"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.xolotl"/>
<classpathentry kind="output" path="bin"/>
</classpath>
......@@ -10,6 +10,7 @@ Require-Bundle: org.eclipse.ui,
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.core.internal.resources,
org.eclipse.core.resources
org.eclipse.core.resources,
org.eclipse.ice.datastructures.form
Export-Package: org.eclipse.ice.parsergenerator,
org.eclipse.ice.parsergenerator.ebnf
org.eclipse.ice.parsergenerator.grammars
......@@ -12,14 +12,14 @@
*******************************************************************************/
package org.eclipse.ice.parsergenerator;
import org.eclipse.core.internal.resources.Project;
import org.eclipse.core.resources.IProject;
import org.eclipse.ice.datastructures.form.Form;
import org.eclipse.ice.datastructures.form.FormStatus;
import org.eclipse.ice.item.Item;
/**
* Description
* This is an Item that assembles parsers based on various quantities that are
* common to most text parsers and can be set by clients.
*
* @author Andrew Bennett
*/
......@@ -32,7 +32,6 @@ public class ParserGenerator extends Item {
return;
}
/**
* Constructor
*/
......@@ -40,7 +39,6 @@ public class ParserGenerator extends Item {
return;
}
/**
* <p>
* This operation overrides the Item.setupForm() operation.
......@@ -110,4 +108,3 @@ public class ParserGenerator extends Item {
}
}
......@@ -10,7 +10,7 @@
* Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson,
* Claire Saunders, Matthew Wang, Anna Wojtowicz
*******************************************************************************/
package org.eclipse.ice.parsergenerator.antlr;
package org.eclipse.ice.parsergenerator.grammars;
import java.util.function.BiFunction;
......@@ -21,7 +21,7 @@ import java.util.function.BiFunction;
*
* @author arbennett
*/
public class ANTLRFlatGrammar {
public class FlatGrammar {
private StringBuilder sb;
......@@ -47,7 +47,7 @@ public class ANTLRFlatGrammar {
private BiFunction<String, String, String> build = (k,v) -> (k + ":" + sep + " " + v + ";" + sep);
public ANTLRFlatGrammar() {
public FlatGrammar() {
sb = new StringBuilder();
}
......
......@@ -12,6 +12,29 @@
<groupId>ICE</groupId>
<artifactId>org.eclipse.ice.projectgeneration.test</artifactId>
<packaging>eclipse-test-plugin</packaging>
<build>
<plugins>
<!-- Configure the build to handle SWTBot -->
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<useUIHarness>true</useUIHarness>
<useUIThread>false</useUIThread>
<product>org.eclipse.sdk.ide</product>
<application>org.eclipse.ui.ide.workbench</application>
<dependencies>
<dependency>
<type>p2-installable-unit</type>
<artifactId>org.eclipse.sdk.feature.group</artifactId>
</dependency>
</dependencies>
</configuration>
</plugin>
</plugins>
</build>
<properties>
<sonar.skip>true</sonar.skip>
</properties>
......
......@@ -56,8 +56,6 @@ public class NewICEItemProjectTester {
private static final String VERSION = "1.0.0";
private static final String NAME = "Newitem";
private static final String INSTITUTE = "Oak Ridge National Laboratory";
private static final String EXTENSION_NAME = "org.eclipse.ice.newitem";
private static final String PACKAGE_NAME = "org.eclipse.ice.newitem";
private static final String CLASS_NAME = "NewItem";
/**
......@@ -75,10 +73,7 @@ public class NewICEItemProjectTester {
bot.button("Next >").click();
bot.comboBox().setText("Oak Ridge National Laborator");
bot.button("Next >").click();
bot.textWithLabel("Extension Base Name").setText("org.eclipse.ice.newitem");
bot.textWithLabel("Package Name").setText("org.eclipse.ice.newitem");
bot.textWithLabel("Class Base Name").setText("NewItem");
bot.button("Finish").click();
}
}
\ No newline at end of file
......@@ -15,6 +15,15 @@
name="ICE Item Project Creation Wizard">
</wizard>
</extension>
<extension
id="iceNature"
point="org.eclipse.core.resources.natures">
<runtime>
<run
class="org.eclipse.ice.projectgeneration.ICEItemNature">
</run>
</runtime>
</extension>
<extension
point="org.eclipse.pde.ui.templates">
<template
......
......@@ -23,7 +23,7 @@ import org.eclipse.core.runtime.CoreException;
*/
public class ICEItemNature implements IProjectNature {
public static final String NATURE_ID = "org.eclipse.ice.projectgeneration";
public static final String NATURE_ID = "org.eclipse.ice.projectgeneration.iceNature";
@Override
public void configure() throws CoreException {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment