Skip to content

GitLab

Commit aeeb4c30 authored by Robert Smith's avatar Robert Smith
Browse files

Merge remote-tracking branch 'origin/2.2.2' into next 

Conflicts:
	org.eclipse.ice.product/ice.runtime.product
	org.eclipse.ice.product/ice.sdk.product
parents 2974a4b7 35265247
Expand all Hide whitespace changes
Inline Side-by-side
org.eclipse.ice.aggregator/pom.xml
View file @ aeeb4c30
......@@ -29,6 +29,7 @@
<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.tests.io</module>
<module>../org.eclipse.ice.item</module>
......
org.eclipse.ice.feature/feature.xml
View file @ aeeb4c30
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.ice"
label="ICE Infrastructure Feature"
version="2.2.0.qualifier"
provider-name="Oak Ridge National Laboratory"
plugin="org.eclipse.ice.client.rcp"
os="linux,macosx,win32"
ws="cocoa,gtk,win32"
arch="x86,x86_64">
<description url="http://www.eclipse.org/ice">
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.ice"
label="ICE Infrastructure Feature"
version="2.2.0.qualifier"
provider-name="Oak Ridge National Laboratory"
plugin="org.eclipse.ice.client.rcp"
os="linux,macosx,win32"
ws="cocoa,gtk,win32"
arch="x86,x86_64">
<description url="http://www.eclipse.org/ice">
This feature describes all of the infrastructure components available
in the Eclipse Integrated Computational Environment.
</description>
<copyright url="http://www.eclipse.org/ice">
in the Eclipse Integrated Computational Environment.
</description>
<copyright url="http://www.eclipse.org/ice">
Copyright (c) 2011, 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
</copyright>
<license url="http://projects.eclipse.org/projects/technology.ice">
v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
</copyright>
<license url="http://projects.eclipse.org/projects/technology.ice">
Eclipse Foundation Software User Agreement
July 1, 2014
......@@ -74,161 +74,168 @@ Cryptography
Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check the country&apos;s laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted.
Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, or countries, or both.
</license>
<plugin
id="org.eclipse.ice.caebat.batml"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ice.client"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ice.client.compatibility"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ice.client.widgets"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ice.client.widgets.moose"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ice.core"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ice.datastructures"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ice.io"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ice.item"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ice.mesh"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ice.nek5000"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ice.persistence.xml"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ice.proteus"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ice.reactor.plant"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ice.vibe"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ice.developer"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ice.developer.moose"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ice.projectgeneration"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ice.client.rcp"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.spotify.docker-client.shaded"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="bcpkix"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="bcprov"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>
Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, or countries, or both.
</license>
<plugin
id="org.eclipse.ice.caebat.batml"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ice.client"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ice.client.compatibility"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ice.client.widgets"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ice.client.widgets.moose"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ice.core"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ice.datastructures"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ice.io"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ice.item"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ice.mesh"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ice.nek5000"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ice.persistence.xml"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ice.proteus"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ice.reactor.plant"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ice.vibe"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ice.developer"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ice.developer.moose"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ice.projectgeneration"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ice.client.rcp"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.spotify.docker-client.shaded"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="bcpkix"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="bcprov"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ice.geometry"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>
org.eclipse.ice.geometry/.classpath 0 → 100644
View file @ aeeb4c30
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
org.eclipse.ice.geometry/.project 0 → 100644
View file @ aeeb4c30
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.ice.geometry</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ds.core.builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
</natures>
</projectDescription>
org.eclipse.ice.geometry/.settings/org.eclipse.jdt.core.prefs 0 → 100644
View file @ aeeb4c30
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.ice.geometry/.settings/org.eclipse.m2e.core.prefs 0 → 100644
View file @ aeeb4c30
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
org.eclipse.ice.geometry/.settings/org.eclipse.pde.core.prefs 0 → 100644
View file @ aeeb4c30
eclipse.preferences.version=1
pluginProject.extensions=true
resolve.requirebundle=false
org.eclipse.ice.geometry/.settings/org.eclipse.wst.common.project.facet.core.xml 0 → 100644
View file @ aeeb4c30
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<installed facet="osgi.bundle" version="4.2"/>
</faceted-project>
org.eclipse.ice.geometry/META-INF/MANIFEST.MF 0 → 100644
View file @ aeeb4c30
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Geometry Form
Bundle-SymbolicName: org.eclipse.ice.geometry;singleton:=true
Bundle-Version: 2.2.0.qualifier
Bundle-Vendor: Oak Ridge National Laboratory
Require-Bundle: org.eclipse.ice.datastructures,
org.eclipse.ice.client.compatibility,
org.eclipse.swt,
org.eclipse.core.resources;bundle-version="3.10.0",
org.eclipse.core.runtime;bundle-version="3.11.0",
org.eclipse.eavp.viz.service.geometry;bundle-version="0.1.1"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: org.eclipse.core.runtime;version="3.5.0",
org.eclipse.eavp.geometry.view.model,
org.eclipse.eavp.viz.service,
org.eclipse.eavp.viz.service.geometry.widgets,
org.eclipse.ice.client.widgets,
org.eclipse.ice.iclient,
org.eclipse.ice.iclient.uiwidgets,
org.eclipse.ice.persistence.xml,
org.eclipse.ice.reflectivity,
org.eclipse.nebula.widgets.nattable;version="1.3.0",
org.eclipse.nebula.widgets.nattable.coordinate;version="1.3.0",
org.eclipse.nebula.widgets.nattable.selection;version="1.3.0",
org.eclipse.swt.widgets,
org.eclipse.ui,
org.eclipse.ui.forms.editor,
org.eclipse.ui.internal.views.properties.tabbed.view,
org.eclipse.ui.views.properties.tabbed,
org.slf4j;version="1.7.2"
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.ice.geometry
org.eclipse.ice.geometry/about.html 0 → 100644
View file @ aeeb4c30
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
<title>About</title>
</head>
<body lang="EN-US">
<h2>About This Content</h2>
<p>July 1, 2014</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
apply to your use of any object code in the Content. Check the Redistributor's license that was
provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
indicated below, the terms and conditions of the EPL still apply to any source code in the Content
and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
</body>
</html>
\ No newline at end of file
org.eclipse.ice.geometry/build.properties 0 → 100644
View file @ aeeb4c30
output.. = bin/
bin.includes = META-INF/,\
.,\
build.properties,\
plugin.xml,\
plugin_customization.ini,\
about.html
source.. = src/
org.eclipse.ice.geometry/plugin.xml 0 → 100644
View file @ aeeb4c30
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<plugin>
<!--Custom Geometry Properties View-->
<extension
point="org.eclipse.ui.views.properties.tabbed.propertyContributor">
<propertyContributor
contributorId="org.eclipse.ice.client.widgets.geometry.GeometryFormEditor"
tabDescriptorProvider="org.eclipse.eavp.viz.service.geometry.properties.ShapeTabDescriptorProvider">
<propertyCategory
category="Reflectivity"></propertyCategory>
</propertyContributor>
</extension>
<extension
id="geometryformwidgetbuilder"
name="Geometry Form Widget Builder"
point="org.eclipse.ice.client.widgets.iformwidgetbuilder">
<implementation
class="org.eclipse.ice.geometry.GeometryFormWidgetBuilder">
</implementation>
</extension>
<extension
id="org.eclipse.ice.client.widgets.GeometryEditors"
point="org.eclipse.ui.editors">
<editor
class="org.eclipse.ice.geometry.GeometryFormEditor"
default="false"
extensions="xml"
id="org.eclipse.ice.geometry.GeometryFormEditor"
name="Geometry Editor">
<contentTypeBinding
contentTypeId="org.eclipse.ice.reflectivity.ui.xml.contentType.Form">
</contentTypeBinding>
</editor>
</extension>
<extension
point="org.eclipse.ui.editors">
<editor
class="org.eclipse.ice.geometry.GeometryFormEditor"
default="false"
id="org.eclipse.ice.client.widgets.geometry.GeometryFormEditor"
name="GeometryEditor">
</editor>
</extension>
<extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor">
<propertyContributor
contributorId="org.eclipse.ice.reflectivity.ui.GeometryFormEditor"
tabDescriptorProvider="org.eclipse.eavp.viz.service.geometry.properties.ShapeTabDescriptorProvider">
<propertyCategory category="GeometrySelection"/>
</propertyContributor>
</extension>
</plugin>
org.eclipse.ice.geometry/plugin_customization.ini 0 → 100644
View file @ aeeb4c30
org.eclipse.ui/defaultPerspectiveId=org.eclipse.ice.reflectivity.ReflectivityPerspective
\ No newline at end of file
org.eclipse.ice.geometry/pom.xml 0 → 100644
View file @ aeeb4c30
<?xml version="1.0" encoding="UTF-8"?>
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.eclipse.ice</groupId>
<artifactId>org.eclipse.ice.build</artifactId>
<relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
<version>2.2.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.ice</groupId>
<artifactId>org.eclipse.ice.geometry</artifactId>
<version>2.2.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
org.eclipse.ice.geometry/src/org/eclipse/ice/geometry/GeometryEclipseFormWidget.java 0 → 100644
View file @ aeeb4c30
/*******************************************************************************
* Copyright (c) 2015 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
*