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
......@@ -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>
......
......@@ -231,4 +231,11 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
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>
<?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>
<?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>
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
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
eclipse.preferences.version=1
pluginProject.extensions=true
resolve.requirebundle=false
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<installed facet="osgi.bundle" version="4.2"/>
</faceted-project>
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
<!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
output.. = bin/
bin.includes = META-INF/,\
.,\
build.properties,\
plugin.xml,\
plugin_customization.ini,\
about.html
source.. = src/
<?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.ui/defaultPerspectiveId=org.eclipse.ice.reflectivity.ReflectivityPerspective
\ No newline at end of file
<?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>
/*******************************************************************************
* 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
*
* 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, Kasper Gammeltoft, Robert Smith
*******************************************************************************/
package org.eclipse.ice.geometry;
import org.eclipse.ice.client.widgets.EclipseFormWidget;
import org.eclipse.ice.client.widgets.ICEFormEditor;
import org.eclipse.ice.client.widgets.ICEFormInput;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
/**
* A widget which will display a GeometryFormEditor.
*
* @author Kasper Gammeltoft, Jordan H. Deyton, Robert Smith
*
*/
public class GeometryEclipseFormWidget extends EclipseFormWidget {
/**
* The default constructor.
*/
public GeometryEclipseFormWidget() {
}
/**
* This operation displays the {@link ReflectivityFormEditor} instead of the
* standard ICEFormEditor.
*/
@Override
public void display() {
// Local Declarations
IWorkbenchPage page = PlatformUI.getWorkbench()
.getActiveWorkbenchWindow().getActivePage();
// Create the ICEFormInput for the ReflectivityFormBuilder.
ICEFormInput = new ICEFormInput(widgetForm);
try {
// Use the workbench to open the editor with our input.
IEditorPart formEditor = page.openEditor(ICEFormInput,
GeometryFormEditor.ID);
// Set this editor reference so that listeners can be registered
// later.
ICEFormEditor = (ICEFormEditor) formEditor;
} catch (PartInitException e) {
// Dump the stacktrace if something happens.
e.printStackTrace();
}
return;
}
}
/*******************************************************************************
* Copyright (c) 2017 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 - Robert Smith
*******************************************************************************/
package org.eclipse.ice.geometry;
import java.util.Iterator;
import java.util.List;
import org.eclipse.eavp.geometry.view.model.IRenderElement;
import org.eclipse.eavp.viz.service.geometry.widgets.ShapeTreeView;
import org.eclipse.ice.client.widgets.ICEFormEditor;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.ITreeSelection;
import org.eclipse.jface.viewers.TreePath;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.forms.IManagedForm;
import org.eclipse.ui.views.properties.IPropertySheetPage;
import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;
import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
/**
* A custom form editor for the Geometry Editor item, which will have custom
* tabbed properties.
*
* @author Robert Smith
*
*/
public class GeometryFormEditor extends ICEFormEditor
implements ITabbedPropertySheetPageContributor {
/**
* The ID for use in the extension point.
*/
public static final String ID = "org.eclipse.ice.client.widgets.geometry.GeometryFormEditor";
/**
* The constructor.
*/
public GeometryFormEditor() {
super();
}
/*
* (non-Javadoc)
*
* @see org.eclipse.ui.part.MultiPageEditorPart#getAdapter(java.lang.Class)
*/
@Override
public Object getAdapter(Class adapter) {
// Give the TabbedPropertySheetPage for the IPropertySheetPage
if (adapter == IPropertySheetPage.class) {
return new TabbedPropertySheetPage(this);
}
// Otherwise delegate to the superclass
else {
return super.getAdapter(adapter);
}
}
/*
* (non-Javadoc)
*
* @see org.eclipse.ui.views.properties.tabbed.
* ITabbedPropertySheetPageContributor#getContributorId()
*/
@Override
public String getContributorId() {
return getSite().getId();
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.ice.client.widgets.ICEFormEditor#createHeaderContents(org.
* eclipse.ui.forms.IManagedForm)
*/
@Override
protected void createHeaderContents(IManagedForm headerForm) {
super.createHeaderContents(headerForm);
// Create a Selection Provider for this part
getSite().setSelectionProvider(new ISelectionProvider() {
@Override
public void addSelectionChangedListener(
ISelectionChangedListener listener) {
// TODO Auto-generated method stub
}
@Override
public ISelection getSelection() {
// Pull the currently selected shapes from the ShapeTreeView, so
// that the tree view and the geometry editor's selections are
// always in synch
List<IRenderElement> selection = ((ShapeTreeView) PlatformUI
.getWorkbench().getActiveWorkbenchWindow()
.getActivePage().findView(ShapeTreeView.ID))
.getSelectedElements();
// Create a new selection
return new ITreeSelection() {
@Override
public Object getFirstElement() {
if (selection.isEmpty()) {
return null;
} else {
return selection.get(0);
}
}
@Override
public Iterator iterator() {
return selection.iterator();
}
@Override
public int size() {
return selection.size();
}
@Override
public Object[] toArray() {
return selection.toArray();
}
@Override
public List toList() {
return selection;
}
@Override
public boolean isEmpty() {
return selection.isEmpty();
}
@Override
public TreePath[] getPaths() {
TreePath[] paths = new TreePath[selection.size()];
for (int i = 0; i < selection.size(); i++) {
paths[i] = new TreePath(
new IRenderElement[] { selection.get(i) });
}
return paths;
}
@Override
public TreePath[] getPathsFor(Object element) {
return new TreePath[] {
new TreePath(new IRenderElement[] { selection
.get(selection.indexOf(element)) }) };
}
};
}
@Override
public void removeSelectionChangedListener(
ISelectionChangedListener listener) {
// TODO Auto-generated method stub
}
@Override
public void setSelection(ISelection selection) {
// TODO Auto-generated method stub
}
});
}
}
/*******************************************************************************
* Copyright (c) 2017 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, Kasper Gammeltoft
*******************************************************************************/
package org.eclipse.ice.geometry;
import org.eclipse.ice.client.widgets.IFormWidgetBuilder;
import org.eclipse.ice.iclient.uiwidgets.IFormWidget;
/**
* This class provides the declarative service that registers the Geometry
* FormEditor Widget with ICE's service for dynamically extending the widget
* factory. This lets us tailor the standard ICEFormEditor behavior for Geometry
* Editor Builders.
*
* @author Kasper Gammeltoft, Jordan H. Deyton, Robert Smith
*
*/
public class GeometryFormWidgetBuilder implements IFormWidgetBuilder {
/**
* The name of the items/forms used to create {@link ReflectivityFormEditor}
* s. This should be the same as the name in the ReflectivityModel item
* class.
*/
public static final String name = "Geometry Editor";
/*
* (non-Javadoc)
*
* @see org.eclipse.ice.client.widgets.IFormWidgetBuilder#getTargetFormName
* ()
*/
@Override
public String getTargetFormName() {
return name;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.ice.client.widgets.IFormWidgetBuilder#build()
*/
@Override
public IFormWidget build() {
return new GeometryEclipseFormWidget();
}
}
......@@ -31,7 +31,6 @@
startupForegroundColor="FFFFFF" />
<launcher name="ICE">
<macosx icon="/icons/ice_logo_runtime.icns"/>
<solaris/>
<win useIco="false">
<bmp/>
</win>
......@@ -131,7 +130,6 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
<feature id="org.eclipse.ease.ui.feature"/>
<feature id="org.eclipse.epp.mpc"/>
<feature id="org.eclipse.remote"/>
<feature id="org.eclipse.remote.proxy"/>
<feature id="org.eclipse.pde"/>
<feature id="org.eclipse.ptp"/>
<feature id="org.eclipse.ptp.core"/>
......@@ -239,6 +237,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
<plugin id="org.eclipse.ice.datastructures" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.ice.developer" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.ice.developer.moose" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.ice.geometry" autoStart="false" startLevel="0" />
<plugin id="org.eclipse.ice.io" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.ice.item" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.ice.materials" autoStart="true" startLevel="0" />
......
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