Due to newest packages.

This commit is contained in:
Fabian Märki
2015-11-27 11:44:15 +01:00
parent 763c12a96b
commit aa907f6856
2 changed files with 4 additions and 9 deletions

View File

@ -1,9 +1,5 @@
#
<<<<<<< HEAD
#Thu Oct 29 09:13:22 CET 2015
=======
#Wed Oct 28 12:53:12 CET 2015
>>>>>>> refs/heads/master
#Fri Nov 27 11:43:12 CET 2015
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

View File

@ -9,8 +9,6 @@ import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.commons.lang.NotImplementedException;
import ch.psi.daq.cassandra.reader.CassandraReader;
import ch.psi.daq.cassandra.reader.query.PulseIdRangeQuery;
import ch.psi.daq.cassandra.reader.query.TimeRangeQuery;
@ -111,9 +109,10 @@ public class DummyCassandraReader implements CassandraReader {
if (ceq instanceof ChannelEventQueryInfo) {
result.add(getEvent((ChannelEventQueryInfo) ceq));
} else {
throw new NotImplementedException("This is not yet implemented!");
throw new UnsupportedOperationException("This is not yet implemented!");
}
});
return result.stream();
}
/**
@ -193,7 +192,7 @@ public class DummyCassandraReader implements CassandraReader {
*/
@Override
public CompletableFuture<ChannelEvent> getEventAsync(ChannelEventQueryInfo queryInfo, String... columns) {
throw new NotImplementedException();
throw new UnsupportedOperationException();
}
/**