Unverified Commit dd3d5f82 authored by Jay Jay Billings's avatar Jay Jay Billings Committed by GitHub
Browse files

Merge pull request #442 from dbluhm/reference-fixes

Fix references to IDataElement, etc. after move
parents 2294fe4d 03c06886
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<groupId>org.eclipse.ice</groupId> <groupId>org.eclipse.ice</groupId>
<artifactId>org.eclipse.ice.data</artifactId> <artifactId>org.eclipse.ice.data</artifactId>
<version>3.0-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>org.eclipse.ice.data</name> <name>org.eclipse.ice.data</name>
......
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
<groupId>org.eclipse.ice</groupId> <groupId>org.eclipse.ice</groupId>
<artifactId>org.eclipse.ice.data</artifactId> <artifactId>org.eclipse.ice.data</artifactId>
<version>3.0.0-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
<scope>provided</scope> <scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
package org.eclipse.ice.dev.annotations.processors; package org.eclipse.ice.dev.annotations.processors;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
......
...@@ -22,6 +22,8 @@ import lombok.NoArgsConstructor; ...@@ -22,6 +22,8 @@ import lombok.NoArgsConstructor;
import lombok.NonNull; import lombok.NonNull;
import lombok.Setter; import lombok.Setter;
import org.eclipse.ice.data.JavascriptValidator;
/** /**
* This is an implementation of $interface that satisfies the dependencies of * This is an implementation of $interface that satisfies the dependencies of
* the @DataElement Annotation and was auto-generated by the ICE Framework. * the @DataElement Annotation and was auto-generated by the ICE Framework.
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
package $package; package $package;
#end #end
import org.eclipse.ice.dev.annotations.IDataElement; import org.eclipse.ice.data.IDataElement;
/** /**
* This interface satisfies the dependencies of the @DataElement Annotation and * This interface satisfies the dependencies of the @DataElement Annotation and
......
...@@ -3,7 +3,7 @@ package $package; ...@@ -3,7 +3,7 @@ package $package;
#end #end
import org.bson.Document; import org.bson.Document;
import org.eclipse.ice.dev.annotations.IPersistenceHandler; import org.eclipse.ice.data.IPersistenceHandler;
import org.eclipse.ice.dev.annotations.PersistenceFilters; import org.eclipse.ice.dev.annotations.PersistenceFilters;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
......
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> {}
\ No newline at end of file
...@@ -18,5 +18,5 @@ public class TestImplementation implements Test, Serializable { ...@@ -18,5 +18,5 @@ public class TestImplementation implements Test, Serializable {
@NonNull protected java.lang.String context = "default"; @NonNull protected java.lang.String context = "default";
protected boolean required = false; protected boolean required = false;
protected boolean secret = false; protected boolean secret = false;
protected org.eclipse.ice.dev.annotations.JavascriptValidator<Test> validator; protected org.eclipse.ice.data.JavascriptValidator<Test> validator;
} }
\ 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 void setTest(int test); public void setTest(int test);
} }
\ 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 byte getTestByte(); public byte getTestByte();
public void setTestByte(byte testByte); public void setTestByte(byte testByte);
......
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);
......
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