Unverified Commit ff18c728 authored by Gregory Cage's avatar Gregory Cage Committed by GitHub
Browse files

Merge pull request #3 from eclipse/next

Next
parents 1ae7dae1 dd3d5f82
import org.eclipse.ice.dev.annotations.IDataElement; import org.eclipse.ice.data.IDataElement;
public interface Test extends IDataElement<Test> { public interface Test extends IDataElement<Test> {
public java.util.UUID getTestUuid(); public java.util.UUID getTestUuid();
public void setTestUuid(java.util.UUID testUuid); public void setTestUuid(java.util.UUID testUuid);
......
import org.eclipse.ice.dev.annotations.IDataElement; import org.eclipse.ice.data.IDataElement;
public interface Test extends IDataElement<Test> { public interface Test extends IDataElement<Test> {
public int getTest(); public int getTest();
} }
\ No newline at end of file
import org.eclipse.ice.dev.annotations.IDataElement; import org.eclipse.ice.data.IDataElement;
public interface Test extends IDataElement<Test> { public interface Test extends IDataElement<Test> {
public int getTestInt(); public int getTestInt();
public void setTestInt(int testInt); public void setTestInt(int testInt);
......
import org.eclipse.ice.dev.annotations.IDataElement; import org.eclipse.ice.data.IDataElement;
public interface Test extends IDataElement<Test> { public interface Test extends IDataElement<Test> {
public java.util.UUID getTestUuid(); public java.util.UUID getTestUuid();
public void setTestUuid(java.util.UUID testUuid); public void setTestUuid(java.util.UUID testUuid);
......
import org.eclipse.ice.dev.annotations.IDataElement;
public interface Test extends IDataElement<Test> {}
\ No newline at end of file
public class TestPersistenceHandler implements IPersistenceHandler<Test> {
private final static String COLLECTION = "test";
}
\ No newline at end of file
...@@ -55,6 +55,12 @@ ...@@ -55,6 +55,12 @@
<artifactId>dagger</artifactId> <artifactId>dagger</artifactId>
<version>2.16</version> <version>2.16</version>
</dependency> </dependency>
<dependency>
<groupId>org.eclipse.ice</groupId>
<artifactId>org.eclipse.ice.data</artifactId>
<version>3.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>org.eclipse.ice.dev</groupId> <groupId>org.eclipse.ice.dev</groupId>
<artifactId>org.eclipse.ice.dev.annotations</artifactId> <artifactId>org.eclipse.ice.dev.annotations</artifactId>
......
...@@ -15,7 +15,7 @@ import java.io.Serializable; ...@@ -15,7 +15,7 @@ import java.io.Serializable;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
import javax.inject.Inject; import javax.inject.Inject;
import org.eclipse.ice.dev.annotations.IDataElement; import org.eclipse.ice.data.IDataElement;
/** /**
* This class is a basic controller that connects data and UI classes in a * This class is a basic controller that connects data and UI classes in a
......
...@@ -13,7 +13,7 @@ package org.eclipse.ice.tests.renderer; ...@@ -13,7 +13,7 @@ package org.eclipse.ice.tests.renderer;
import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.Assertions.*;
import org.eclipse.ice.dev.annotations.JavascriptValidator; import org.eclipse.ice.data.JavascriptValidator;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
/** /**
......
...@@ -137,6 +137,12 @@ ...@@ -137,6 +137,12 @@
<artifactId>vaadin-testbench</artifactId> <artifactId>vaadin-testbench</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.eclipse.ice</groupId>
<artifactId>org.eclipse.ice.data</artifactId>
<version>3.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>org.eclipse.ice</groupId> <groupId>org.eclipse.ice</groupId>
<artifactId>org.eclipse.ice.renderer</artifactId> <artifactId>org.eclipse.ice.renderer</artifactId>
......
...@@ -13,7 +13,7 @@ package gov.ornl.rse.renderer.client.test; ...@@ -13,7 +13,7 @@ package gov.ornl.rse.renderer.client.test;
import java.io.Serializable; import java.io.Serializable;
import org.eclipse.ice.dev.annotations.IDataElement; import org.eclipse.ice.data.IDataElement;
import org.eclipse.ice.renderer.DataElement; import org.eclipse.ice.renderer.DataElement;
public interface IRendererClient<T extends IDataElement> { public interface IRendererClient<T extends IDataElement> {
......
...@@ -16,7 +16,7 @@ import java.util.function.BiConsumer; ...@@ -16,7 +16,7 @@ import java.util.function.BiConsumer;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import javax.inject.Inject; import javax.inject.Inject;
import org.eclipse.ice.dev.annotations.IDataElement; import org.eclipse.ice.data.IDataElement;
import org.eclipse.ice.renderer.DataElement; import org.eclipse.ice.renderer.DataElement;
import org.eclipse.ice.renderer.JavascriptValidator; import org.eclipse.ice.renderer.JavascriptValidator;
import org.eclipse.ice.renderer.Renderer; import org.eclipse.ice.renderer.Renderer;
......
...@@ -16,7 +16,7 @@ package gov.ornl.rse.renderer.client.test; ...@@ -16,7 +16,7 @@ package gov.ornl.rse.renderer.client.test;
import java.io.Serializable; import java.io.Serializable;
import org.eclipse.ice.dev.annotations.IDataElement; import org.eclipse.ice.data.IDataElement;
import org.eclipse.ice.renderer.DataElement; import org.eclipse.ice.renderer.DataElement;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
......
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