conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
import net.imagej.ops.special.UnaryComputerOp;
import net.imglib2.IterableInterval;
import net.imglib2.RandomAccessibleInterval;
=======
import net.imagej.ops.special.computer.UnaryComputerOp;
>>>>>>>
import net.imagej.ops.special.computer.UnaryComputerOp;
import net.imglib2.IterableInterval;
import net.imglib2.RandomAccessibleInterval; |
<<<<<<<
import org.deegree.geometry.Envelope;
import org.deegree.geometry.Geometry;
=======
import org.deegree.filter.expression.ValueReference;
>>>>>>>
import org.deegree.filter.expression.ValueReference;
import org.deegree.geometry.Envelope;
import org.deegree.geometry.Geometry;
<<<<<<<
private ICRS determineDefaultCrs( Insert insert, List<ICRS> queryCRS )
throws OWSException {
String srsName = insert.getSrsName();
if ( srsName != null ) {
try {
ICRS defaultCrs = CRSManager.lookup( insert.getSrsName() );
if ( !isCrsSupported( defaultCrs, queryCRS ) ) {
String msg = "The value of the srsName parameter is not one of the SRS values the server claims to support in its capabilities document.";
throw new OWSException( msg, INVALID_PARAMETER_VALUE, "srsName" );
}
return defaultCrs;
} catch ( UnknownCRSException e ) {
String msg = "Cannot perform insert. Specified srsName '" + srsName + "' is not supported by this WFS.";
throw new OWSException( msg, INVALID_PARAMETER_VALUE, "srsName" );
}
}
return null;
}
private void evaluateSrsNameForFeatureCollection( FeatureCollection fc, List<ICRS> queryCRS, String handle )
throws OWSException {
for ( Feature feature : fc )
evaluateSrsNameForFeature( feature, queryCRS, handle );
}
private void evaluateSrsNameForFeature( Feature feature, List<ICRS> queryCRS, String handle )
throws OWSException {
Set<Geometry> geometries = new LinkedHashSet<Geometry>();
findFeaturesAndGeometries( feature, geometries, new LinkedHashSet<Feature>(), new LinkedHashSet<String>(),
new LinkedHashSet<String>() );
for ( Geometry geometry : geometries ) {
ICRS crs = geometry.getCoordinateSystem();
evaluateSrsName( crs, queryCRS, handle );
evaluateValidDomain( crs, geometry, handle );
}
}
private void evaluateSrsName( ICRS crs, List<ICRS> supportedCrs, String handle )
throws OWSException {
if ( !isCrsSupported( crs, supportedCrs ) ) {
String message = "The value of the at least one geometrie srs is not one of the SRS values "
+ "the server claims to support in its capabilities document.";
if ( handle == null || "".equals( handle ) )
handle = "Transaction";
throw new OWSException( message, OWSException.OPERATION_PROCESSING_FAILED, handle );
}
}
private void evaluateValidDomain( ICRS crs, Geometry geometry, String handle )
throws OWSException {
double[] validDomain = crs.getValidDomain();
if ( validDomain == null ) {
LOG.warn( "Valid domain of crs {} is not available. Check if geometry is inside the valid "
+ "domain not possible. The check is skipped and insert processed.", crs.getAlias() );
return;
}
Envelope validDomainBbox = GEOM_FACTORY.createEnvelope( validDomain[0], validDomain[1], validDomain[2],
validDomain[3], crs );
if ( !geometry.isWithin( validDomainBbox ) ) {
String message = "At least one geometry is not in the valid domain of the srs.";
if ( handle == null || "".equals( handle ) )
handle = "Transaction";
throw new OWSException( message, OWSException.OPERATION_PROCESSING_FAILED, handle );
}
}
private boolean isCrsSupported( ICRS crs, List<ICRS> supportedCrs )
throws OWSException {
if ( crs != null && supportedCrs != null )
if ( !supportedCrs.contains( crs ) )
return false;
return true;
}
=======
private String determineNamespaceUri( ValueReference valueReference, FeatureType ft, NameStep namestep ) {
String prefix = namestep.getPrefix();
if ( prefix != null && !"".equals( prefix ) ) {
String namespaceUriByPrefix = valueReference.getNsContext().getNamespaceURI( prefix );
if ( namespaceUriByPrefix != null && !"".equals( namespaceUriByPrefix ) )
return namespaceUriByPrefix;
}
return ft.getName().getNamespaceURI();
}
>>>>>>>
private String determineNamespaceUri( ValueReference valueReference, FeatureType ft, NameStep namestep ) {
String prefix = namestep.getPrefix();
if ( prefix != null && !"".equals( prefix ) ) {
String namespaceUriByPrefix = valueReference.getNsContext().getNamespaceURI( prefix );
if ( namespaceUriByPrefix != null && !"".equals( namespaceUriByPrefix ) )
return namespaceUriByPrefix;
}
return ft.getName().getNamespaceURI();
}
private ICRS determineDefaultCrs( Insert insert, List<ICRS> queryCRS )
throws OWSException {
String srsName = insert.getSrsName();
if ( srsName != null ) {
try {
ICRS defaultCrs = CRSManager.lookup( insert.getSrsName() );
if ( !isCrsSupported( defaultCrs, queryCRS ) ) {
String msg = "The value of the srsName parameter is not one of the SRS values the server claims to support in its capabilities document.";
throw new OWSException( msg, INVALID_PARAMETER_VALUE, "srsName" );
}
return defaultCrs;
} catch ( UnknownCRSException e ) {
String msg = "Cannot perform insert. Specified srsName '" + srsName + "' is not supported by this WFS.";
throw new OWSException( msg, INVALID_PARAMETER_VALUE, "srsName" );
}
}
return null;
}
private void evaluateSrsNameForFeatureCollection( FeatureCollection fc, List<ICRS> queryCRS, String handle )
throws OWSException {
for ( Feature feature : fc )
evaluateSrsNameForFeature( feature, queryCRS, handle );
}
private void evaluateSrsNameForFeature( Feature feature, List<ICRS> queryCRS, String handle )
throws OWSException {
Set<Geometry> geometries = new LinkedHashSet<Geometry>();
findFeaturesAndGeometries( feature, geometries, new LinkedHashSet<Feature>(), new LinkedHashSet<String>(),
new LinkedHashSet<String>() );
for ( Geometry geometry : geometries ) {
ICRS crs = geometry.getCoordinateSystem();
evaluateSrsName( crs, queryCRS, handle );
evaluateValidDomain( crs, geometry, handle );
}
}
private void evaluateSrsName( ICRS crs, List<ICRS> supportedCrs, String handle )
throws OWSException {
if ( !isCrsSupported( crs, supportedCrs ) ) {
String message = "The value of the at least one geometrie srs is not one of the SRS values "
+ "the server claims to support in its capabilities document.";
if ( handle == null || "".equals( handle ) )
handle = "Transaction";
throw new OWSException( message, OWSException.OPERATION_PROCESSING_FAILED, handle );
}
}
private void evaluateValidDomain( ICRS crs, Geometry geometry, String handle )
throws OWSException {
double[] validDomain = crs.getValidDomain();
if ( validDomain == null ) {
LOG.warn( "Valid domain of crs {} is not available. Check if geometry is inside the valid "
+ "domain not possible. The check is skipped and insert processed.", crs.getAlias() );
return;
}
Envelope validDomainBbox = GEOM_FACTORY.createEnvelope( validDomain[0], validDomain[1], validDomain[2],
validDomain[3], crs );
if ( !geometry.isWithin( validDomainBbox ) ) {
String message = "At least one geometry is not in the valid domain of the srs.";
if ( handle == null || "".equals( handle ) )
handle = "Transaction";
throw new OWSException( message, OWSException.OPERATION_PROCESSING_FAILED, handle );
}
}
private boolean isCrsSupported( ICRS crs, List<ICRS> supportedCrs )
throws OWSException {
if ( crs != null && supportedCrs != null )
if ( !supportedCrs.contains( crs ) )
return false;
return true;
} |
<<<<<<<
import static org.deegree.commons.ows.exception.OWSException.LOCK_HAS_EXPIRED;
=======
import static org.apache.http.HttpStatus.SC_BAD_REQUEST;
import static org.apache.http.HttpStatus.SC_FORBIDDEN;
import static org.apache.http.HttpStatus.SC_INTERNAL_SERVER_ERROR;
import static org.apache.http.HttpStatus.SC_NOT_FOUND;
import static org.deegree.commons.ows.exception.OWSException.NOT_FOUND;
>>>>>>>
import static org.deegree.commons.ows.exception.OWSException.LOCK_HAS_EXPIRED;
import static org.apache.http.HttpStatus.SC_BAD_REQUEST;
import static org.apache.http.HttpStatus.SC_FORBIDDEN;
import static org.apache.http.HttpStatus.SC_INTERNAL_SERVER_ERROR;
import static org.apache.http.HttpStatus.SC_NOT_FOUND;
import static org.deegree.commons.ows.exception.OWSException.NOT_FOUND;
<<<<<<<
response.setStatus( 403 );
} else if ( LOCK_HAS_EXPIRED.equals( exception.getExceptionCode() ) ) {
response.setStatus( 403 );
=======
response.setStatus( SC_FORBIDDEN );
>>>>>>>
response.setStatus( SC_FORBIDDEN );
} else if ( LOCK_HAS_EXPIRED.equals( exception.getExceptionCode() ) ) {
response.setStatus( SC_FORBIDDEN ); |
<<<<<<<
new TransactionHandler( this, service, transaction, idGenMode ).doTransaction( response, queryCRS );
=======
new TransactionHandler( this, service, transaction, idGenMode, allowFeatureReferencesToDatastore ).doTransaction( response );
>>>>>>>
new TransactionHandler( this, service, transaction, idGenMode, allowFeatureReferencesToDatastore ).doTransaction( response, queryCRS );
<<<<<<<
new TransactionHandler( this, service, transaction, idGenMode ).doTransaction( response, queryCRS );
=======
new TransactionHandler( this, service, transaction, idGenMode, allowFeatureReferencesToDatastore ).doTransaction( response );
>>>>>>>
new TransactionHandler( this, service, transaction, idGenMode, allowFeatureReferencesToDatastore ).doTransaction( response, queryCRS );
<<<<<<<
new TransactionHandler( this, service, transaction, idGenMode ).doTransaction( response, queryCRS );
=======
new TransactionHandler( this, service, transaction, idGenMode, allowFeatureReferencesToDatastore ).doTransaction( response );
>>>>>>>
new TransactionHandler( this, service, transaction, idGenMode, allowFeatureReferencesToDatastore ).doTransaction( response, queryCRS ); |
<<<<<<<
import org.deegree.workspace.ResourceLocation;
import org.deegree.workspace.ResourceMetadata;
import org.deegree.workspace.Workspace;
=======
>>>>>>>
import org.deegree.workspace.ResourceLocation;
import org.deegree.workspace.ResourceMetadata;
import org.deegree.workspace.Workspace;
<<<<<<<
public URL getSchema() {
return WMSProvider.class.getResource( "/META-INF/schemas/services/wms/3.2.0/wms_configuration.xsd" );
=======
public URL getConfigSchema() {
return WMSProvider.class.getResource( "/META-INF/schemas/services/wms/3.4.0/wms_configuration.xsd" );
>>>>>>>
public URL getSchema() {
return WMSProvider.class.getResource( "/META-INF/schemas/services/wms/3.4.0/wms_configuration.xsd" );
<<<<<<<
public ResourceMetadata<OWS> createFromLocation( Workspace workspace, ResourceLocation<OWS> location ) {
return new WmsMetadata( workspace, location, this );
=======
public OWS create( URL configURL ) {
return new WMSController( configURL, getImplementationMetadata() );
}
@Override
@SuppressWarnings("unchecked")
public Class<? extends ResourceManager>[] getDependencies() {
return new Class[] {};
}
@Override
public void init( DeegreeWorkspace workspace ) {
// nothing to do
>>>>>>>
public ResourceMetadata<OWS> createFromLocation( Workspace workspace, ResourceLocation<OWS> location ) {
return new WmsMetadata( workspace, location, this ); |
<<<<<<<
=======
addSupportedImageFormats( conf );
>>>>>>>
addSupportedImageFormats( conf ); |
<<<<<<<
@Inject
private UriLocatorFactory locatorFactory;
=======
private UriLocatorFactory uriLocatorFactory;
>>>>>>>
private UriLocatorFactory locatorFactory;
<<<<<<<
private MetaDataFactory metaDataFactory;
=======
private CacheKeyFactory cacheKeyFactory;
>>>>>>>
private CacheKeyFactory cacheKeyFactory;
private MetaDataFactory metaDataFactory;
<<<<<<<
notNull(cacheStrategy, "cacheStrategy was not set!");
notNull(groupsProcessor, "groupsProcessor was not set!");
notNull(locatorFactory, "uriLocatorFactory was not set!");
notNull(processorsFactory, "processorsFactory was not set!");
notNull(groupExtractor, "GroupExtractor was not set!");
notNull(modelFactory, "ModelFactory was not set!");
notNull(cacheStrategy, "cacheStrategy was not set!");
notNull(hashStrategy, "HashStrategy was not set!");
notNull(authorizationManager, "authorizationManager was not set!");
notNull(metaDataFactory, "metaDataFactory was not set!");
=======
Validate.notNull(cacheStrategy, "cacheStrategy was not set!");
Validate.notNull(groupsProcessor, "groupsProcessor was not set!");
Validate.notNull(uriLocatorFactory, "uriLocatorFactory was not set!");
Validate.notNull(processorsFactory, "processorsFactory was not set!");
Validate.notNull(groupExtractor, "GroupExtractor was not set!");
Validate.notNull(modelFactory, "ModelFactory was not set!");
Validate.notNull(cacheStrategy, "cacheStrategy was not set!");
Validate.notNull(hashStrategy, "HashStrategy was not set!");
Validate.notNull(authorizationManager, "authorizationManager was not set!");
Validate.notNull(cacheKeyFactory, "CacheKeyFactory was not set!");
>>>>>>>
notNull(cacheStrategy, "cacheStrategy was not set!");
notNull(groupsProcessor, "groupsProcessor was not set!");
notNull(locatorFactory, "uriLocatorFactory was not set!");
notNull(processorsFactory, "processorsFactory was not set!");
notNull(groupExtractor, "GroupExtractor was not set!");
notNull(modelFactory, "ModelFactory was not set!");
notNull(cacheStrategy, "cacheStrategy was not set!");
notNull(hashStrategy, "HashStrategy was not set!");
notNull(authorizationManager, "authorizationManager was not set!");
notNull(metaDataFactory, "metaDataFactory was not set!");
notNull(cacheKeyFactory, "CacheKeyFactory was not set!");
<<<<<<<
public final WroManager setCacheStrategy(final CacheStrategy<CacheEntry, ContentHashEntry> cacheStrategy) {
notNull(cacheStrategy);
=======
public final WroManager setCacheStrategy(final CacheStrategy<CacheKey, CacheValue> cacheStrategy) {
Validate.notNull(cacheStrategy);
>>>>>>>
public final WroManager setCacheStrategy(final CacheStrategy<CacheKey, CacheValue> cacheStrategy) {
notNull(cacheStrategy);
<<<<<<<
public MetaDataFactory getMetaDataFactory() {
return metaDataFactory;
}
public void setMetaDataFactory(final MetaDataFactory metaDataFactory) {
this.metaDataFactory = metaDataFactory;
}
=======
public CacheKeyFactory getCacheKeyFactory() {
return cacheKeyFactory;
}
public void setCacheKeyFactory(final CacheKeyFactory cacheKeyFactory) {
this.cacheKeyFactory = cacheKeyFactory;
}
>>>>>>>
public CacheKeyFactory getCacheKeyFactory() {
return cacheKeyFactory;
}
public void setCacheKeyFactory(final CacheKeyFactory cacheKeyFactory) {
this.cacheKeyFactory = cacheKeyFactory;
}
public MetaDataFactory getMetaDataFactory() {
return metaDataFactory;
}
public void setMetaDataFactory(final MetaDataFactory metaDataFactory) {
this.metaDataFactory = metaDataFactory;
} |
<<<<<<<
private MetaDataFactory metaDataFactory;
=======
private CacheKeyFactory cacheKeyFactory;
>>>>>>>
private CacheKeyFactory cacheKeyFactory;
private MetaDataFactory metaDataFactory;
<<<<<<<
if (metaDataFactory == null) {
metaDataFactory = newMetaDataFactory();
}
=======
if (cacheKeyFactory == null) {
cacheKeyFactory = newCacheKeyFactory();
}
>>>>>>>
if (cacheKeyFactory == null) {
cacheKeyFactory = newCacheKeyFactory();
}
if (metaDataFactory == null) {
metaDataFactory = newMetaDataFactory();
}
<<<<<<<
manager.setMetaDataFactory(metaDataFactory);
=======
manager.setCacheKeyFactory(cacheKeyFactory);
// initialize before injection to allow injector do its job properly
>>>>>>>
manager.setCacheKeyFactory(cacheKeyFactory);
manager.setMetaDataFactory(metaDataFactory);
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
/**
* @return the namingStrategy
*/
public NamingStrategy getNamingStrategy() {
return namingStrategy;
}
>>>>>>>
<<<<<<<
=======
/**
* @return default implementation of {@link CacheKeyFactory}.
*/
protected CacheKeyFactory newCacheKeyFactory() {
return new DefaultCacheKeyFactory();
}
>>>>>>>
/**
* @return default implementation of {@link CacheKeyFactory}.
*/
protected CacheKeyFactory newCacheKeyFactory() {
return new DefaultCacheKeyFactory();
}
<<<<<<<
/**
* @return default implementation of {@link MetaDataFactory} used when no {@link MetaDataFactory} is set.
*/
protected MetaDataFactory newMetaDataFactory() {
return new DefaultMetaDataFactory();
}
=======
>>>>>>>
/**
* @return default implementation of {@link MetaDataFactory} used when no {@link MetaDataFactory} is set.
*/
protected MetaDataFactory newMetaDataFactory() {
return new DefaultMetaDataFactory();
}
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
public void setCacheKeyFactory(final CacheKeyFactory cacheKeyFactory) {
this.cacheKeyFactory = cacheKeyFactory;
}
>>>>>>>
public void setCacheKeyFactory(final CacheKeyFactory cacheKeyFactory) {
this.cacheKeyFactory = cacheKeyFactory;
}
<<<<<<<
=======
public WroModelFactory getModelFactory() {
return modelFactory;
}
>>>>>>> |
<<<<<<<
private boolean disableCache = false;
/**
* Allow to turn jmx on or off. By default thsi value is true.
*/
private boolean jmxEnabled = true;
=======
private boolean disableCache;
/**
* Encoding to use when reading resources.
*/
private String encoding;
>>>>>>>
private boolean disableCache = false;
/**
* Allow to turn jmx on or off. By default thsi value is true.
*/
private boolean jmxEnabled = true;
/**
* Encoding to use when reading resources.
*/
private String encoding;
<<<<<<<
private final transient List<PropertyChangeListener> cacheUpdatePeriodListeners = new ArrayList<PropertyChangeListener>(1);
private final transient List<PropertyChangeListener> modelUpdatePeriodListeners = new ArrayList<PropertyChangeListener>(1);
=======
private final transient List<PropertyChangeListener> cacheUpdatePeriodListeners = new ArrayList<PropertyChangeListener>(1);
private final transient List<PropertyChangeListener> modelUpdatePeriodListeners = new ArrayList<PropertyChangeListener>(1);
>>>>>>>
private final transient List<PropertyChangeListener> cacheUpdatePeriodListeners = new ArrayList<PropertyChangeListener>(1);
private final transient List<PropertyChangeListener> modelUpdatePeriodListeners = new ArrayList<PropertyChangeListener>(1);
<<<<<<<
return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE).toString();
=======
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).toString();
>>>>>>>
return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE).toString(); |
<<<<<<<
private ExecutorService consumerService;
=======
private ExecutorService completionExecutor;
>>>>>>>
private ExecutorService completionExecutor;
<<<<<<<
public ExecutorService getExecutor() {
=======
private ExecutorService getExecutor() {
>>>>>>>
private ExecutorService getExecutor() {
<<<<<<<
final StopWatch watch = new StopWatch();
watch.start("create executor");
=======
>>>>>>>
<<<<<<<
/**
* @return a not null instance of {@link ExecutorService} which is created lazily.
*/
private ExecutorService getConsumerService() {
if (consumerService == null) {
// it is enough to use an executor with a single thread.
consumerService = Executors.newFixedThreadPool(5);
}
return consumerService;
}
=======
>>>>>>>
<<<<<<<
destroy();
=======
watch.stop();
destroy();
>>>>>>>
watch.stop();
destroy();
<<<<<<<
private <T> Callable<T> decorate(final Callable<T> decorated, final AtomicLong totalTime) {
=======
private Callable<T> decorate(final Callable<T> decorated, final AtomicLong totalTime) {
>>>>>>>
private <T> Callable<T> decorate(final Callable<T> decorated, final AtomicLong totalTime) {
<<<<<<<
/**
* Submits a task to the taskExecutor. This operation is not a blocking one.
*/
private final void submit(final Callable<T> callable) {
getCompletionService().submit(callable);
consumeResult();
}
/**
* Reads asynchronously the latest available result.
*/
private void consumeResult() {
getConsumerService().submit(new Callable<Void>() {
public Void call()
throws Exception {
doConsumeResult();
return null;
}
});
// try {
// doConsumeResult();
// } catch(Exception e) {
// thWroRuntimeException.wrap(e);
// }
}
=======
>>>>>>> |
<<<<<<<
import ro.isdc.wro.config.metadata.MetaDataFactory;
=======
import ro.isdc.wro.manager.ResourceBundleProcessor;
>>>>>>>
import ro.isdc.wro.config.metadata.MetaDataFactory;
import ro.isdc.wro.manager.ResourceBundleProcessor;
<<<<<<<
assertNotNull(sample.namingStrategy);
assertNotNull(sample.preProcessorExecutor);
assertNotNull(sample.processorsFactory);
assertNotNull(sample.uriLocatorFactory);
assertNotNull(sample.callbackRegistry);
assertSame(injector, sample.injector);
assertNotNull(sample.groupsProcessor);
assertNotNull(sample.metaDataFactory);
=======
assertNotNull(sample.namingStrategy);
assertNotNull(sample.preProcessorExecutor);
assertNotNull(sample.processorsFactory);
assertNotNull(sample.uriLocatorFactory);
assertNotNull(sample.callbackRegistry);
assertSame(injector, sample.injector);
assertNotNull(sample.groupsProcessor);
assertNotNull(sample.bundleProcessor);
>>>>>>>
assertNotNull(sample.namingStrategy);
assertNotNull(sample.preProcessorExecutor);
assertNotNull(sample.processorsFactory);
assertNotNull(sample.uriLocatorFactory);
assertNotNull(sample.callbackRegistry);
assertSame(injector, sample.injector);
assertNotNull(sample.groupsProcessor);
assertNotNull(sample.metaDataFactory);
assertNotNull(sample.bundleProcessor);
<<<<<<<
assertNotNull(sample.metaDataFactory);
=======
assertNotNull(sample.cacheKeyFactory);
assertNotNull(sample.bundleProcessor);
>>>>>>>
assertNotNull(sample.metaDataFactory);
assertNotNull(sample.cacheKeyFactory);
assertNotNull(sample.bundleProcessor);
<<<<<<<
@Inject
MetaDataFactory metaDataFactory;
=======
@Inject
CacheKeyFactory cacheKeyFactory;
@Inject
ResourceBundleProcessor bundleProcessor;
>>>>>>>
@Inject
MetaDataFactory metaDataFactory;
@Inject
CacheKeyFactory cacheKeyFactory;
@Inject
ResourceBundleProcessor bundleProcessor; |
<<<<<<<
@Test
public void testWhiteSpaceOnly() throws IOException {
final ResourcePostProcessor processor = new GoogleClosureCompressorProcessor(CompilationLevel.WHITESPACE_ONLY);
final URL url = getClass().getResource("google");
final File testFolder = new File(url.getFile(), "test");
final File expectedFolder = new File(url.getFile(), "expectedWhitespaceOnly");
WroTestUtils.compareFromDifferentFoldersByExtension(testFolder, expectedFolder, "js",
processor);
}
=======
@Before
public void setUp() {
Context.set(Context.standaloneContext());
}
@After
public void tearDown() {
Context.unset();
}
>>>>>>>
@Before
public void setUp() {
Context.set(Context.standaloneContext());
}
@Test
public void testWhiteSpaceOnly() throws IOException {
final ResourcePostProcessor processor = new GoogleClosureCompressorProcessor(CompilationLevel.WHITESPACE_ONLY);
final URL url = getClass().getResource("google");
@After
public void tearDown() {
Context.unset();
}
final File testFolder = new File(url.getFile(), "test");
final File expectedFolder = new File(url.getFile(), "expectedWhitespaceOnly");
WroTestUtils.compareFromDifferentFoldersByExtension(testFolder, expectedFolder, "js",
processor);
} |
<<<<<<<
import ro.isdc.wro.extensions.processor.js.CoffeeScriptProcessor;
=======
import ro.isdc.wro.config.Context;
import ro.isdc.wro.extensions.processor.js.CoffeScriptProcessor;
>>>>>>>
import ro.isdc.wro.config.Context;
import ro.isdc.wro.extensions.processor.js.CoffeeScriptProcessor;
<<<<<<<
processor = new CoffeeScriptProcessor();
=======
Context.set(Context.standaloneContext());
processor = new CoffeScriptProcessor();
>>>>>>>
Context.set(Context.standaloneContext());
processor = new CoffeeScriptProcessor(); |
<<<<<<<
final String fileName = resource == null ? "wro4j-processed-file.js" : resource.getUri();
final JSSourceFile input = JSSourceFile.fromInputStream(fileName, new ByteArrayInputStream(content.getBytes()));
=======
final JSSourceFile input = JSSourceFile.fromInputStream("",
new ByteArrayInputStream(content.getBytes(Context.get().getConfig().getEncoding())));
>>>>>>>
final String fileName = resource == null ? "wro4j-processed-file.js" : resource.getUri();
final JSSourceFile input = JSSourceFile.fromInputStream(fileName, new ByteArrayInputStream(content.getBytes(Context.get().getConfig().getEncoding()))); |
<<<<<<<
private final String[] permissionsList = new String[]{Manifest.permission.SEND_SMS};
=======
private final String[] permissionsList = new String[]{Manifest.permission.SEND_SMS, Manifest.permission.READ_PHONE_STATE};
private Registrar registrar;
>>>>>>>
private final String[] permissionsList = new String[]{Manifest.permission.SEND_SMS};
private Registrar registrar; |
<<<<<<<
import net.imagej.ops.map.neighborhood.MapNeighborhoodWithCenter;
=======
import net.imagej.ops.Ops;
import net.imagej.ops.special.chain.RAIs;
>>>>>>>
import net.imagej.ops.map.neighborhood.MapNeighborhoodWithCenter;
import net.imagej.ops.special.chain.RAIs;
<<<<<<<
import net.imglib2.type.numeric.integer.ByteType;
import net.imglib2.view.Views;
=======
>>>>>>>
<<<<<<<
public class LocalThreshold<T extends RealType<T>> extends
AbstractUnaryComputerOp<RandomAccessibleInterval<T>, IterableInterval<BitType>>
=======
@Plugin(type = Ops.Threshold.Apply.class)
public class LocalThreshold<T extends RealType<T>> extends
AbstractUnaryComputerOp<RandomAccessibleInterval<T>, RandomAccessibleInterval<BitType>>
implements Ops.Threshold.Apply
>>>>>>>
public class LocalThreshold<T extends RealType<T>> extends
AbstractUnaryComputerOp<RandomAccessibleInterval<T>, IterableInterval<BitType>>
<<<<<<<
mapper = ops().op(MapNeighborhoodWithCenter.class, out(), extend(in(), outOfBounds), method, shape);
=======
mapper = Computers.unary(ops(), Ops.Map.class, out(), RAIs.extend(in(),
outOfBounds), method, shape);
>>>>>>>
mapper = ops().op(MapNeighborhoodWithCenter.class, out(), RAIs.extend(in(), outOfBounds), method, shape); |
<<<<<<<
}
=======
>>>>>>>
}
<<<<<<<
}
=======
>>>>>>>
}
<<<<<<<
}
=======
>>>>>>>
}
<<<<<<<
if (onVmCreationFailureListener == null) {
=======
if (onVmCreationFailureListener == null)
>>>>>>>
if (onVmCreationFailureListener == null) {
<<<<<<<
}
=======
>>>>>>>
}
<<<<<<<
}
=======
>>>>>>>
}
<<<<<<<
* <p>
* Compares this Vm with another one, considering the
* {@link #getTotalMipsCapacity() total MIPS capacity of the Vm's}.</p>
*
=======
* <p>Compares this Vm with another one, considering
* the {@link #getTotalMipsCapacity() total MIPS capacity of the Vm's}.</p>
*
>>>>>>>
* <p>Compares this Vm with another one, considering
* the {@link #getTotalMipsCapacity() total MIPS capacity of the Vm's}.</p>
* |
<<<<<<<
* Adds a {@link UnaryOperator} that creates a clone for the last failed {@link Vm}s belonging to a given broker,
* when all VMs of that broker have failed.
=======
* Adds a {@link UnaryOperator} that creates a clone of a {@link Vm} belonging to a given broker.
* when all Host PEs fail or all VM's PEs are deallocated
* because they have failed.
>>>>>>>
* Adds a {@link UnaryOperator} that creates a clone for the last failed {@link Vm} belonging to a given broker,
* when all VMs of that broker have failed. |
<<<<<<<
import org.cloudsimplus.autoscaling.VerticalVmScaling;
=======
>>>>>>>
import org.cloudsimplus.autoscaling.VerticalVmScaling;
<<<<<<<
protected void requestCreationOfWaitingVmsToFallbackDatacenter() {
final Datacenter nextDatacenter = selectFallbackDatacenterForWaitingVms();
=======
protected void requestCreationOfWaitingVmsToNextDatacenter() {
final Datacenter nextDatacenter = fallbackDatacenterSupplier.get();
>>>>>>>
protected void requestCreationOfWaitingVmsToFallbackDatacenter() {
final Datacenter nextDatacenter = fallbackDatacenterSupplier.get(); |
<<<<<<<
@NotNull(message = "Plex property cannot be null")
private PlexProperties plex;
=======
private String movieDbListId;
>>>>>>>
@NotNull(message = "Plex property cannot be null")
private PlexProperties plex;
private String movieDbListId;
<<<<<<<
public PlexProperties getPlex() {
return plex;
}
public void setPlex(PlexProperties plex) {
this.plex = plex;
}
=======
public String getMovieDbListId() {
return movieDbListId;
}
public void setMovieDbListId(String listId) {
this.movieDbListId = listId;
}
>>>>>>>
public PlexProperties getPlex() {
return plex;
}
public void setPlex(PlexProperties plex) {
this.plex = plex;
}
public String getMovieDbListId() {
return movieDbListId;
}
public void setMovieDbListId(String listId) {
this.movieDbListId = listId;
} |
<<<<<<<
/*
* Copyright 2015-2019 MarkLogic Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.marklogic.client.datamovement.impl;
import com.marklogic.client.datamovement.Batcher;
import com.marklogic.client.datamovement.JobTicket;
import com.marklogic.client.datamovement.JobTicket.JobType;
public class JobTicketImpl implements JobTicket {
private String jobId;
private JobType jobType;
private QueryBatcherImpl queryBatcher;
private WriteBatcherImpl writeBatcher;
public JobTicketImpl(String jobId, JobType jobType) {
this.jobId = jobId;
this.jobType = jobType;
}
@Override
public String getJobId() {
return jobId;
}
@Override
public JobType getJobType() {
return jobType;
}
public WriteBatcherImpl getWriteBatcher() {
return writeBatcher;
}
@Override
public Batcher getBatcher() {
if (this.jobType == JobType.QUERY_BATCHER) {
return queryBatcher;
} else {
return writeBatcher;
}
}
public JobTicketImpl withWriteBatcher(WriteBatcherImpl writeBatcher) {
this.writeBatcher = writeBatcher;
return this;
}
public QueryBatcherImpl getQueryBatcher() {
return queryBatcher;
}
public JobTicketImpl withQueryBatcher(QueryBatcherImpl queryBatcher) {
this.queryBatcher = queryBatcher;
return this;
}
}
=======
/*
* Copyright 2015-2018 MarkLogic Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.marklogic.client.datamovement.impl;
import com.marklogic.client.datamovement.Batcher;
import com.marklogic.client.datamovement.JobTicket;
import com.marklogic.client.datamovement.JobTicket.JobType;
import com.marklogic.client.dataservices.impl.CallBatcherImpl;
public class JobTicketImpl implements JobTicket {
private String jobId;
private JobType jobType;
private QueryBatcherImpl queryBatcher;
private WriteBatcherImpl writeBatcher;
private CallBatcherImpl callBatcher;
public JobTicketImpl(String jobId, JobType jobType) {
this.jobId = jobId;
this.jobType = jobType;
}
@Override
public String getJobId() {
return jobId;
}
@Override
public JobType getJobType() {
return jobType;
}
@Override
public BatcherImpl getBatcher() {
switch(this.jobType) {
case CALL_BATCHER: return getCallBatcher();
case QUERY_BATCHER: return getQueryBatcher();
case WRITE_BATCHER: return getWriteBatcher();
default:
throw new InternalError(
(jobType == null) ?
"null job type" :
"unknown job type: "+jobType.name()
);
}
}
public CallBatcherImpl getCallBatcher() {
return callBatcher;
}
public QueryBatcherImpl getQueryBatcher() {
return queryBatcher;
}
public WriteBatcherImpl getWriteBatcher() {
return writeBatcher;
}
public JobTicketImpl withCallBatcher(CallBatcherImpl batcher) {
this.callBatcher = batcher;
return this;
}
public JobTicketImpl withQueryBatcher(QueryBatcherImpl queryBatcher) {
this.queryBatcher = queryBatcher;
return this;
}
public JobTicketImpl withWriteBatcher(WriteBatcherImpl writeBatcher) {
this.writeBatcher = writeBatcher;
return this;
}
}
>>>>>>>
/*
* Copyright 2015-2019 MarkLogic Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.marklogic.client.datamovement.impl;
import com.marklogic.client.datamovement.Batcher;
import com.marklogic.client.datamovement.JobTicket;
import com.marklogic.client.datamovement.JobTicket.JobType;
import com.marklogic.client.dataservices.impl.CallBatcherImpl;
public class JobTicketImpl implements JobTicket {
private String jobId;
private JobType jobType;
private QueryBatcherImpl queryBatcher;
private WriteBatcherImpl writeBatcher;
private CallBatcherImpl callBatcher;
public JobTicketImpl(String jobId, JobType jobType) {
this.jobId = jobId;
this.jobType = jobType;
}
@Override
public String getJobId() {
return jobId;
}
@Override
public JobType getJobType() {
return jobType;
}
@Override
public BatcherImpl getBatcher() {
switch(this.jobType) {
case CALL_BATCHER: return getCallBatcher();
case QUERY_BATCHER: return getQueryBatcher();
case WRITE_BATCHER: return getWriteBatcher();
default:
throw new InternalError(
(jobType == null) ?
"null job type" :
"unknown job type: "+jobType.name()
);
}
}
public CallBatcherImpl getCallBatcher() {
return callBatcher;
}
public QueryBatcherImpl getQueryBatcher() {
return queryBatcher;
}
public WriteBatcherImpl getWriteBatcher() {
return writeBatcher;
}
public JobTicketImpl withCallBatcher(CallBatcherImpl batcher) {
this.callBatcher = batcher;
return this;
}
public JobTicketImpl withQueryBatcher(QueryBatcherImpl queryBatcher) {
this.queryBatcher = queryBatcher;
return this;
}
public JobTicketImpl withWriteBatcher(WriteBatcherImpl writeBatcher) {
this.writeBatcher = writeBatcher;
return this;
}
} |
<<<<<<<
public BatchListener<WriteEvent>[] getBatchSuccessListeners() {
return successListeners.toArray(new BatchListener[successListeners.size()]);
}
@Override
public BatchFailureListener<WriteEvent>[] getBatchFailureListeners() {
return failureListeners.toArray(new BatchFailureListener[failureListeners.size()]);
}
@Override
public void setBatchSuccessListeners(BatchListener<WriteEvent>... listeners) {
requireNotInitialized();
successListeners.clear();
if ( listeners != null ) {
for ( BatchListener<WriteEvent> listener : listeners ) {
successListeners.add(listener);
}
}
}
@Override
public void setBatchFailureListeners(BatchFailureListener<WriteEvent>... listeners) {
requireNotInitialized();
failureListeners.clear();
if ( listeners != null ) {
for ( BatchFailureListener<WriteEvent> listener : listeners ) {
failureListeners.add(listener);
}
}
}
@Override
public void flush() {
=======
public void flushAsync() {
flush(false);
}
@Override
public void flushAndWait() {
flush(true);
}
private void flush(boolean waitForCompletion) {
>>>>>>>
public BatchListener<WriteEvent>[] getBatchSuccessListeners() {
return successListeners.toArray(new BatchListener[successListeners.size()]);
}
@Override
public BatchFailureListener<WriteEvent>[] getBatchFailureListeners() {
return failureListeners.toArray(new BatchFailureListener[failureListeners.size()]);
}
@Override
public void setBatchSuccessListeners(BatchListener<WriteEvent>... listeners) {
requireNotInitialized();
successListeners.clear();
if ( listeners != null ) {
for ( BatchListener<WriteEvent> listener : listeners ) {
successListeners.add(listener);
}
}
}
@Override
public void setBatchFailureListeners(BatchFailureListener<WriteEvent>... listeners) {
requireNotInitialized();
failureListeners.clear();
if ( listeners != null ) {
for ( BatchFailureListener<WriteEvent> listener : listeners ) {
failureListeners.add(listener);
}
}
}
@Override
public void flushAsync() {
flush(false);
}
@Override
public void flushAndWait() {
flush(true);
}
private void flush(boolean waitForCompletion) { |
<<<<<<<
setupEndpointMultipleRequired(docMgr, docMeta, "boolean");
setupEndpointMultipleRequired(docMgr, docMeta, "date");
setupEndpointMultipleRequired(docMgr, docMeta, "dateTime");
setupEndpointMultipleRequired(docMgr, docMeta, "dayTimeDuration");
setupEndpointMultipleRequired(docMgr, docMeta, "decimal");
setupEndpointMultipleRequired(docMgr, docMeta, "double");
setupEndpointMultipleRequired(docMgr, docMeta, "float");
setupEndpointMultipleRequired(docMgr, docMeta, "int");
setupEndpointMultipleRequired(docMgr, docMeta, "long");
setupEndpointMultipleRequired(docMgr, docMeta, "string");
setupEndpointMultipleRequired(docMgr, docMeta, "time");
setupEndpointMultipleRequired(docMgr, docMeta, "unsignedInt");
setupEndpointMultipleRequired(docMgr, docMeta, "unsignedLong");
setupEndpointMultipleRequired(docMgr, docMeta, "array");
setupEndpointMultipleRequired(docMgr, docMeta, "binaryDocument");
setupEndpointMultipleRequired(docMgr, docMeta, "jsonDocument");
setupEndpointMultipleRequired(docMgr, docMeta, "object");
setupEndpointMultipleRequired(docMgr, docMeta, "textDocument");
setupEndpointMultipleRequired(docMgr, docMeta, "xmlDocument");
setupEndpointSingleRequired(docMgr, docMeta, "singleAtomic", "dateTime");
setupEndpointSingleRequired(docMgr, docMeta, "singleNode", "object");
setupEndpointSingleRequired(docMgr, docMeta, "singleBinary", "binaryDocument");
setupEndpointSingleRequired(docMgr, docMeta, "singleJson", "jsonDocument");
setupEndpointSingleRequired(docMgr, docMeta, "singleText", "textDocument");
setupEndpointSingleRequired(docMgr, docMeta, "singleXml", "xmlDocument");
setupEndpointSingleNulled(docMgr, docMeta, "nullAtomic", "decimal");
setupEndpointSingleNulled(docMgr, docMeta, "nullNode", "xmlDocument");
setupEndpointMultipleNulled(docMgr, docMeta, "multipleNullAtomic", "float");
setupEndpointMultipleNulled(docMgr, docMeta, "multipleNullNode", "textDocument");
setupTwoParamEndpoint(docMgr, docMeta, "twoAtomic", "date", "unsignedLong");
setupTwoParamEndpoint(docMgr, docMeta, "twoNode", "array", "textDocument");
setupTwoParamEndpoint(docMgr, docMeta, "twoMixed", "time", "textDocument");
setupParamNoReturnEndpoint(docMgr, docMeta, "paramNoReturn", "double");
setupNoParamReturnEndpoint(docMgr, docMeta, "noParamReturn", "double", "5.6");
setupNoParamNoReturnEndpoint(docMgr, docMeta, "noParamNoReturn");
=======
endpointUtil.setupEndpointMultipleRequired(docMgr, docMeta, "boolean");
endpointUtil.setupEndpointMultipleRequired(docMgr, docMeta, "date");
endpointUtil.setupEndpointMultipleRequired(docMgr, docMeta, "dateTime");
endpointUtil.setupEndpointMultipleRequired(docMgr, docMeta, "dayTimeDuration");
endpointUtil.setupEndpointMultipleRequired(docMgr, docMeta, "decimal");
endpointUtil.setupEndpointMultipleRequired(docMgr, docMeta, "double");
endpointUtil.setupEndpointMultipleRequired(docMgr, docMeta, "float");
endpointUtil.setupEndpointMultipleRequired(docMgr, docMeta, "int");
endpointUtil.setupEndpointMultipleRequired(docMgr, docMeta, "long");
endpointUtil.setupEndpointMultipleRequired(docMgr, docMeta, "string");
endpointUtil.setupEndpointMultipleRequired(docMgr, docMeta, "time");
endpointUtil.setupEndpointMultipleRequired(docMgr, docMeta, "unsignedInt");
endpointUtil.setupEndpointMultipleRequired(docMgr, docMeta, "unsignedLong");
endpointUtil.setupEndpointMultipleRequired(docMgr, docMeta, "array");
endpointUtil.setupEndpointMultipleRequired(docMgr, docMeta, "binaryDocument");
endpointUtil.setupEndpointMultipleRequired(docMgr, docMeta, "jsonDocument");
endpointUtil.setupEndpointMultipleRequired(docMgr, docMeta, "object");
endpointUtil.setupEndpointMultipleRequired(docMgr, docMeta, "textDocument");
endpointUtil.setupEndpointMultipleRequired(docMgr, docMeta, "xmlDocument");
endpointUtil.setupEndpointSingleRequired(docMgr, docMeta, "singleAtomic", "dateTime");
endpointUtil.setupEndpointSingleRequired(docMgr, docMeta, "singleNode", "object");
endpointUtil.setupEndpointSingleNulled(docMgr, docMeta, "nullAtomic", "decimal");
endpointUtil.setupEndpointSingleNulled(docMgr, docMeta, "nullNode", "xmlDocument");
endpointUtil.setupEndpointMultipleNulled(docMgr, docMeta, "multipleNullAtomic", "float");
endpointUtil.setupEndpointMultipleNulled(docMgr, docMeta, "multipleNullNode", "textDocument");
endpointUtil.setupTwoParamEndpoint(docMgr, docMeta, "twoAtomic", "date", "unsignedLong");
endpointUtil.setupTwoParamEndpoint(docMgr, docMeta, "twoNode", "array", "textDocument");
endpointUtil.setupTwoParamEndpoint(docMgr, docMeta, "twoMixed", "time", "textDocument");
endpointUtil.setupParamNoReturnEndpoint(docMgr, docMeta, "paramNoReturn", "double");
endpointUtil.setupNoParamReturnEndpoint(docMgr, docMeta, "noParamReturn", "double", "5.6");
endpointUtil.setupNoParamNoReturnEndpoint(docMgr, docMeta, "noParamNoReturn");
>>>>>>>
endpointUtil.setupEndpointMultipleRequired(docMgr, docMeta, "boolean");
endpointUtil.setupEndpointMultipleRequired(docMgr, docMeta, "date");
endpointUtil.setupEndpointMultipleRequired(docMgr, docMeta, "dateTime");
endpointUtil.setupEndpointMultipleRequired(docMgr, docMeta, "dayTimeDuration");
endpointUtil.setupEndpointMultipleRequired(docMgr, docMeta, "decimal");
endpointUtil.setupEndpointMultipleRequired(docMgr, docMeta, "double");
endpointUtil.setupEndpointMultipleRequired(docMgr, docMeta, "float");
endpointUtil.setupEndpointMultipleRequired(docMgr, docMeta, "int");
endpointUtil.setupEndpointMultipleRequired(docMgr, docMeta, "long");
endpointUtil.setupEndpointMultipleRequired(docMgr, docMeta, "string");
endpointUtil.setupEndpointMultipleRequired(docMgr, docMeta, "time");
endpointUtil.setupEndpointMultipleRequired(docMgr, docMeta, "unsignedInt");
endpointUtil.setupEndpointMultipleRequired(docMgr, docMeta, "unsignedLong");
endpointUtil.setupEndpointMultipleRequired(docMgr, docMeta, "array");
endpointUtil.setupEndpointMultipleRequired(docMgr, docMeta, "binaryDocument");
endpointUtil.setupEndpointMultipleRequired(docMgr, docMeta, "jsonDocument");
endpointUtil.setupEndpointMultipleRequired(docMgr, docMeta, "object");
endpointUtil.setupEndpointMultipleRequired(docMgr, docMeta, "textDocument");
endpointUtil.setupEndpointMultipleRequired(docMgr, docMeta, "xmlDocument");
endpointUtil.setupEndpointSingleRequired(docMgr, docMeta, "singleAtomic", "dateTime");
endpointUtil.setupEndpointSingleRequired(docMgr, docMeta, "singleNode", "object");
endpointUtil.setupEndpointSingleRequired(docMgr, docMeta, "singleBinary", "binaryDocument");
endpointUtil.setupEndpointSingleRequired(docMgr, docMeta, "singleJson", "jsonDocument");
endpointUtil.setupEndpointSingleRequired(docMgr, docMeta, "singleText", "textDocument");
endpointUtil.setupEndpointSingleRequired(docMgr, docMeta, "singleXml", "xmlDocument");
endpointUtil.setupEndpointSingleNulled(docMgr, docMeta, "nullAtomic", "decimal");
endpointUtil.setupEndpointSingleNulled(docMgr, docMeta, "nullNode", "xmlDocument");
endpointUtil.setupEndpointMultipleNulled(docMgr, docMeta, "multipleNullAtomic", "float");
endpointUtil.setupEndpointMultipleNulled(docMgr, docMeta, "multipleNullNode", "textDocument");
endpointUtil.setupTwoParamEndpoint(docMgr, docMeta, "twoAtomic", "date", "unsignedLong");
endpointUtil.setupTwoParamEndpoint(docMgr, docMeta, "twoNode", "array", "textDocument");
endpointUtil.setupTwoParamEndpoint(docMgr, docMeta, "twoMixed", "time", "textDocument");
endpointUtil.setupParamNoReturnEndpoint(docMgr, docMeta, "paramNoReturn", "double");
endpointUtil.setupNoParamReturnEndpoint(docMgr, docMeta, "noParamReturn", "double", "5.6");
endpointUtil.setupNoParamNoReturnEndpoint(docMgr, docMeta, "noParamNoReturn");
<<<<<<<
CallManager.CallableEndpoint callableEndpoint = makeCallableEndpoint(functionName);
=======
CallManager.CallableEndpoint callableEndpoint = endpointUtil.makeCallableEndpoint(functionName );
>>>>>>>
CallManager.CallableEndpoint callableEndpoint = endpointUtil.makeCallableEndpoint(functionName );
<<<<<<<
CallManager.CallableEndpoint callableEndpoint = makeCallableEndpoint(functionName);
=======
CallManager.CallableEndpoint callableEndpoint = endpointUtil.makeCallableEndpoint(functionName );
>>>>>>>
CallManager.CallableEndpoint callableEndpoint = endpointUtil.makeCallableEndpoint(functionName );
<<<<<<<
CallManager.CallableEndpoint callableEndpoint = makeCallableEndpoint(functionName);
=======
CallManager.CallableEndpoint callableEndpoint = endpointUtil.makeCallableEndpoint(functionName );
>>>>>>>
CallManager.CallableEndpoint callableEndpoint = endpointUtil.makeCallableEndpoint(functionName ); |
<<<<<<<
/*
* Copyright 2015-2019 MarkLogic Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.marklogic.client.datamovement.impl;
import java.util.Calendar;
import com.marklogic.client.DatabaseClient;
import com.marklogic.client.datamovement.Batch;
import com.marklogic.client.datamovement.Forest;
import com.marklogic.client.datamovement.JobTicket;
public class BatchImpl<T> implements Batch<T> {
private T[] items;
private DatabaseClient client;
private long jobBatchNumber;
private Calendar timestamp;
private JobTicket jobTicket;
public BatchImpl() {
timestamp = Calendar.getInstance();
}
@Override
public T[] getItems() {
return items;
}
public BatchImpl<T> withItems(T[] items) {
this.items = items;
return this;
}
@Override
public DatabaseClient getClient() {
return client;
}
public BatchImpl<T> withClient(DatabaseClient client) {
this.client = client;
return this;
}
@Override
public Calendar getTimestamp() {
return timestamp;
}
public BatchImpl<T> withTimestamp(Calendar timestamp) {
this.timestamp = timestamp;
return this;
}
@Override
public JobTicket getJobTicket() {
return jobTicket;
}
public BatchImpl<T> withJobTicket(JobTicket jobTicket) {
this.jobTicket = jobTicket;
return this;
}
@Override
public long getJobBatchNumber() {
return jobBatchNumber;
}
public BatchImpl<T> withJobBatchNumber(long jobBatchNumber) {
this.jobBatchNumber = jobBatchNumber;
return this;
}
}
=======
/*
* Copyright 2015-2018 MarkLogic Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.marklogic.client.datamovement.impl;
import java.util.Calendar;
import com.marklogic.client.DatabaseClient;
import com.marklogic.client.datamovement.Batch;
import com.marklogic.client.datamovement.Forest;
import com.marklogic.client.datamovement.JobTicket;
public class BatchImpl<T> extends BatchEventImpl implements Batch<T> {
private T[] items;
public BatchImpl() {
super();
}
@Override
public T[] getItems() {
return items;
}
public BatchImpl<T> withItems(T[] items) {
this.items = items;
return this;
}
public BatchImpl<T> withClient(DatabaseClient client) {
return (BatchImpl<T>) super.withClient(client);
}
public BatchImpl<T> withTimestamp(Calendar timestamp) {
return (BatchImpl<T>) super.withTimestamp(timestamp);
}
public BatchImpl<T> withJobTicket(JobTicket jobTicket) {
return (BatchImpl<T>) super.withJobTicket(jobTicket);
}
public BatchImpl<T> withJobBatchNumber(long jobBatchNumber) {
return (BatchImpl<T>) super.withJobBatchNumber(jobBatchNumber);
}
}
>>>>>>>
/*
* Copyright 2015-2019 MarkLogic Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.marklogic.client.datamovement.impl;
import java.util.Calendar;
import com.marklogic.client.DatabaseClient;
import com.marklogic.client.datamovement.Batch;
import com.marklogic.client.datamovement.Forest;
import com.marklogic.client.datamovement.JobTicket;
public class BatchImpl<T> extends BatchEventImpl implements Batch<T> {
private T[] items;
public BatchImpl() {
super();
}
@Override
public T[] getItems() {
return items;
}
public BatchImpl<T> withItems(T[] items) {
this.items = items;
return this;
}
public BatchImpl<T> withClient(DatabaseClient client) {
return (BatchImpl<T>) super.withClient(client);
}
public BatchImpl<T> withTimestamp(Calendar timestamp) {
return (BatchImpl<T>) super.withTimestamp(timestamp);
}
public BatchImpl<T> withJobTicket(JobTicket jobTicket) {
return (BatchImpl<T>) super.withJobTicket(jobTicket);
}
public BatchImpl<T> withJobBatchNumber(long jobBatchNumber) {
return (BatchImpl<T>) super.withJobBatchNumber(jobBatchNumber);
}
} |
<<<<<<<
import net.imagej.ops.Ops.Create;
=======
import net.imagej.ops.Ops.ASCII;
import net.imagej.ops.Ops.Chunker;
import net.imagej.ops.Ops.Convert;
import net.imagej.ops.Ops.Convolve;
import net.imagej.ops.Ops.Correlate;
import net.imagej.ops.Ops.CreateImg;
import net.imagej.ops.Ops.Crop;
import net.imagej.ops.Ops.Deconvolve;
import net.imagej.ops.Ops.Equation;
import net.imagej.ops.Ops.Eval;
import net.imagej.ops.Ops.FFT;
import net.imagej.ops.Ops.FFTSize;
import net.imagej.ops.Ops.Gauss;
import net.imagej.ops.Ops.GaussKernel;
import net.imagej.ops.Ops.Help;
import net.imagej.ops.Ops.Histogram;
import net.imagej.ops.Ops.IFFT;
import net.imagej.ops.Ops.Identity;
import net.imagej.ops.Ops.Invert;
import net.imagej.ops.Ops.Join;
import net.imagej.ops.Ops.LogKernel;
import net.imagej.ops.Ops.Lookup;
import net.imagej.ops.Ops.Loop;
import net.imagej.ops.Ops.Map;
import net.imagej.ops.Ops.Max;
import net.imagej.ops.Ops.Mean;
import net.imagej.ops.Ops.Median;
import net.imagej.ops.Ops.Min;
import net.imagej.ops.Ops.MinMax;
import net.imagej.ops.Ops.Normalize;
import net.imagej.ops.Ops.Project;
import net.imagej.ops.Ops.Scale;
import net.imagej.ops.Ops.Size;
import net.imagej.ops.Ops.Slicewise;
import net.imagej.ops.Ops.StdDeviation;
import net.imagej.ops.Ops.Sum;
import net.imagej.ops.Ops.Threshold;
import net.imagej.ops.Ops.Variance;
>>>>>>>
import net.imagej.ops.Ops.Create;
import net.imagej.ops.Ops.ASCII;
import net.imagej.ops.Ops.Chunker;
import net.imagej.ops.Ops.Convert;
import net.imagej.ops.Ops.Convolve;
import net.imagej.ops.Ops.Correlate;
import net.imagej.ops.Ops.Crop;
import net.imagej.ops.Ops.Deconvolve;
import net.imagej.ops.Ops.Equation;
import net.imagej.ops.Ops.Eval;
import net.imagej.ops.Ops.FFT;
import net.imagej.ops.Ops.FFTSize;
import net.imagej.ops.Ops.Gauss;
import net.imagej.ops.Ops.GaussKernel;
import net.imagej.ops.Ops.Help;
import net.imagej.ops.Ops.Histogram;
import net.imagej.ops.Ops.IFFT;
import net.imagej.ops.Ops.Identity;
import net.imagej.ops.Ops.Invert;
import net.imagej.ops.Ops.Join;
import net.imagej.ops.Ops.LogKernel;
import net.imagej.ops.Ops.Lookup;
import net.imagej.ops.Ops.Loop;
import net.imagej.ops.Ops.Map;
import net.imagej.ops.Ops.Max;
import net.imagej.ops.Ops.Mean;
import net.imagej.ops.Ops.Median;
import net.imagej.ops.Ops.Min;
import net.imagej.ops.Ops.MinMax;
import net.imagej.ops.Ops.Normalize;
import net.imagej.ops.Ops.Project;
import net.imagej.ops.Ops.Scale;
import net.imagej.ops.Ops.Size;
import net.imagej.ops.Ops.Slicewise;
import net.imagej.ops.Ops.StdDeviation;
import net.imagej.ops.Ops.Sum;
import net.imagej.ops.Ops.Threshold;
import net.imagej.ops.Ops.Variance; |
<<<<<<<
dbl.antiSamyPolicy=antiSamyPolicy;
=======
dbl.sessionCookie=sessionCookie;
dbl.authCookie=authCookie;
>>>>>>>
dbl.antiSamyPolicy=antiSamyPolicy;
dbl.sessionCookie=sessionCookie;
dbl.authCookie=authCookie;
<<<<<<<
@Override
public Resource getAntiSamyPolicyResource() {
return antiSamyPolicy;
}
public void setAntiSamyPolicyResource(Resource antiSamyPolicy) {
this.antiSamyPolicy = antiSamyPolicy;
}
=======
@Override
public SessionCookieData getSessionCookie() {
return sessionCookie;
}
@Override
public void setSessionCookie(SessionCookieData data) {
sessionCookie=data;
}
@Override
public AuthCookieData getAuthCookie() {
return authCookie;
}
@Override
public void setAuthCookie(AuthCookieData data) {
authCookie=data;
}
>>>>>>>
@Override
public Resource getAntiSamyPolicyResource() {
return antiSamyPolicy;
}
public void setAntiSamyPolicyResource(Resource antiSamyPolicy) {
this.antiSamyPolicy = antiSamyPolicy;
}
@Override
public SessionCookieData getSessionCookie() {
return sessionCookie;
}
@Override
public void setSessionCookie(SessionCookieData data) {
sessionCookie=data;
}
@Override
public AuthCookieData getAuthCookie() {
return authCookie;
}
@Override
public void setAuthCookie(AuthCookieData data) {
authCookie=data;
} |
<<<<<<<
private TagListener queryListener;
private boolean fullNullSupport;
=======
>>>>>>>
private TagListener queryListener;
private boolean fullNullSupport;
<<<<<<<
private Map<Collection.Key,Pair<Log,Struct>> logs;
=======
private Map<Collection.Key, Pair<Log, Struct>> logs;
>>>>>>>
private Map<Collection.Key,Pair<Log,Struct>> logs;
<<<<<<<
setClientCookies=config.isClientCookies();
setDomainCookies=config.isDomainCookies();
setSessionManagement=config.isSessionManagement();
setClientManagement=config.isClientManagement();
sessionTimeout=config.getSessionTimeout();
clientTimeout=config.getClientTimeout();
requestTimeout=config.getRequestTimeout();
applicationTimeout=config.getApplicationTimeout();
scriptProtect=config.getScriptProtect();
typeChecking=ci.getTypeChecking();
allowCompression=ci.allowCompression();
this.defaultDataSource=config.getDefaultDataSource();
this.localMode=config.getLocalMode();
this.locale=config.getLocale();
this.timeZone=config.getTimeZone();
this.webCharset=ci.getWebCharSet();
this.resourceCharset=ci.getResourceCharSet();
this.bufferOutput=ci.getBufferOutput();
suppressContent=ci.isSuppressContent();
this.sessionType=config.getSessionType();
this.wstype=WS_TYPE_AXIS1;
this.cgiScopeReadonly=ci.getCGIScopeReadonly();
this.fullNullSupport=ci.getFullNullSupport();
this.sessionCluster=config.getSessionCluster();
this.clientCluster=config.getClientCluster();
this.sessionStorage=ci.getSessionStorage();
this.clientStorage=ci.getClientStorage();
this.triggerComponentDataMember=config.getTriggerComponentDataMember();
this.restSetting=config.getRestSetting();
this.javaSettings=new JavaSettingsImpl();
this.component=cfc;
initAntiSamyPolicyResource(pc);
if(antiSamyPolicyResource==null)
this.antiSamyPolicyResource=((ConfigImpl)config).getAntiSamyPolicy();
// read scope cascading
initScopeCascading();
initSameFieldAsArray(pc);
initWebCharset(pc);
=======
setClientCookies = config.isClientCookies();
setDomainCookies = config.isDomainCookies();
setSessionManagement = config.isSessionManagement();
setClientManagement = config.isClientManagement();
sessionTimeout = config.getSessionTimeout();
clientTimeout = config.getClientTimeout();
requestTimeout = config.getRequestTimeout();
applicationTimeout = config.getApplicationTimeout();
scriptProtect = config.getScriptProtect();
typeChecking = ci.getTypeChecking();
allowCompression = ci.allowCompression();
this.defaultDataSource = config.getDefaultDataSource();
this.localMode = config.getLocalMode();
this.locale = config.getLocale();
this.timeZone = config.getTimeZone();
this.webCharset = ci.getWebCharSet();
this.resourceCharset = ci.getResourceCharSet();
this.bufferOutput = ci.getBufferOutput();
suppressContent = ci.isSuppressContent();
this.sessionType = config.getSessionType();
this.wstype = WS_TYPE_AXIS1;
this.cgiScopeReadonly = ci.getCGIScopeReadonly();
this.sessionCluster = config.getSessionCluster();
this.clientCluster = config.getClientCluster();
this.sessionStorage = ci.getSessionStorage();
this.clientStorage = ci.getClientStorage();
this.triggerComponentDataMember = config.getTriggerComponentDataMember();
this.restSetting = config.getRestSetting();
this.javaSettings = new JavaSettingsImpl();
this.component = cfc;
initAntiSamyPolicyResource(pc);
if(antiSamyPolicyResource == null)
this.antiSamyPolicyResource = ((ConfigImpl)config).getAntiSamyPolicy();
// read scope cascading
initScopeCascading();
initSameFieldAsArray(pc);
initWebCharset(pc);
>>>>>>>
setClientCookies=config.isClientCookies();
setDomainCookies=config.isDomainCookies();
setSessionManagement=config.isSessionManagement();
setClientManagement=config.isClientManagement();
sessionTimeout=config.getSessionTimeout();
clientTimeout=config.getClientTimeout();
requestTimeout=config.getRequestTimeout();
applicationTimeout=config.getApplicationTimeout();
scriptProtect=config.getScriptProtect();
typeChecking=ci.getTypeChecking();
allowCompression=ci.allowCompression();
this.defaultDataSource=config.getDefaultDataSource();
this.localMode=config.getLocalMode();
this.locale=config.getLocale();
this.timeZone=config.getTimeZone();
this.webCharset=ci.getWebCharSet();
this.resourceCharset=ci.getResourceCharSet();
this.bufferOutput=ci.getBufferOutput();
suppressContent=ci.isSuppressContent();
this.sessionType=config.getSessionType();
this.wstype=WS_TYPE_AXIS1;
this.cgiScopeReadonly=ci.getCGIScopeReadonly();
this.fullNullSupport=ci.getFullNullSupport();
this.sessionCluster=config.getSessionCluster();
this.clientCluster=config.getClientCluster();
this.sessionStorage=ci.getSessionStorage();
this.clientStorage=ci.getClientStorage();
this.triggerComponentDataMember=config.getTriggerComponentDataMember();
this.restSetting=config.getRestSetting();
this.javaSettings=new JavaSettingsImpl();
this.component=cfc;
initAntiSamyPolicyResource(pc);
if(antiSamyPolicyResource==null)
this.antiSamyPolicyResource=((ConfigImpl)config).getAntiSamyPolicy();
// read scope cascading
initScopeCascading();
initSameFieldAsArray(pc);
initWebCharset(pc);
<<<<<<<
@Override
public boolean getFullNullSupport() {
if(!initFullNullSupport) {
Boolean b = Caster.toBoolean(get(component,NULL_SUPPORT,null),null);
if(b==null) b = Caster.toBoolean(get(component,ENABLE_NULL_SUPPORT,null),null);
if(b!=null) fullNullSupport=b.booleanValue();
initFullNullSupport=true;
}
return fullNullSupport;
}
@Override
public void setFullNullSupport(boolean fullNullSupport) {
this.fullNullSupport=fullNullSupport;
this.initFullNullSupport=true;
}
=======
>>>>>>>
@Override
public boolean getFullNullSupport() {
if(!initFullNullSupport) {
Boolean b = Caster.toBoolean(get(component,NULL_SUPPORT,null),null);
if(b==null) b = Caster.toBoolean(get(component,ENABLE_NULL_SUPPORT,null),null);
if(b!=null) fullNullSupport=b.booleanValue();
initFullNullSupport=true;
}
return fullNullSupport;
}
@Override
public void setFullNullSupport(boolean fullNullSupport) {
this.fullNullSupport=fullNullSupport;
this.initFullNullSupport=true;
} |
<<<<<<<
@Override
public java.util.Collection<Key> getLogNames() {
if(logs==null) return new HashSet<Collection.Key>();
return logs.keySet();
}
@Override
public void setLoggers(Map<Key, Pair<Log,Struct>> logs) {
this.logs=logs;
}
@Override
public Log getLog(String name) {
if(logs==null) return null;
Pair<Log, Struct> pair = logs.get(KeyImpl.init(StringUtil.emptyIfNull(name)));
if(pair==null) return null;
return pair.getName();
}
@Override
public Struct getLogMetaData(String name) {
if(logs==null) return null;
Pair<Log, Struct> pair = logs.get(KeyImpl.init(StringUtil.emptyIfNull(name)));
if(pair==null) return null;
return (Struct)pair.getValue().duplicate(false);
}
=======
@Override
public boolean deepThread() {
return false;
}
>>>>>>>
@Override
public java.util.Collection<Key> getLogNames() {
if(logs==null) return new HashSet<Collection.Key>();
return logs.keySet();
}
@Override
public void setLoggers(Map<Key, Pair<Log,Struct>> logs) {
this.logs=logs;
}
@Override
public Log getLog(String name) {
if(logs==null) return null;
Pair<Log, Struct> pair = logs.get(KeyImpl.init(StringUtil.emptyIfNull(name)));
if(pair==null) return null;
return pair.getName();
}
@Override
public Struct getLogMetaData(String name) {
if(logs==null) return null;
Pair<Log, Struct> pair = logs.get(KeyImpl.init(StringUtil.emptyIfNull(name)));
if(pair==null) return null;
return (Struct)pair.getValue().duplicate(false);
}
@Override
public boolean deepThread() {
return false;
} |
<<<<<<<
public abstract lucee.runtime.net.mail.Server[] getMailServers();
public abstract void setMailServers(lucee.runtime.net.mail.Server[] servers);
public abstract void setLoggers(Map<Key, Pair<Log,Struct>> logs);
public abstract java.util.Collection<Collection.Key> getLogNames();
public abstract Log getLog(String name);
public abstract Struct getLogMetaData(String string);
=======
public abstract boolean deepThread();
>>>>>>>
public abstract lucee.runtime.net.mail.Server[] getMailServers();
public abstract void setMailServers(lucee.runtime.net.mail.Server[] servers);
public abstract void setLoggers(Map<Key, Pair<Log,Struct>> logs);
public abstract java.util.Collection<Collection.Key> getLogNames();
public abstract Log getLog(String name);
public abstract Struct getLogMetaData(String string);
public abstract boolean deepThread(); |
<<<<<<<
Struct wssettings=new StructImpl();
wssettings.setEL(KeyConstants._type, AppListenerUtil.toWSType(ac.getWSType(),((ConfigImpl)ThreadLocalPageContext.getConfig(pc)).getWSHandler().getTypeAsString()));
=======
Struct wssettings=new StructImpl(Struct.TYPE_LINKED);
wssettings.put(KeyConstants._type, AppListenerUtil.toWSType(ac.getWSType(),"Axis1"));
>>>>>>>
Struct wssettings=new StructImpl(Struct.TYPE_LINKED);
wssettings.setEL(KeyConstants._type, AppListenerUtil.toWSType(ac.getWSType(),((ConfigImpl)ThreadLocalPageContext.getConfig(pc)).getWSHandler().getTypeAsString())); |
<<<<<<<
throw new ClassNotFoundException("Class [" + name + "] is invalid or doesn't exist");
=======
throw new ClassNotFoundException("class " + name + " is invalid or doesn't exist", e);
>>>>>>>
throw new ClassNotFoundException("Class [" + name + "] is invalid or doesn't exist", e); |
<<<<<<<
import net.imagej.ops.special.UnaryComputerOp;
import net.imagej.ops.special.UnaryFunctionOp;
import net.imglib2.IterableInterval;
=======
import net.imagej.ops.special.computer.UnaryComputerOp;
import net.imagej.ops.special.function.UnaryFunctionOp;
>>>>>>>
import net.imagej.ops.special.computer.UnaryComputerOp;
import net.imagej.ops.special.function.UnaryFunctionOp;
import net.imglib2.IterableInterval; |
<<<<<<<
private void addSectionSpecificContent(SectionSpecificContentObject sectionSpecificContentObject,
GetCapabilitiesRequest request) throws OwsExceptionReport {
String verion = sectionSpecificContentObject.getGetCapabilitiesResponse().getVersion();
=======
private void addSectionSpecificContent(final SectionSpecificContentObject sectionSpecificContentObject,
GetCapabilitiesRequest request) throws OwsExceptionReport {
String version = sectionSpecificContentObject.getGetCapabilitiesResponse().getVersion();
>>>>>>>
private void addSectionSpecificContent(SectionSpecificContentObject sectionSpecificContentObject,
GetCapabilitiesRequest request) throws OwsExceptionReport {
String version = sectionSpecificContentObject.getGetCapabilitiesResponse().getVersion();
<<<<<<<
sectionSpecificContentObject.getSosCapabilities()
.setServiceIdentification(getServiceIdentification(request, service, verion));
=======
sectionSpecificContentObject.getSosCapabilities().setServiceIdentification(
getServiceIdentification(request, version));
>>>>>>>
sectionSpecificContentObject.getSosCapabilities()
.setServiceIdentification(getServiceIdentification(request, service, version));
<<<<<<<
sectionSpecificContentObject.getSosCapabilities()
.setOperationsMetadata(getOperationsMetadataForOperations(request, service, verion));
=======
sectionSpecificContentObject.getSosCapabilities().setOperationsMetadata(
getOperationsMetadataForOperations(request, service, version));
>>>>>>>
sectionSpecificContentObject.getSosCapabilities()
.setOperationsMetadata(getOperationsMetadataForOperations(request, service, version));
<<<<<<<
sectionSpecificContentObject.getSosCapabilities().setExtensions(getAndMergeExtensions(service, verion));
=======
sectionSpecificContentObject.getSosCapabilities().setExensions(getAndMergeExtensions(service, version));
>>>>>>>
sectionSpecificContentObject.getSosCapabilities().setExtensions(getAndMergeExtensions(service, version));
<<<<<<<
sectionSpecificContentObject.getSosCapabilities().setExtensions(
getExtensions(sectionSpecificContentObject.getRequestedExtensionSesctions(), service, verion));
=======
sectionSpecificContentObject.getSosCapabilities().setExensions(
getExtensions(sectionSpecificContentObject.getRequestedExtensionSesctions(), service, version));
>>>>>>>
sectionSpecificContentObject.getSosCapabilities().setExtensions(
getExtensions(sectionSpecificContentObject.getRequestedExtensionSesctions(), service, version)); |
<<<<<<<
import lucee.runtime.engine.ThreadLocalPageContext;
=======
import lucee.runtime.exp.ApplicationException;
import lucee.runtime.exp.FunctionException;
>>>>>>>
import lucee.runtime.engine.ThreadLocalPageContext;
import lucee.runtime.exp.ApplicationException;
import lucee.runtime.exp.FunctionException;
<<<<<<<
public class GetApplicationSettings {
public static Struct call(PageContext pc) throws PageException {
=======
public class GetApplicationSettings extends BIF {
public static Struct call(PageContext pc) {
>>>>>>>
public class GetApplicationSettings extends BIF {
public static Struct call(PageContext pc) throws PageException { |
<<<<<<<
import de.danoeh.antennapod.core.BuildConfig;
import de.danoeh.antennapod.core.ClientConfig;
import de.danoeh.antennapod.core.asynctask.FlattrClickWorker;
import de.danoeh.antennapod.core.feed.*;
import de.danoeh.antennapod.core.preferences.GpodnetPreferences;
import de.danoeh.antennapod.core.preferences.PlaybackPreferences;
import de.danoeh.antennapod.core.preferences.UserPreferences;
import de.danoeh.antennapod.core.service.download.DownloadStatus;
import de.danoeh.antennapod.core.service.playback.PlaybackService;
import de.danoeh.antennapod.core.util.QueueAccess;
import de.danoeh.antennapod.core.util.flattr.FlattrStatus;
import de.danoeh.antennapod.core.util.flattr.FlattrThing;
import de.danoeh.antennapod.core.util.flattr.SimpleFlattrThing;
=======
>>>>>>> |
<<<<<<<
Cursor c = db.query(TABLE_NAME_FEEDS, null, KEY_LASTUPDATE + " < " + String.valueOf(System.currentTimeMillis() - expirationTime),
null, null, null,
=======
Cursor c = db.query(TABLE_NAME_FEEDS, FEED_SEL_STD, "?<?", new String[]{
KEY_LASTUPDATE, String.valueOf(System.currentTimeMillis() - expirationTime)}, null, null,
>>>>>>>
Cursor c = db.query(TABLE_NAME_FEEDS, FEED_SEL_STD, KEY_LASTUPDATE + " < " + String.valueOf(System.currentTimeMillis() - expirationTime),
null, null, null, |
<<<<<<<
=======
import com.bumptech.glide.Glide;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.Validate;
import java.util.List;
>>>>>>>
import com.bumptech.glide.Glide;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.Validate;
import java.util.List;
<<<<<<<
import java.util.List;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.Validate;
=======
import rx.Observable;
import rx.Subscription;
import rx.android.schedulers.AndroidSchedulers;
import rx.schedulers.Schedulers;
>>>>>>>
import rx.Observable;
import rx.Subscription;
import rx.android.schedulers.AndroidSchedulers;
import rx.schedulers.Schedulers;
<<<<<<<
case SubscriptionFragment.TAG:
SubscriptionFragment subscriptionFragment = new SubscriptionFragment();
subscriptionFragment.setItemAccess(itemAccess);
fragment = subscriptionFragment;
break;
=======
default:
// default to the queue
tag = QueueFragment.TAG;
fragment = new QueueFragment();
args = null;
break;
>>>>>>>
case SubscriptionFragment.TAG:
SubscriptionFragment subscriptionFragment = new SubscriptionFragment();
subscriptionFragment.setItemAccess(itemAccess);
fragment = subscriptionFragment;
break;
default:
// default to the queue
tag = QueueFragment.TAG;
fragment = new QueueFragment();
args = null;
break;
<<<<<<<
public void onEvent(SubscriptionFragment.SubscriptionEvent event){
loadFeedFragment(event.feed);
}
=======
public void onEventMainThread(ProgressEvent event) {
Log.d(TAG, "onEvent(" + event + ")");
switch(event.action) {
case START:
pd = new ProgressDialog(this);
pd.setMessage(event.message);
pd.setIndeterminate(true);
pd.setCancelable(false);
pd.show();
break;
case END:
if(pd != null) {
pd.dismiss();
}
break;
}
}
>>>>>>>
public void onEvent(SubscriptionFragment.SubscriptionEvent event) {
loadFeedFragment(event.feed);
}
public void onEventMainThread(ProgressEvent event) {
Log.d(TAG, "onEvent(" + event + ")");
switch (event.action) {
case START:
pd = new ProgressDialog(this);
pd.setMessage(event.message);
pd.setIndeterminate(true);
pd.setCancelable(false);
pd.show();
break;
case END:
if (pd != null) {
pd.dismiss();
}
break;
}
} |
<<<<<<<
=======
import android.os.AsyncTask;
>>>>>>>
import android.os.AsyncTask;
<<<<<<<
import android.support.v7.app.ActionBarActivity;
import android.view.*;
=======
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
>>>>>>>
import android.support.v7.app.ActionBarActivity;
import android.view.*;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
<<<<<<<
=======
import com.actionbarsherlock.app.SherlockListActivity;
import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuItem;
>>>>>>>
<<<<<<<
public class OrganizeQueueActivity extends ActionBarActivity implements
=======
import java.util.List;
public class OrganizeQueueActivity extends SherlockListActivity implements
>>>>>>>
import java.util.List;
public class OrganizeQueueActivity extends ActionBarActivity implements
<<<<<<<
adapter = new OrganizeAdapter(this);
listView.setAdapter(adapter);
=======
loadData();
>>>>>>>
loadData();
<<<<<<<
FeedManager manager = FeedManager.getInstance();
FeedItem item = (FeedItem) listView.getAdapter().getItem(which);
manager.removeQueueItem(OrganizeQueueActivity.this, item, false);
=======
FeedItem item = (FeedItem) getListAdapter().getItem(which);
DBWriter.removeQueueItem(OrganizeQueueActivity.this, item.getId(), true);
>>>>>>>
FeedItem item = (FeedItem) listView.getAdapter().getItem(which);
DBWriter.removeQueueItem(OrganizeQueueActivity.this, item.getId(), true); |
<<<<<<<
if (drawerItem.type == NavDrawerData.DrawerItem.Type.FEED) {
Feed feed = ((NavDrawerData.FeedDrawerItem) drawerItem).feed;
boolean textAndImageCombined = feed.isLocalFeed()
&& LocalFeedUpdater.getDefaultIconUrl(convertView.getContext()).equals(feed.getImageUrl());
new CoverLoader(mainActivityRef.get())
.withUri(feed.getImageLocation())
.withPlaceholderView(holder.feedTitle, textAndImageCombined)
.withCoverView(holder.imageView)
.load();
} else {
new CoverLoader(mainActivityRef.get())
.withResource(ThemeUtils.getDrawableFromAttr(mainActivityRef.get(), R.attr.ic_folder))
.withPlaceholderView(holder.feedTitle, true)
.withCoverView(holder.imageView)
.load();
}
=======
boolean textAndImageCombined = feed.isLocalFeed()
&& LocalFeedUpdater.getDefaultIconUrl(convertView.getContext()).equals(feed.getImageUrl());
new CoverLoader(mainActivityRef.get())
.withUri(feed.getImageUrl())
.withPlaceholderView(holder.feedTitle, textAndImageCombined)
.withCoverView(holder.imageView)
.load();
>>>>>>>
if (drawerItem.type == NavDrawerData.DrawerItem.Type.FEED) {
Feed feed = ((NavDrawerData.FeedDrawerItem) drawerItem).feed;
boolean textAndImageCombined = feed.isLocalFeed()
&& LocalFeedUpdater.getDefaultIconUrl(convertView.getContext()).equals(feed.getImageUrl());
new CoverLoader(mainActivityRef.get())
.withUri(feed.getImageUrl())
.withPlaceholderView(holder.feedTitle, textAndImageCombined)
.withCoverView(holder.imageView)
.load();
} else {
new CoverLoader(mainActivityRef.get())
.withResource(ThemeUtils.getDrawableFromAttr(mainActivityRef.get(), R.attr.ic_folder))
.withPlaceholderView(holder.feedTitle, true)
.withCoverView(holder.imageView)
.load();
} |
<<<<<<<
public static void loadChaptersFromStreamUrl(Playable media, Context context) {
ChapterUtils.readID3ChaptersFromPlayableStreamUrl(media, context);
if (media.getChapters() == null) {
ChapterUtils.readOggChaptersFromPlayableStreamUrl(media, context);
=======
public static List<Chapter> loadChaptersFromStreamUrl(Playable media) {
List<Chapter> chapters = ChapterUtils.readID3ChaptersFromPlayableStreamUrl(media);
if (chapters == null) {
chapters = ChapterUtils.readOggChaptersFromPlayableStreamUrl(media);
>>>>>>>
public static List<Chapter> loadChaptersFromStreamUrl(Playable media, Context context) {
List<Chapter> chapters = ChapterUtils.readID3ChaptersFromPlayableStreamUrl(media, context);
if (chapters == null) {
chapters = ChapterUtils.readOggChaptersFromPlayableStreamUrl(media, context);
<<<<<<<
private static void readID3ChaptersFromPlayableStreamUrl(Playable p, Context context) {
=======
private static List<Chapter> readID3ChaptersFromPlayableStreamUrl(Playable p) {
>>>>>>>
private static List<Chapter> readID3ChaptersFromPlayableStreamUrl(Playable p, Context context) {
<<<<<<<
private static void readOggChaptersFromPlayableStreamUrl(Playable media, Context context) {
=======
private static List<Chapter> readOggChaptersFromPlayableStreamUrl(Playable media) {
>>>>>>>
private static List<Chapter> readOggChaptersFromPlayableStreamUrl(Playable media, Context context) { |
<<<<<<<
/**
* If the PlaybackService receives this action, it will try to apply the supplied volume reduction setting.
*/
public static final String ACTION_VOLUME_REDUCTION_CHANGED = "action.de.danoeh.antennapod.core.service.volumedReductionChanged";
public static final String EXTRA_VOLUME_REDUCTION_SETTING = "PlaybackService.VolumeReductionSettingExtra";
public static final String EXTRA_VOLUME_REDUCTION_AFFECTED_FEED = "PlaybackService.VolumeReductionSettingAffectedFeed";
/**
* If the PlaybackService receives this action, it will resume playback.
*/
public static final String ACTION_RESUME_PLAY_CURRENT_EPISODE = "action.de.danoeh.antennapod.core.service.resumePlayCurrentEpisode";
=======
>>>>>>>
/**
* If the PlaybackService receives this action, it will try to apply the supplied volume reduction setting.
*/
public static final String ACTION_VOLUME_REDUCTION_CHANGED = "action.de.danoeh.antennapod.core.service.volumedReductionChanged";
public static final String EXTRA_VOLUME_REDUCTION_SETTING = "PlaybackService.VolumeReductionSettingExtra";
public static final String EXTRA_VOLUME_REDUCTION_AFFECTED_FEED = "PlaybackService.VolumeReductionSettingAffectedFeed";
<<<<<<<
registerReceiver(pauseResumeCurrentEpisodeReceiver, new IntentFilter(ACTION_RESUME_PLAY_CURRENT_EPISODE));
registerReceiver(volumeReductionChangedReceiver, new IntentFilter(ACTION_VOLUME_REDUCTION_CHANGED));
=======
>>>>>>>
registerReceiver(volumeReductionChangedReceiver, new IntentFilter(ACTION_VOLUME_REDUCTION_CHANGED)); |
<<<<<<<
import de.danoeh.antennapod.dialog.VariableSpeedDialog;
=======
import de.danoeh.antennapod.dialog.AuthenticationDialog;
import de.danoeh.antennapod.preferences.GpodnetPreferences;
>>>>>>>
import de.danoeh.antennapod.dialog.AuthenticationDialog;
import de.danoeh.antennapod.dialog.VariableSpeedDialog;
import de.danoeh.antennapod.preferences.GpodnetPreferences;
<<<<<<<
private static final String PREF_PLAYBACK_SPEED_LAUNCHER = "prefPlaybackSpeedLauncher";
=======
private static final String PREF_GPODNET_LOGIN = "pref_gpodnet_authenticate";
private static final String PREF_GPODNET_SETLOGIN_INFORMATION = "pref_gpodnet_setlogin_information";
private static final String PREF_GPODNET_LOGOUT = "pref_gpodnet_logout";
>>>>>>>
private static final String PREF_PLAYBACK_SPEED_LAUNCHER = "prefPlaybackSpeedLauncher";
private static final String PREF_GPODNET_LOGIN = "pref_gpodnet_authenticate";
private static final String PREF_GPODNET_SETLOGIN_INFORMATION = "pref_gpodnet_setlogin_information";
private static final String PREF_GPODNET_LOGOUT = "pref_gpodnet_logout";
<<<<<<<
findPreference(PREF_PLAYBACK_SPEED_LAUNCHER)
.setOnPreferenceClickListener(new OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
VariableSpeedDialog.showDialog(PreferenceActivity.this);
return true;
}
});
=======
findPreference(PREF_GPODNET_SETLOGIN_INFORMATION).setOnPreferenceClickListener(new OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
AuthenticationDialog dialog = new AuthenticationDialog(PreferenceActivity.this,
R.string.pref_gpodnet_setlogin_information_title, false, false, GpodnetPreferences.getUsername(),
null) {
@Override
protected void onConfirmed(String username, String password, boolean saveUsernamePassword) {
GpodnetPreferences.setPassword(password);
}
};
dialog.show();
return true;
}
});
findPreference(PREF_GPODNET_LOGOUT).setOnPreferenceClickListener(new OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
GpodnetPreferences.logout();
Toast toast = Toast.makeText(PreferenceActivity.this, R.string.pref_gpodnet_logout_toast, Toast.LENGTH_SHORT);
toast.show();
updateGpodnetPreferenceScreen();
return true;
}
});
>>>>>>>
findPreference(PREF_PLAYBACK_SPEED_LAUNCHER)
.setOnPreferenceClickListener(new OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
VariableSpeedDialog.showDialog(PreferenceActivity.this);
return true;
}
});
findPreference(PREF_GPODNET_SETLOGIN_INFORMATION).setOnPreferenceClickListener(new OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
AuthenticationDialog dialog = new AuthenticationDialog(PreferenceActivity.this,
R.string.pref_gpodnet_setlogin_information_title, false, false, GpodnetPreferences.getUsername(),
null) {
@Override
protected void onConfirmed(String username, String password, boolean saveUsernamePassword) {
GpodnetPreferences.setPassword(password);
}
};
dialog.show();
return true;
}
});
findPreference(PREF_GPODNET_LOGOUT).setOnPreferenceClickListener(new OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
GpodnetPreferences.logout();
Toast toast = Toast.makeText(PreferenceActivity.this, R.string.pref_gpodnet_logout_toast, Toast.LENGTH_SHORT);
toast.show();
updateGpodnetPreferenceScreen();
return true;
}
}); |
<<<<<<<
import net.imagej.ops.create.CreateOps;
=======
import net.imagej.ImgPlus;
import net.imagej.ops.chunker.Chunk;
import net.imagej.ops.convert.ConvertPix;
import net.imagej.ops.deconvolve.DeconvolveNamespace;
>>>>>>>
import net.imagej.ImgPlus;
import net.imagej.ops.chunker.Chunk;
import net.imagej.ops.convert.ConvertPix;
import net.imagej.ops.create.CreateOps;
import net.imagej.ops.deconvolve.DeconvolveNamespace;
<<<<<<<
=======
import net.imagej.ops.threshold.local.LocalThresholdMethod;
import net.imglib2.Dimensions;
import net.imglib2.Interval;
import net.imglib2.IterableInterval;
import net.imglib2.RandomAccessible;
import net.imglib2.RandomAccessibleInterval;
import net.imglib2.algorithm.neighborhood.Shape;
import net.imglib2.histogram.Histogram1d;
import net.imglib2.img.Img;
import net.imglib2.img.ImgFactory;
import net.imglib2.interpolation.InterpolatorFactory;
import net.imglib2.labeling.Labeling;
import net.imglib2.outofbounds.OutOfBoundsFactory;
import net.imglib2.type.NativeType;
import net.imglib2.type.Type;
import net.imglib2.type.logic.BitType;
import net.imglib2.type.numeric.ComplexType;
import net.imglib2.type.numeric.RealType;
import net.imglib2.type.numeric.complex.ComplexFloatType;
import net.imglib2.type.numeric.integer.LongType;
import net.imglib2.type.numeric.real.DoubleType;
>>>>>>>
import net.imagej.ops.threshold.local.LocalThresholdMethod;
import net.imglib2.Interval;
import net.imglib2.IterableInterval;
import net.imglib2.RandomAccessible;
import net.imglib2.RandomAccessibleInterval;
import net.imglib2.algorithm.neighborhood.Shape;
import net.imglib2.histogram.Histogram1d;
import net.imglib2.img.Img;
import net.imglib2.img.ImgFactory;
import net.imglib2.interpolation.InterpolatorFactory;
import net.imglib2.outofbounds.OutOfBoundsFactory;
import net.imglib2.type.NativeType;
import net.imglib2.type.Type;
import net.imglib2.type.logic.BitType;
import net.imglib2.type.numeric.ComplexType;
import net.imglib2.type.numeric.RealType;
import net.imglib2.type.numeric.complex.ComplexFloatType;
import net.imglib2.type.numeric.integer.LongType;
import net.imglib2.type.numeric.real.DoubleType;
<<<<<<<
/** Executes the "create" operation on the given arguments. */
@OpMethod(op = Ops.Create.class)
Object create(Object... args);
=======
/** Executes the "correlate" operation on the given arguments. */
@OpMethod(op = net.imagej.ops.convolve.CorrelateFFTImg.class)
<I extends RealType<I>, O extends RealType<O>, K extends RealType<K>, C extends ComplexType<C>>
Img<O> correlate(final Img<I> in, final RandomAccessibleInterval<K> kernel);
/** Executes the "correlate" operation on the given arguments. */
@OpMethod(op = net.imagej.ops.convolve.CorrelateFFTImg.class)
<I extends RealType<I>, O extends RealType<O>, K extends RealType<K>, C extends ComplexType<C>>
Img<O> correlate(final Img<O> out, final Img<I> in,
final RandomAccessibleInterval<K> kernel);
/** Executes the "correlate" operation on the given arguments. */
@OpMethod(op = net.imagej.ops.convolve.CorrelateFFTImg.class)
<I extends RealType<I>, O extends RealType<O>, K extends RealType<K>, C extends ComplexType<C>>
Img<O> correlate(final Img<O> out, final Img<I> in,
final RandomAccessibleInterval<K> kernel, final long... borderSize);
/** Executes the "correlate" operation on the given arguments. */
@OpMethod(op = net.imagej.ops.convolve.CorrelateFFTImg.class)
<I extends RealType<I>, O extends RealType<O>, K extends RealType<K>, C extends ComplexType<C>>
Img<O> correlate(final Img<O> out, final Img<I> in,
final RandomAccessibleInterval<K> kernel, final long[] borderSize,
final OutOfBoundsFactory<I, RandomAccessibleInterval<I>> obfInput);
/** Executes the "correlate" operation on the given arguments. */
@OpMethod(op = net.imagej.ops.convolve.CorrelateFFTImg.class)
<I extends RealType<I>, O extends RealType<O>, K extends RealType<K>, C extends ComplexType<C>>
Img<O> correlate(final Img<O> out, final Img<I> in,
final RandomAccessibleInterval<K> kernel, final long[] borderSize,
final OutOfBoundsFactory<I, RandomAccessibleInterval<I>> obfInput,
final OutOfBoundsFactory<K, RandomAccessibleInterval<K>> obfKernel);
/** Executes the "correlate" operation on the given arguments. */
@OpMethod(op = net.imagej.ops.convolve.CorrelateFFTImg.class)
<I extends RealType<I>, O extends RealType<O>, K extends RealType<K>, C extends ComplexType<C>>
Img<O> correlate(final Img<O> out, final Img<I> in,
final RandomAccessibleInterval<K> kernel, final long[] borderSize,
final OutOfBoundsFactory<I, RandomAccessibleInterval<I>> obfInput,
final OutOfBoundsFactory<K, RandomAccessibleInterval<K>> obfKernel,
final Type<O> outType);
/** Executes the "correlate" operation on the given arguments. */
@OpMethod(op = net.imagej.ops.convolve.CorrelateFFTImg.class)
<I extends RealType<I>, O extends RealType<O>, K extends RealType<K>, C extends ComplexType<C>>
Img<O> correlate(final Img<O> out, final Img<I> in,
final RandomAccessibleInterval<K> kernel, final long[] borderSize,
final OutOfBoundsFactory<I, RandomAccessibleInterval<I>> obfInput,
final OutOfBoundsFactory<K, RandomAccessibleInterval<K>> obfKernel,
final Type<O> outType, final ImgFactory<O> outFactory);
/** Executes the "correlate" operation on the given arguments. */
@OpMethod(op = net.imagej.ops.convolve.CorrelateFFTImg.class)
<I extends RealType<I>, O extends RealType<O>, K extends RealType<K>, C extends ComplexType<C>>
Img<O> correlate(final Img<O> out, final Img<I> in,
final RandomAccessibleInterval<K> kernel, final long[] borderSize,
final OutOfBoundsFactory<I, RandomAccessibleInterval<I>> obfInput,
final OutOfBoundsFactory<K, RandomAccessibleInterval<K>> obfKernel,
final Type<O> outType, final ImgFactory<O> outFactory,
final ComplexType<C> fftType);
/** Executes the "correlate" operation on the given arguments. */
@OpMethod(op = net.imagej.ops.convolve.CorrelateFFTImg.class)
<I extends RealType<I>, O extends RealType<O>, K extends RealType<K>, C extends ComplexType<C>>
Img<O> correlate(final Img<O> out, final Img<I> in,
final RandomAccessibleInterval<K> kernel, final long[] borderSize,
final OutOfBoundsFactory<I, RandomAccessibleInterval<I>> obfInput,
final OutOfBoundsFactory<K, RandomAccessibleInterval<K>> obfKernel,
final Type<O> outType, final ImgFactory<O> outFactory,
final ComplexType<C> fftType, final ImgFactory<C> fftFactory);
/** Executes the "createimg" operation on the given arguments. */
@OpMethod(op = Ops.CreateImg.class)
Object createimg(Object... args);
/** Executes the "createimg" operation on the given arguments. */
@OpMethod(op = net.imagej.ops.create.CreateEmptyImgPlusCopy.class)
<V extends NativeType<V>> ImgPlus<V> createimg(ImgPlus<V> input);
/** Executes the "createimg" operation on the given arguments. */
@OpMethod(op = net.imagej.ops.create.CreateImgDifferentNativeType.class)
<V extends NativeType<V>> Img<V> createimg(Img<V> input, V type);
/** Executes the "createimg" operation on the given arguments. */
@OpMethod(op = net.imagej.ops.create.CreateImgNativeType.class)
<V extends NativeType<V>> Img<V> createimg(ImgFactory<V> fac, V outType,
Dimensions dims);
/** Executes the "createimg" operation on the given arguments. */
@OpMethod(op = net.imagej.ops.create.DefaultCreateImg.class)
<V extends Type<V>> Img<V> createimg(long... dims);
/** Executes the "createimg" operation on the given arguments. */
@OpMethod(op = net.imagej.ops.create.DefaultCreateImg.class)
<V extends Type<V>> Img<V> createimg(V outType, long... dims);
/** Executes the "createimg" operation on the given arguments. */
@OpMethod(op = net.imagej.ops.create.DefaultCreateImg.class)
<V extends Type<V>> Img<V> createimg(V outType, ImgFactory<V> fac,
long... dims);
/** Executes the "createimg" operation on the given arguments. */
@OpMethod(op = net.imagej.ops.create.CreateEmptyImgCopy.class)
<V extends NativeType<V>> Img<V> createimg(Img<V> input);
>>>>>>>
/** Executes the "correlate" operation on the given arguments. */
@OpMethod(op = net.imagej.ops.convolve.CorrelateFFTImg.class)
<I extends RealType<I>, O extends RealType<O>, K extends RealType<K>, C extends ComplexType<C>>
Img<O> correlate(final Img<I> in, final RandomAccessibleInterval<K> kernel);
/** Executes the "correlate" operation on the given arguments. */
@OpMethod(op = net.imagej.ops.convolve.CorrelateFFTImg.class)
<I extends RealType<I>, O extends RealType<O>, K extends RealType<K>, C extends ComplexType<C>>
Img<O> correlate(final Img<O> out, final Img<I> in,
final RandomAccessibleInterval<K> kernel);
/** Executes the "correlate" operation on the given arguments. */
@OpMethod(op = net.imagej.ops.convolve.CorrelateFFTImg.class)
<I extends RealType<I>, O extends RealType<O>, K extends RealType<K>, C extends ComplexType<C>>
Img<O> correlate(final Img<O> out, final Img<I> in,
final RandomAccessibleInterval<K> kernel, final long... borderSize);
/** Executes the "correlate" operation on the given arguments. */
@OpMethod(op = net.imagej.ops.convolve.CorrelateFFTImg.class)
<I extends RealType<I>, O extends RealType<O>, K extends RealType<K>, C extends ComplexType<C>>
Img<O> correlate(final Img<O> out, final Img<I> in,
final RandomAccessibleInterval<K> kernel, final long[] borderSize,
final OutOfBoundsFactory<I, RandomAccessibleInterval<I>> obfInput);
/** Executes the "correlate" operation on the given arguments. */
@OpMethod(op = net.imagej.ops.convolve.CorrelateFFTImg.class)
<I extends RealType<I>, O extends RealType<O>, K extends RealType<K>, C extends ComplexType<C>>
Img<O> correlate(final Img<O> out, final Img<I> in,
final RandomAccessibleInterval<K> kernel, final long[] borderSize,
final OutOfBoundsFactory<I, RandomAccessibleInterval<I>> obfInput,
final OutOfBoundsFactory<K, RandomAccessibleInterval<K>> obfKernel);
/** Executes the "correlate" operation on the given arguments. */
@OpMethod(op = net.imagej.ops.convolve.CorrelateFFTImg.class)
<I extends RealType<I>, O extends RealType<O>, K extends RealType<K>, C extends ComplexType<C>>
Img<O> correlate(final Img<O> out, final Img<I> in,
final RandomAccessibleInterval<K> kernel, final long[] borderSize,
final OutOfBoundsFactory<I, RandomAccessibleInterval<I>> obfInput,
final OutOfBoundsFactory<K, RandomAccessibleInterval<K>> obfKernel,
final Type<O> outType);
/** Executes the "correlate" operation on the given arguments. */
@OpMethod(op = net.imagej.ops.convolve.CorrelateFFTImg.class)
<I extends RealType<I>, O extends RealType<O>, K extends RealType<K>, C extends ComplexType<C>>
Img<O> correlate(final Img<O> out, final Img<I> in,
final RandomAccessibleInterval<K> kernel, final long[] borderSize,
final OutOfBoundsFactory<I, RandomAccessibleInterval<I>> obfInput,
final OutOfBoundsFactory<K, RandomAccessibleInterval<K>> obfKernel,
final Type<O> outType, final ImgFactory<O> outFactory);
/** Executes the "correlate" operation on the given arguments. */
@OpMethod(op = net.imagej.ops.convolve.CorrelateFFTImg.class)
<I extends RealType<I>, O extends RealType<O>, K extends RealType<K>, C extends ComplexType<C>>
Img<O> correlate(final Img<O> out, final Img<I> in,
final RandomAccessibleInterval<K> kernel, final long[] borderSize,
final OutOfBoundsFactory<I, RandomAccessibleInterval<I>> obfInput,
final OutOfBoundsFactory<K, RandomAccessibleInterval<K>> obfKernel,
final Type<O> outType, final ImgFactory<O> outFactory,
final ComplexType<C> fftType);
/** Executes the "correlate" operation on the given arguments. */
@OpMethod(op = net.imagej.ops.convolve.CorrelateFFTImg.class)
<I extends RealType<I>, O extends RealType<O>, K extends RealType<K>, C extends ComplexType<C>>
Img<O> correlate(final Img<O> out, final Img<I> in,
final RandomAccessibleInterval<K> kernel, final long[] borderSize,
final OutOfBoundsFactory<I, RandomAccessibleInterval<I>> obfInput,
final OutOfBoundsFactory<K, RandomAccessibleInterval<K>> obfKernel,
final Type<O> outType, final ImgFactory<O> outFactory,
final ComplexType<C> fftType, final ImgFactory<C> fftFactory);
/** Executes the "create" operation on the given arguments. */
@OpMethod(op = Ops.Create.class)
Object create(Object... args);
<<<<<<<
// -- CreateOps short-cuts --
/** Executes the "createimg" operation on the given arguments. */
@OpMethod(op = CreateOps.CreateImg.class)
Object createimg(Object... args);
/** Executes the "createimglabeling" operation on the given arguments. */
@OpMethod(op = CreateOps.CreateImgLabeling.class)
Object createimglabeling(Object... args);
/** Executes the "createimgfactory" operation on the given arguments. */
@OpMethod(op = CreateOps.CreateImgFactory.class)
Object createimgfactory(Object... args);
/** Executes the "createtype" operation. */
@OpMethod(op = CreateOps.CreateType.class)
Object createtype();
=======
/** Executes the "variance" operation on the given arguments. */
@OpMethod(ops = { net.imagej.ops.statistics.VarianceRealTypeDirect.class,
net.imagej.ops.statistics.VarianceRealType.class })
<T extends RealType<T>> DoubleType variance(final DoubleType out,
final Iterable<T> in);
/** Executes the "variance" operation on the given arguments. */
@OpMethod(op = net.imagej.ops.statistics.VarianceRealType.class)
<T extends RealType<T>> DoubleType variance(final DoubleType out,
final Iterable<T> in, final Moment2AboutMean<T> moment2);
>>>>>>>
/** Executes the "variance" operation on the given arguments. */
@OpMethod(ops = { net.imagej.ops.statistics.VarianceRealTypeDirect.class,
net.imagej.ops.statistics.VarianceRealType.class })
<T extends RealType<T>> DoubleType variance(final DoubleType out,
final Iterable<T> in);
/** Executes the "variance" operation on the given arguments. */
@OpMethod(op = net.imagej.ops.statistics.VarianceRealType.class)
<T extends RealType<T>> DoubleType variance(final DoubleType out,
final Iterable<T> in, final Moment2AboutMean<T> moment2);
// -- CreateOps short-cuts --
/** Executes the "createimg" operation on the given arguments. */
@OpMethod(op = CreateOps.CreateImg.class)
Object createimg(Object... args);
/** Executes the "createimglabeling" operation on the given arguments. */
@OpMethod(op = CreateOps.CreateImgLabeling.class)
Object createimglabeling(Object... args);
/** Executes the "createimgfactory" operation on the given arguments. */
@OpMethod(op = CreateOps.CreateImgFactory.class)
Object createimgfactory(Object... args);
/** Executes the "createtype" operation. */
@OpMethod(op = CreateOps.CreateType.class)
Object createtype();
<<<<<<<
=======
/** Gateway into ops of the "deconvolve" namespace. */
DeconvolveNamespace deconvolve();
// -- Deprecated methods --
/** @deprecated Use {@link #createimg} instead. */
@Deprecated
Object create(Object... args);
>>>>>>>
/** Gateway into ops of the "deconvolve" namespace. */
DeconvolveNamespace deconvolve(); |
<<<<<<<
private AutoDeleteAction autoDeleteAction;
=======
>>>>>>>
<<<<<<<
this.tags.addAll(tags);
=======
this.showEpisodeNotification = showEpisodeNotification;
>>>>>>>
this.showEpisodeNotification = showEpisodeNotification;
this.tags.addAll(tags);
<<<<<<<
int indexTags = cursor.getColumnIndex(PodDBAdapter.KEY_FEED_TAGS);
=======
int indexEpisodeNotification = cursor.getColumnIndex(PodDBAdapter.KEY_EPISODE_NOTIFICATION);
>>>>>>>
int indexEpisodeNotification = cursor.getColumnIndex(PodDBAdapter.KEY_EPISODE_NOTIFICATION);
int indexTags = cursor.getColumnIndex(PodDBAdapter.KEY_FEED_TAGS);
<<<<<<<
String tagsString = cursor.getString(indexTags);
if (TextUtils.isEmpty(tagsString)) {
tagsString = TAG_ROOT;
}
=======
boolean showNotification = cursor.getInt(indexEpisodeNotification) > 0;
>>>>>>>
boolean showNotification = cursor.getInt(indexEpisodeNotification) > 0;
String tagsString = cursor.getString(indexTags);
if (TextUtils.isEmpty(tagsString)) {
tagsString = TAG_ROOT;
}
<<<<<<<
feedAutoSkipEnding,
new HashSet<>(Arrays.asList(tagsString.split(TAG_SEPARATOR))));
=======
feedAutoSkipEnding,
showNotification
);
>>>>>>>
feedAutoSkipEnding,
showNotification,
new HashSet<>(Arrays.asList(tagsString.split(TAG_SEPARATOR))));
<<<<<<<
public void setAutoDeleteAction(AutoDeleteAction auto_delete_action) {
this.autoDeleteAction = auto_delete_action;
=======
public void setAutoDeleteAction(AutoDeleteAction autoDeleteAction) {
this.autoDeleteAction = autoDeleteAction;
>>>>>>>
public void setAutoDeleteAction(AutoDeleteAction autoDeleteAction) {
this.autoDeleteAction = autoDeleteAction;
<<<<<<<
public Set<String> getTags() {
return tags;
}
public String getTagsAsString() {
return TextUtils.join(TAG_SEPARATOR, tags);
}
=======
/**
* getter for preference if notifications should be display for new episodes.
* @return true for displaying notifications
*/
public boolean getShowEpisodeNotification() {
return showEpisodeNotification;
}
public void setShowEpisodeNotification(boolean showEpisodeNotification) {
this.showEpisodeNotification = showEpisodeNotification;
}
>>>>>>>
public Set<String> getTags() {
return tags;
}
public String getTagsAsString() {
return TextUtils.join(TAG_SEPARATOR, tags);
}
/**
* getter for preference if notifications should be display for new episodes.
* @return true for displaying notifications
*/
public boolean getShowEpisodeNotification() {
return showEpisodeNotification;
}
public void setShowEpisodeNotification(boolean showEpisodeNotification) {
this.showEpisodeNotification = showEpisodeNotification;
} |
<<<<<<<
public static final String PREF_PAUSE_PLAYBACK_FOR_FOCUS_LOSS = "prefPauseForFocusLoss";
=======
private static final String PREF_PLAYBACK_SPEED = "prefPlaybackSpeed";
private static final String PREF_PLAYBACK_SPEED_ARRAY = "prefPlaybackSpeedArray";
>>>>>>>
private static final String PREF_PLAYBACK_SPEED = "prefPlaybackSpeed";
private static final String PREF_PLAYBACK_SPEED_ARRAY = "prefPlaybackSpeedArray";
public static final String PREF_PAUSE_PLAYBACK_FOR_FOCUS_LOSS = "prefPauseForFocusLoss";
<<<<<<<
private boolean pauseForFocusLoss;
=======
private String playbackSpeed;
private String[] playbackSpeedArray;
>>>>>>>
private String playbackSpeed;
private String[] playbackSpeedArray;
private boolean pauseForFocusLoss;
<<<<<<<
pauseForFocusLoss = sp.getBoolean(PREF_PAUSE_PLAYBACK_FOR_FOCUS_LOSS, false);
=======
playbackSpeed = sp.getString(PREF_PLAYBACK_SPEED, "1.0");
playbackSpeedArray = readPlaybackSpeedArray(sp.getString(
PREF_PLAYBACK_SPEED_ARRAY, null));
>>>>>>>
playbackSpeed = sp.getString(PREF_PLAYBACK_SPEED, "1.0");
playbackSpeedArray = readPlaybackSpeedArray(sp.getString(
PREF_PLAYBACK_SPEED_ARRAY, null));
pauseForFocusLoss = sp.getBoolean(PREF_PAUSE_PLAYBACK_FOR_FOCUS_LOSS, false);
<<<<<<<
} else if (key.equals(PREF_PAUSE_PLAYBACK_FOR_FOCUS_LOSS)) {
pauseForFocusLoss = sp.getBoolean(PREF_PAUSE_PLAYBACK_FOR_FOCUS_LOSS, false);
=======
} else if (key.equals(PREF_PLAYBACK_SPEED)) {
playbackSpeed = sp.getString(PREF_PLAYBACK_SPEED, "1.0");
} else if (key.equals(PREF_PLAYBACK_SPEED_ARRAY)) {
playbackSpeedArray = readPlaybackSpeedArray(sp.getString(
PREF_PLAYBACK_SPEED_ARRAY, null));
}
}
public static void setPlaybackSpeed(String speed) {
PreferenceManager.getDefaultSharedPreferences(instance.context).edit()
.putString(PREF_PLAYBACK_SPEED, speed).apply();
}
public static void setPlaybackSpeedArray(String[] speeds) {
JSONArray jsonArray = new JSONArray();
for (String speed : speeds) {
jsonArray.put(speed);
>>>>>>>
} else if (key.equals(PREF_PLAYBACK_SPEED)) {
playbackSpeed = sp.getString(PREF_PLAYBACK_SPEED, "1.0");
} else if (key.equals(PREF_PLAYBACK_SPEED_ARRAY)) {
playbackSpeedArray = readPlaybackSpeedArray(sp.getString(
PREF_PLAYBACK_SPEED_ARRAY, null));
} else if (key.equals(PREF_PAUSE_PLAYBACK_FOR_FOCUS_LOSS)) {
pauseForFocusLoss = sp.getBoolean(PREF_PAUSE_PLAYBACK_FOR_FOCUS_LOSS, false);
}
}
public static void setPlaybackSpeed(String speed) {
PreferenceManager.getDefaultSharedPreferences(instance.context).edit()
.putString(PREF_PLAYBACK_SPEED, speed).apply();
}
public static void setPlaybackSpeedArray(String[] speeds) {
JSONArray jsonArray = new JSONArray();
for (String speed : speeds) {
jsonArray.put(speed); |
<<<<<<<
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
=======
import de.greenrobot.event.EventBus;
import io.reactivex.Completable;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
>>>>>>>
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import io.reactivex.Completable;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers; |
<<<<<<<
public static final String PREF_FLATTR_SETTINGS = "prefFlattrSettings";
public static final String PREF_FLATTR_AUTH = "pref_flattr_authenticate";
public static final String PREF_FLATTR_REVOKE = "prefRevokeAccess";
public static final String PREF_AUTO_FLATTR_PREFS = "prefAutoFlattrPrefs";
public static final String PREF_OPML_EXPORT = "prefOpmlExport";
public static final String STATISTICS = "statistics";
public static final String PREF_ABOUT = "prefAbout";
public static final String PREF_CHOOSE_DATA_DIR = "prefChooseDataDir";
public static final String AUTO_DL_PREF_SCREEN = "prefAutoDownloadSettings";
public static final String PREF_PLAYBACK_SPEED_LAUNCHER = "prefPlaybackSpeedLauncher";
public static final String PREF_PLAYBACK_REWIND_DELTA_LAUNCHER = "prefPlaybackRewindDeltaLauncher";
public static final String PREF_PLAYBACK_FAST_FORWARD_DELTA_LAUNCHER = "prefPlaybackFastForwardDeltaLauncher";
public static final String PREF_GPODNET_LOGIN = "pref_gpodnet_authenticate";
public static final String PREF_GPODNET_SETLOGIN_INFORMATION = "pref_gpodnet_setlogin_information";
public static final String PREF_GPODNET_SYNC = "pref_gpodnet_sync";
public static final String PREF_GPODNET_LOGOUT = "pref_gpodnet_logout";
public static final String PREF_GPODNET_HOSTNAME = "pref_gpodnet_hostname";
public static final String PREF_GPODNET_NOTIFICATIONS = "pref_gpodnet_notifications";
public static final String PREF_EXPANDED_NOTIFICATION = "prefExpandNotify";
public static final String PREF_PROXY = "prefProxy";
public static final String PREF_KNOWN_ISSUES = "prefKnownIssues";
public static final String PREF_FAQ = "prefFaq";
public static final String PREF_SEND_CRASH_REPORT = "prefSendCrashReport";
private final PreferenceUI ui;
private CheckBoxPreference[] selectedNetworks;
=======
private static final String PREF_FLATTR_SETTINGS = "prefFlattrSettings";
private static final String PREF_FLATTR_AUTH = "pref_flattr_authenticate";
private static final String PREF_FLATTR_REVOKE = "prefRevokeAccess";
private static final String PREF_AUTO_FLATTR_PREFS = "prefAutoFlattrPrefs";
private static final String PREF_OPML_EXPORT = "prefOpmlExport";
private static final String PREF_HTML_EXPORT = "prefHtmlExport";
private static final String STATISTICS = "statistics";
private static final String PREF_ABOUT = "prefAbout";
private static final String PREF_CHOOSE_DATA_DIR = "prefChooseDataDir";
private static final String AUTO_DL_PREF_SCREEN = "prefAutoDownloadSettings";
private static final String PREF_PLAYBACK_SPEED_LAUNCHER = "prefPlaybackSpeedLauncher";
private static final String PREF_GPODNET_LOGIN = "pref_gpodnet_authenticate";
private static final String PREF_GPODNET_SETLOGIN_INFORMATION = "pref_gpodnet_setlogin_information";
private static final String PREF_GPODNET_SYNC = "pref_gpodnet_sync";
private static final String PREF_GPODNET_FORCE_FULL_SYNC = "pref_gpodnet_force_full_sync";
private static final String PREF_GPODNET_LOGOUT = "pref_gpodnet_logout";
private static final String PREF_GPODNET_HOSTNAME = "pref_gpodnet_hostname";
private static final String PREF_GPODNET_NOTIFICATIONS = "pref_gpodnet_notifications";
private static final String PREF_EXPANDED_NOTIFICATION = "prefExpandNotify";
private static final String PREF_PROXY = "prefProxy";
private static final String PREF_KNOWN_ISSUES = "prefKnownIssues";
private static final String PREF_FAQ = "prefFaq";
private static final String PREF_SEND_CRASH_REPORT = "prefSendCrashReport";
>>>>>>>
private static final String PREF_FLATTR_SETTINGS = "prefFlattrSettings";
private static final String PREF_FLATTR_AUTH = "pref_flattr_authenticate";
private static final String PREF_FLATTR_REVOKE = "prefRevokeAccess";
private static final String PREF_AUTO_FLATTR_PREFS = "prefAutoFlattrPrefs";
private static final String PREF_OPML_EXPORT = "prefOpmlExport";
private static final String PREF_HTML_EXPORT = "prefHtmlExport";
private static final String STATISTICS = "statistics";
private static final String PREF_ABOUT = "prefAbout";
private static final String PREF_CHOOSE_DATA_DIR = "prefChooseDataDir";
private static final String AUTO_DL_PREF_SCREEN = "prefAutoDownloadSettings";
private static final String PREF_PLAYBACK_SPEED_LAUNCHER = "prefPlaybackSpeedLauncher";
public static final String PREF_PLAYBACK_REWIND_DELTA_LAUNCHER = "prefPlaybackRewindDeltaLauncher";
public static final String PREF_PLAYBACK_FAST_FORWARD_DELTA_LAUNCHER = "prefPlaybackFastForwardDeltaLauncher";
private static final String PREF_GPODNET_LOGIN = "pref_gpodnet_authenticate";
private static final String PREF_GPODNET_SETLOGIN_INFORMATION = "pref_gpodnet_setlogin_information";
private static final String PREF_GPODNET_SYNC = "pref_gpodnet_sync";
private static final String PREF_GPODNET_FORCE_FULL_SYNC = "pref_gpodnet_force_full_sync";
private static final String PREF_GPODNET_LOGOUT = "pref_gpodnet_logout";
private static final String PREF_GPODNET_HOSTNAME = "pref_gpodnet_hostname";
private static final String PREF_GPODNET_NOTIFICATIONS = "pref_gpodnet_notifications";
private static final String PREF_EXPANDED_NOTIFICATION = "prefExpandNotify";
private static final String PREF_PROXY = "prefProxy";
private static final String PREF_KNOWN_ISSUES = "prefKnownIssues";
private static final String PREF_FAQ = "prefFaq";
private static final String PREF_SEND_CRASH_REPORT = "prefSendCrashReport"; |
<<<<<<<
import android.view.Window;
=======
import android.view.View.OnLongClickListener;
>>>>>>>
import android.view.Window;
import android.view.View.OnLongClickListener; |
<<<<<<<
public boolean isPlaying() {
if (media != null) {
if (PodcastApp.getCurrentlyPlayingMediaId() == media.getId()) {
return true;
}
}
return false;
}
=======
public void setCachedDescription(String d) {
cachedDescription = new SoftReference<String>(d);
}
public void setCachedContentEncoded(String c) {
cachedContentEncoded = new SoftReference<String>(c);
}
>>>>>>>
public boolean isPlaying() {
if (media != null) {
if (PodcastApp.getCurrentlyPlayingMediaId() == media.getId()) {
return true;
}
}
return false;
}
public void setCachedDescription(String d) {
cachedDescription = new SoftReference<String>(d);
}
public void setCachedContentEncoded(String c) {
cachedContentEncoded = new SoftReference<String>(c);
} |
<<<<<<<
import de.danoeh.antennapod.view.PlaybackSpeedIndicatorView;
=======
import de.danoeh.antennapod.view.PagerIndicatorView;
>>>>>>>
import de.danoeh.antennapod.view.PagerIndicatorView;
import de.danoeh.antennapod.view.PlaybackSpeedIndicatorView; |
<<<<<<<
import com.bumptech.glide.load.resource.bitmap.FitCenter;
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
=======
import com.bumptech.glide.RequestBuilder;
>>>>>>>
import com.bumptech.glide.load.resource.bitmap.FitCenter;
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
import com.bumptech.glide.RequestBuilder;
<<<<<<<
Glide.with(this)
.load(ImageResourceUtils.getImageLocation(media))
.apply(new RequestOptions()
.diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
.dontAnimate()
.transforms(new FitCenter(),
new RoundedCorners((int) (16 * getResources().getDisplayMetrics().density))))
.into(imgvCover);
=======
displayCoverImage(media.getPosition());
>>>>>>>
displayCoverImage(media.getPosition()); |
<<<<<<<
.subscribeWith(new DisposableMaybeObserver<FeedHandlerResult>() {
@Override
public void onSuccess(@NonNull FeedHandlerResult result) {
beforeShowFeedInformation(result.feed);
showFeedInformation(result.feed, result.alternateFeedUrls);
}
@Override
public void onComplete() {
// Ignore null result: We showed the discovery dialog.
}
@Override
public void onError(@NonNull Throwable error) {
String errorMsg = DownloadError.ERROR_PARSER_EXCEPTION.getErrorString(
OnlineFeedViewActivity.this) + " (" + error.getMessage() + ")";
showErrorDialog(errorMsg);
Log.d(TAG, "Feed parser exception: " + Log.getStackTraceString(error));
}
});
=======
.subscribe(
optionalResult -> {
if (optionalResult.isPresent()) {
FeedHandlerResult result = optionalResult.get();
beforeShowFeedInformation(result.feed);
showFeedInformation(result.feed, result.alternateFeedUrls);
}
}, error -> {
showErrorDialog(error.getMessage(), "");
Log.d(TAG, "Feed parser exception: " + Log.getStackTraceString(error));
});
>>>>>>>
.subscribeWith(new DisposableMaybeObserver<FeedHandlerResult>() {
@Override
public void onSuccess(@NonNull FeedHandlerResult result) {
beforeShowFeedInformation(result.feed);
showFeedInformation(result.feed, result.alternateFeedUrls);
}
@Override
public void onComplete() {
// Ignore null result: We showed the discovery dialog.
}
@Override
public void onError(@NonNull Throwable error) {
showErrorDialog(error.getMessage(), "");
Log.d(TAG, "Feed parser exception: " + Log.getStackTraceString(error));
}
}); |
<<<<<<<
import net.imagej.ops.misc.MinMaxRealType;
=======
import net.imagej.ops.Ops;
import net.imagej.ops.misc.MinMax;
import net.imglib2.IterableInterval;
>>>>>>>
import net.imagej.ops.Ops;
import net.imagej.ops.misc.MinMax;
<<<<<<<
final List<T> res = (List<T>) ops.run(new MinMaxRealType<T>(), in);
out = new Histogram1d<T>(new Real1dBinMapper<T>(res.get(0)
.getRealDouble(), res.get(1).getRealDouble(), numBins, false));
out.countData(in);
=======
@SuppressWarnings("unchecked")
final List<T> res = (List<T>) ops.run(MinMax.class, in);
out =
new Histogram1d<T>(new Real1dBinMapper<T>(res.get(0).getRealDouble(), res
.get(1).getRealDouble(), numBins, false));
>>>>>>>
@SuppressWarnings("unchecked")
final List<T> res = (List<T>) ops.run(MinMax.class, in);
out = new Histogram1d<T>(new Real1dBinMapper<T>(res.get(0)
.getRealDouble(), res.get(1).getRealDouble(), numBins, false));
out.countData(in); |
<<<<<<<
import de.danoeh.antennapod.core.storage.NavDrawerData;
import de.danoeh.antennapod.core.util.FeedItemUtil;
import de.danoeh.antennapod.core.util.IntentUtils;
=======
import de.danoeh.antennapod.dialog.RemoveFeedDialog;
>>>>>>>
import de.danoeh.antennapod.core.storage.NavDrawerData;
import de.danoeh.antennapod.dialog.RemoveFeedDialog; |
<<<<<<<
Playable playable = Playable.PlayableUtils.createInstanceFromPreferences(getApplicationContext());
if (playable != null) {
boolean localFeed = URLUtil.isContentUrl(playable.getStreamUrl());
if (PlaybackPreferences.getCurrentEpisodeIsStream() && !NetworkUtils.isStreamingAllowed() && !localFeed) {
displayStreamingNotAllowedNotification(
new PlaybackServiceStarter(this, playable)
.prepareImmediately(true)
.startWhenPrepared(true)
.shouldStream(true)
.getIntent());
PlaybackPreferences.writeNoMediaPlaying();
stateManager.stopService();
return;
}
mediaPlayer.playMediaObject(playable, PlaybackPreferences.getCurrentEpisodeIsStream(), true, true);
stateManager.validStartCommandWasReceived();
PlaybackService.this.updateMediaSessionMetadata(playable);
addPlayableToQueue(playable);
} else {
stateManager.stopService();
}
=======
Observable.fromCallable(() -> Playable.PlayableUtils.createInstanceFromPreferences(getApplicationContext()))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(
playable -> {
if (PlaybackPreferences.getCurrentEpisodeIsStream() && !NetworkUtils.isStreamingAllowed()) {
displayStreamingNotAllowedNotification(
new PlaybackServiceStarter(this, playable)
.prepareImmediately(true)
.startWhenPrepared(true)
.shouldStream(true)
.getIntent());
PlaybackPreferences.writeNoMediaPlaying();
stateManager.stopService();
return;
}
mediaPlayer.playMediaObject(playable, PlaybackPreferences.getCurrentEpisodeIsStream(),
true, true);
stateManager.validStartCommandWasReceived();
PlaybackService.this.updateMediaSessionMetadata(playable);
addPlayableToQueue(playable);
}, error -> {
Log.d(TAG, "Playable was not loaded from preferences. Stopping service.");
stateManager.stopService();
});
>>>>>>>
Observable.fromCallable(() -> Playable.PlayableUtils.createInstanceFromPreferences(getApplicationContext()))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(
playable -> {
boolean localFeed = URLUtil.isContentUrl(playable.getStreamUrl());
if (PlaybackPreferences.getCurrentEpisodeIsStream()
&& !NetworkUtils.isStreamingAllowed() && !localFeed) {
displayStreamingNotAllowedNotification(
new PlaybackServiceStarter(this, playable)
.prepareImmediately(true)
.startWhenPrepared(true)
.shouldStream(true)
.getIntent());
PlaybackPreferences.writeNoMediaPlaying();
stateManager.stopService();
return;
}
mediaPlayer.playMediaObject(playable, PlaybackPreferences.getCurrentEpisodeIsStream(),
true, true);
stateManager.validStartCommandWasReceived();
PlaybackService.this.updateMediaSessionMetadata(playable);
addPlayableToQueue(playable);
}, error -> {
Log.d(TAG, "Playable was not loaded from preferences. Stopping service.");
stateManager.stopService();
}); |
<<<<<<<
=======
import de.danoeh.antennapod.view.EmptyViewHandler;
import de.greenrobot.event.EventBus;
>>>>>>>
import de.danoeh.antennapod.view.EmptyViewHandler; |
<<<<<<<
import android.os.Parcelable;
=======
import android.os.Handler;
import android.support.v4.app.Fragment;
import android.support.v7.widget.SearchView;
>>>>>>>
<<<<<<<
=======
import de.danoeh.antennapod.core.feed.FeedMedia;
import de.danoeh.antennapod.core.feed.QueueEvent;
import de.danoeh.antennapod.core.preferences.UserPreferences;
import de.danoeh.antennapod.core.service.download.DownloadService;
import de.danoeh.antennapod.core.service.download.Downloader;
import de.danoeh.antennapod.core.storage.DBReader;
import de.danoeh.antennapod.core.storage.DBTasks;
>>>>>>>
import de.danoeh.antennapod.core.feed.FeedMedia;
import de.danoeh.antennapod.core.feed.QueueEvent;
import de.danoeh.antennapod.core.preferences.UserPreferences;
import de.danoeh.antennapod.core.storage.DBReader;
<<<<<<<
=======
import de.danoeh.antennapod.core.storage.DownloadRequester;
import de.danoeh.antennapod.core.util.LongList;
>>>>>>>
<<<<<<<
=======
import de.danoeh.antennapod.menuhandler.MenuItemUtils;
import de.danoeh.antennapod.menuhandler.NavDrawerActivity;
import de.greenrobot.event.EventBus;
>>>>>>>
import de.greenrobot.event.EventBus;
<<<<<<<
public class NewEpisodesFragment extends AllEpisodesFragment {
=======
public class NewEpisodesFragment extends Fragment {
private static final String TAG = "NewEpisodesFragment";
private static final int EVENTS = EventDistributor.DOWNLOAD_HANDLED |
EventDistributor.DOWNLOAD_QUEUED |
EventDistributor.UNREAD_ITEMS_UPDATE |
EventDistributor.PLAYER_STATUS_UPDATE;
>>>>>>>
public class NewEpisodesFragment extends AllEpisodesFragment {
<<<<<<<
=======
private void onFragmentLoaded() {
if (listAdapter == null) {
listAdapter = new NewEpisodesListAdapter(activity.get(), itemAccess, new DefaultActionButtonCallback(activity.get()));
listView.setAdapter(listAdapter);
listView.setEmptyView(txtvEmpty);
downloadObserver = new DownloadObserver(activity.get(), new Handler(), downloadObserverCallback);
downloadObserver.onResume();
}
listAdapter.notifyDataSetChanged();
restoreScrollPosition();
getActivity().supportInvalidateOptionsMenu();
updateShowOnlyEpisodesListViewState();
}
private DownloadObserver.Callback downloadObserverCallback = new DownloadObserver.Callback() {
@Override
public void onContentChanged() {
if (listAdapter != null) {
listAdapter.notifyDataSetChanged();
}
}
@Override
public void onDownloadDataAvailable(List<Downloader> downloaderList) {
NewEpisodesFragment.this.downloaderList = downloaderList;
if (listAdapter != null) {
listAdapter.notifyDataSetChanged();
}
}
};
private NewEpisodesListAdapter.ItemAccess itemAccess = new NewEpisodesListAdapter.ItemAccess() {
@Override
public int getCount() {
if (itemsLoaded) {
return (showOnlyNewEpisodes) ? unreadItems.size() : recentItems.size();
}
return 0;
}
@Override
public FeedItem getItem(int position) {
if (itemsLoaded) {
return (showOnlyNewEpisodes) ? unreadItems.get(position) : recentItems.get(position);
}
return null;
}
@Override
public int getItemDownloadProgressPercent(FeedItem item) {
if (downloaderList != null) {
for (Downloader downloader : downloaderList) {
if (downloader.getDownloadRequest().getFeedfileType() == FeedMedia.FEEDFILETYPE_FEEDMEDIA
&& downloader.getDownloadRequest().getFeedfileId() == item.getMedia().getId()) {
return downloader.getDownloadRequest().getProgressPercent();
}
}
}
return 0;
}
@Override
public boolean isInQueue(FeedItem item) {
if (itemsLoaded) {
return queue.contains(item.getId());
} else {
return false;
}
}
};
public void onEvent(QueueEvent event) {
Log.d(TAG, "onEvent(" + event + ")");
startItemLoader();
}
private EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {
@Override
public void update(EventDistributor eventDistributor, Integer arg) {
if ((arg & EVENTS) != 0) {
startItemLoader();
if (isUpdatingFeeds != updateRefreshMenuItemChecker.isRefreshing()) {
getActivity().supportInvalidateOptionsMenu();
}
}
}
};
private void updateShowOnlyEpisodes() {
SharedPreferences prefs = getActivity().getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE);
showOnlyNewEpisodes = prefs.getBoolean(PREF_EPISODE_FILTER_BOOL, true);
}
private void setShowOnlyNewEpisodes(boolean newVal) {
showOnlyNewEpisodes = newVal;
SharedPreferences prefs = getActivity().getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE);
SharedPreferences.Editor editor = prefs.edit();
editor.putBoolean(PREF_EPISODE_FILTER_BOOL, showOnlyNewEpisodes);
editor.commit();
if (itemsLoaded && viewsCreated) {
listAdapter.notifyDataSetChanged();
activity.get().supportInvalidateOptionsMenu();
updateShowOnlyEpisodesListViewState();
}
}
private void updateShowOnlyEpisodesListViewState() {
if (showOnlyNewEpisodes) {
listView.setEmptyView(null);
txtvEmpty.setVisibility(View.GONE);
} else {
listView.setEmptyView(txtvEmpty);
}
}
private ItemLoader itemLoader;
private void startItemLoader() {
if (itemLoader != null) {
itemLoader.cancel(true);
}
itemLoader = new ItemLoader();
itemLoader.execute();
}
private void stopItemLoader() {
if (itemLoader != null) {
itemLoader.cancel(true);
}
}
private class ItemLoader extends AsyncTask<Void, Void, Object[]> {
@Override
protected void onPreExecute() {
super.onPreExecute();
if (viewsCreated && !itemsLoaded) {
listView.setVisibility(View.GONE);
txtvEmpty.setVisibility(View.GONE);
progLoading.setVisibility(View.VISIBLE);
}
}
@Override
protected Object[] doInBackground(Void... params) {
Context context = activity.get();
if (context != null) {
return new Object[] {
DBReader.getUnreadItemsList(context),
DBReader.getRecentlyPublishedEpisodes(context, RECENT_EPISODES_LIMIT),
DBReader.getQueueIDList(context)
};
} else {
return null;
}
}
@Override
protected void onPostExecute(Object[] lists) {
super.onPostExecute(lists);
listView.setVisibility(View.VISIBLE);
progLoading.setVisibility(View.GONE);
if (lists != null) {
unreadItems = (List<FeedItem>) lists[0];
recentItems = (List<FeedItem>) lists[1];
queue = (LongList) lists[2];
itemsLoaded = true;
if (viewsCreated && activity.get() != null) {
onFragmentLoaded();
}
}
}
}
>>>>>>> |
<<<<<<<
return new FeedPreferences(feedId, autoDownload, autoRefresh, autoDeleteAction, volumeReductionSetting, username, password, new FeedFilter(includeFilter, excludeFilter));
=======
float feedPlaybackSpeed = cursor.getFloat(indexFeedPlaybackSpeed);
return new FeedPreferences(feedId, autoDownload, autoRefresh, autoDeleteAction, username, password, new FeedFilter(includeFilter, excludeFilter), feedPlaybackSpeed);
>>>>>>>
float feedPlaybackSpeed = cursor.getFloat(indexFeedPlaybackSpeed);
return new FeedPreferences(feedId, autoDownload, autoRefresh, autoDeleteAction, volumeReductionSetting, username, password, new FeedFilter(includeFilter, excludeFilter), feedPlaybackSpeed); |
<<<<<<<
private UpdateManager(){}
public static final String TAG = UpdateManager.class.getSimpleName();
=======
private static final String TAG = UpdateManager.class.getSimpleName();
>>>>>>>
private UpdateManager(){}
private static final String TAG = UpdateManager.class.getSimpleName(); |
<<<<<<<
findPreference(PREF_PLAYBACK_SPEED_LAUNCHER)
.setOnPreferenceClickListener(new OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
setPlaybackSpeed();
return true;
}
});
=======
buildUpdateIntervalPreference();
>>>>>>>
findPreference(PREF_PLAYBACK_SPEED_LAUNCHER)
.setOnPreferenceClickListener(new OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
setPlaybackSpeed();
return true;
}
});
buildUpdateIntervalPreference(); |
<<<<<<<
public PendingIntent getAutoDownloadReportNotificationContentIntent(Context context) {
Intent intent = new Intent(context, MainActivity.class);
intent.putExtra(MainActivity.EXTRA_FRAGMENT_TAG, QueueFragment.TAG);
return PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
}
@Override
public void onFeedParsed(Context context, Feed feed) {
// do nothing
}
@Override
=======
>>>>>>>
public PendingIntent getAutoDownloadReportNotificationContentIntent(Context context) {
Intent intent = new Intent(context, MainActivity.class);
intent.putExtra(MainActivity.EXTRA_FRAGMENT_TAG, QueueFragment.TAG);
return PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
}
@Override |
<<<<<<<
DONT_GENERATE, // process as usual, but don't output to generated code
REMOVE, // can be completely removed
ADDED_TO_REGION,
FINALLY_INSNS,
=======
DONT_GENERATE,
DONT_RENAME, // do not rename during deobfuscation
SKIP,
REMOVE,
>>>>>>>
DONT_GENERATE, // process as usual, but don't output to generated code
DONT_RENAME, // do not rename during deobfuscation
REMOVE, // can be completely removed
ADDED_TO_REGION,
FINALLY_INSNS, |
<<<<<<<
// MethodNode test2 = cls.searchMethodByName("test2(I)I");
// checkLine(lines, codeWriter, test2, 3, "return v - 1;");
=======
MethodNode test2 = cls.searchMethodByName("test2(I)I");
checkLine(lines, codeWriter, test2, 3, "return v - 1;");
}
@Test
@NotYetImplemented
public void test2() {
ClassNode cls = getClassNode(TestCls.class);
CodeWriter codeWriter = cls.getCode();
String code = codeWriter.toString();
String[] lines = code.split(CodeWriter.NL);
>>>>>>>
// MethodNode test2 = cls.searchMethodByName("test2(I)I");
// checkLine(lines, codeWriter, test2, 3, "return v - 1;");
}
@Test
@NotYetImplemented
public void test2() {
ClassNode cls = getClassNode(TestCls.class);
CodeWriter codeWriter = cls.getCode();
String code = codeWriter.toString();
String[] lines = code.split(CodeWriter.NL); |
<<<<<<<
import jadx.core.codegen.CodeGen;
=======
import jadx.core.Jadx;
import jadx.core.ProcessClass;
>>>>>>>
import jadx.core.ProcessClass;
<<<<<<<
if (clsFullName.equals(clsPattern)) {
if (processCls(mthPattern, passes, classNode)) {
=======
if (clsPattern.matcher(clsFullName).matches()) {
if (processCls(jadx, mthPattern, passes, classNode)) {
>>>>>>>
if (clsFullName.equals(clsPattern)) {
if (processCls(mthPattern, passes, classNode)) {
<<<<<<<
private boolean processCls(@Nullable String mthPattern, List<IDexTreeVisitor> passes, ClassNode classNode) {
=======
private boolean processCls(JadxDecompiler jadx, @Nullable Pattern mthPattern, List<IDexTreeVisitor> passes, ClassNode classNode) {
>>>>>>>
private boolean processCls(@Nullable String mthPattern, List<IDexTreeVisitor> passes, ClassNode classNode) {
<<<<<<<
// ProcessClass.process(classNode, passes, new CodeGen());
for (IDexTreeVisitor visitor : passes) {
DepthTraversal.visit(visitor, classNode);
}
=======
>>>>>>> |
<<<<<<<
add(new StreamInfoTest());
=======
add(new NotifierInfoTest());
>>>>>>>
add(new StreamInfoTest());
add(new NotifierInfoTest()); |
<<<<<<<
private final String rootUrl = String.format("http://localhost:%d/api/v1/catalog", RULE.getLocalPort());
=======
private String rootUrl = String.format("http://localhost:%d/api/v1", RULE.getLocalPort());
>>>>>>>
private final String rootUrl = String.format("http://localhost:%d/api/v1", RULE.getLocalPort()); |
<<<<<<<
public Response addSchemaInfo(@ApiParam(value = "Schema to be added to the registry", required = true) SchemaMetadata schemaMetadataInfo) {
Response response;
try {
schemaMetadataInfo.trim();
checkNullOrEmpty("Schema name", schemaMetadataInfo.getName());
checkNullOrEmpty("Schema type", schemaMetadataInfo.getType());
Long schemaId = schemaRegistry.addSchemaMetadata(schemaMetadataInfo);
response = WSUtils.respondEntity(schemaId, Response.Status.CREATED);
} catch (IllegalArgumentException ex) {
LOG.error("Expected parameter is invalid", schemaMetadataInfo, ex);
response = WSUtils.respond(Response.Status.BAD_REQUEST, CatalogResponse.ResponseMessage.BAD_REQUEST_PARAM_MISSING, ex.getMessage());
} catch (UnsupportedSchemaTypeException ex) {
LOG.error("Unsupported schema type encountered while adding schema metadata [{}]", schemaMetadataInfo, ex);
response = WSUtils.respond(Response.Status.BAD_REQUEST, CatalogResponse.ResponseMessage.UNSUPPORTED_SCHEMA_TYPE, ex.getMessage());
} catch (Exception ex) {
LOG.error("Error encountered while adding schema info [{}] ", schemaMetadataInfo, ex);
response = WSUtils.respond(Response.Status.INTERNAL_SERVER_ERROR, CatalogResponse.ResponseMessage.EXCEPTION, ex.getMessage());
}
=======
public Response addSchemaInfo(@ApiParam(value = "Schema to be added to the registry", required = true)
SchemaMetadata schemaMetadataInfo,
@Context UriInfo uriInfo) {
return handleLeaderAction(uriInfo, () -> {
Response response;
try {
schemaMetadataInfo.trim();
checkValueAsNullOrEmpty("Schema name", schemaMetadataInfo.getName());
checkValueAsNullOrEmpty("Schema type", schemaMetadataInfo.getType());
Long schemaId = schemaRegistry.addSchemaMetadata(schemaMetadataInfo);
response = WSUtils.respond(schemaId, Response.Status.CREATED, CatalogResponse.ResponseMessage.SUCCESS);
} catch (IllegalArgumentException ex) {
LOG.error("Expected parameter is invalid", schemaMetadataInfo, ex);
response = WSUtils.respond(Response.Status.BAD_REQUEST, CatalogResponse.ResponseMessage.BAD_REQUEST_PARAM_MISSING, ex.getMessage());
} catch (UnsupportedSchemaTypeException ex) {
LOG.error("Unsupported schema type encountered while adding schema metadata [{}]", schemaMetadataInfo, ex);
response = WSUtils.respond(Response.Status.BAD_REQUEST, CatalogResponse.ResponseMessage.UNSUPPORTED_SCHEMA_TYPE, ex.getMessage());
} catch (Exception ex) {
LOG.error("Error encountered while adding schema info [{}] ", schemaMetadataInfo, ex);
response = WSUtils.respond(Response.Status.INTERNAL_SERVER_ERROR, CatalogResponse.ResponseMessage.EXCEPTION, ex.getMessage());
}
>>>>>>>
public Response addSchemaInfo(@ApiParam(value = "Schema to be added to the registry", required = true)
SchemaMetadata schemaMetadataInfo,
@Context UriInfo uriInfo) {
return handleLeaderAction(uriInfo, () -> {
Response response;
try {
schemaMetadataInfo.trim();
checkValueAsNullOrEmpty("Schema name", schemaMetadataInfo.getName());
checkValueAsNullOrEmpty("Schema type", schemaMetadataInfo.getType());
Long schemaId = schemaRegistry.addSchemaMetadata(schemaMetadataInfo);
response = WSUtils.respondEntity(schemaId, Response.Status.CREATED);
} catch (IllegalArgumentException ex) {
LOG.error("Expected parameter is invalid", schemaMetadataInfo, ex);
response = WSUtils.respond(Response.Status.BAD_REQUEST, CatalogResponse.ResponseMessage.BAD_REQUEST_PARAM_MISSING, ex.getMessage());
} catch (UnsupportedSchemaTypeException ex) {
LOG.error("Unsupported schema type encountered while adding schema metadata [{}]", schemaMetadataInfo, ex);
response = WSUtils.respond(Response.Status.BAD_REQUEST, CatalogResponse.ResponseMessage.UNSUPPORTED_SCHEMA_TYPE, ex.getMessage());
} catch (Exception ex) {
LOG.error("Error encountered while adding schema info [{}] ", schemaMetadataInfo, ex);
response = WSUtils.respond(Response.Status.INTERNAL_SERVER_ERROR, CatalogResponse.ResponseMessage.EXCEPTION, ex.getMessage());
}
<<<<<<<
public Response addSchema(@ApiParam(value = "Schema name", required = true) @PathParam("name") String schemaName,
@ApiParam(value = "Details about the schema", required = true) SchemaVersion schemaVersion) {
Response response;
try {
LOG.info("schemaVersion for [{}] is [{}]", schemaName, schemaVersion);
Integer version = schemaRegistry.addSchemaVersion(schemaName, schemaVersion.getSchemaText(), schemaVersion.getDescription());
response = WSUtils.respondEntity(version, Response.Status.CREATED);
} catch (InvalidSchemaException ex) {
LOG.error("Invalid schema error encountered while adding schema [{}] with key [{}]", schemaVersion, schemaName, ex);
response = WSUtils.respond(Response.Status.BAD_REQUEST, CatalogResponse.ResponseMessage.INVALID_SCHEMA, ex.getMessage());
} catch (IncompatibleSchemaException ex) {
LOG.error("Incompatible schema error encountered while adding schema [{}] with key [{}]", schemaVersion, schemaName, ex);
response = WSUtils.respond(Response.Status.BAD_REQUEST, CatalogResponse.ResponseMessage.INCOMPATIBLE_SCHEMA, ex.getMessage());
} catch (UnsupportedSchemaTypeException ex) {
LOG.error("Unsupported schema type encountered while adding schema [{}] with key [{}]", schemaVersion, schemaName, ex);
response = WSUtils.respond(Response.Status.BAD_REQUEST, CatalogResponse.ResponseMessage.UNSUPPORTED_SCHEMA_TYPE, ex.getMessage());
} catch (Exception ex) {
LOG.error("Encountered error encountered while adding schema [{}] with key [{}]", schemaVersion, schemaName, ex, ex);
response = WSUtils.respond(Response.Status.INTERNAL_SERVER_ERROR, CatalogResponse.ResponseMessage.EXCEPTION, ex.getMessage());
}
=======
public Response addSchema(@ApiParam(value = "Schema name", required = true) @PathParam("name")
String schemaName,
@ApiParam(value = "Details about the schema", required = true)
SchemaVersion schemaVersion,
@Context UriInfo uriInfo) {
return handleLeaderAction(uriInfo, () -> {
Response response;
try {
LOG.info("schemaVersion for [{}] is [{}]", schemaName, schemaVersion);
Integer version = schemaRegistry.addSchemaVersion(schemaName, schemaVersion.getSchemaText(), schemaVersion.getDescription());
response = WSUtils.respond(version, Response.Status.CREATED, CatalogResponse.ResponseMessage.SUCCESS);
} catch (InvalidSchemaException ex) {
LOG.error("Invalid schema error encountered while adding schema [{}] with key [{}]", schemaVersion, schemaName, ex);
response = WSUtils.respond(Response.Status.BAD_REQUEST, CatalogResponse.ResponseMessage.INVALID_SCHEMA, ex.getMessage());
} catch (IncompatibleSchemaException ex) {
LOG.error("Incompatible schema error encountered while adding schema [{}] with key [{}]", schemaVersion, schemaName, ex);
response = WSUtils.respond(Response.Status.BAD_REQUEST, CatalogResponse.ResponseMessage.INCOMPATIBLE_SCHEMA, ex.getMessage());
} catch (UnsupportedSchemaTypeException ex) {
LOG.error("Unsupported schema type encountered while adding schema [{}] with key [{}]", schemaVersion, schemaName, ex);
response = WSUtils.respond(Response.Status.BAD_REQUEST, CatalogResponse.ResponseMessage.UNSUPPORTED_SCHEMA_TYPE, ex.getMessage());
} catch (Exception ex) {
LOG.error("Encountered error encountered while adding schema [{}] with key [{}]", schemaVersion, schemaName, ex, ex);
response = WSUtils.respond(Response.Status.INTERNAL_SERVER_ERROR, CatalogResponse.ResponseMessage.EXCEPTION, ex.getMessage());
}
>>>>>>>
public Response addSchema(@ApiParam(value = "Schema name", required = true) @PathParam("name")
String schemaName,
@ApiParam(value = "Details about the schema", required = true)
SchemaVersion schemaVersion,
@Context UriInfo uriInfo) {
return handleLeaderAction(uriInfo, () -> {
Response response;
try {
LOG.info("schemaVersion for [{}] is [{}]", schemaName, schemaVersion);
Integer version = schemaRegistry.addSchemaVersion(schemaName, schemaVersion.getSchemaText(), schemaVersion.getDescription());
response = WSUtils.respondEntity(version, Response.Status.CREATED);
} catch (InvalidSchemaException ex) {
LOG.error("Invalid schema error encountered while adding schema [{}] with key [{}]", schemaVersion, schemaName, ex);
response = WSUtils.respond(Response.Status.BAD_REQUEST, CatalogResponse.ResponseMessage.INVALID_SCHEMA, ex.getMessage());
} catch (IncompatibleSchemaException ex) {
LOG.error("Incompatible schema error encountered while adding schema [{}] with key [{}]", schemaVersion, schemaName, ex);
response = WSUtils.respond(Response.Status.BAD_REQUEST, CatalogResponse.ResponseMessage.INCOMPATIBLE_SCHEMA, ex.getMessage());
} catch (UnsupportedSchemaTypeException ex) {
LOG.error("Unsupported schema type encountered while adding schema [{}] with key [{}]", schemaVersion, schemaName, ex);
response = WSUtils.respond(Response.Status.BAD_REQUEST, CatalogResponse.ResponseMessage.UNSUPPORTED_SCHEMA_TYPE, ex.getMessage());
} catch (Exception ex) {
LOG.error("Encountered error encountered while adding schema [{}] with key [{}]", schemaVersion, schemaName, ex, ex);
response = WSUtils.respond(Response.Status.INTERNAL_SERVER_ERROR, CatalogResponse.ResponseMessage.EXCEPTION, ex.getMessage());
}
<<<<<<<
@ApiParam(value = "Serializer/deserializer identifier", required = true) @PathParam("serDesId") Long serDesId) {
Response response;
try {
SchemaMetadataInfo schemaMetadataInfoStorable = schemaRegistry.getSchemaMetadata(schemaName);
schemaRegistry.mapSerDesWithSchema(schemaMetadataInfoStorable.getId(), serDesId);
response = WSUtils.respondEntity(true, Response.Status.OK);
} catch (Exception ex) {
response = WSUtils.respond(Response.Status.INTERNAL_SERVER_ERROR, CatalogResponse.ResponseMessage.EXCEPTION, ex.getMessage());
}
=======
@ApiParam(value = "Serializer/deserializer identifier", required = true) @PathParam("serDesId") Long serDesId,
@Context UriInfo uriInfo) {
return handleLeaderAction(uriInfo, () -> {
Response response;
try {
SchemaMetadataInfo schemaMetadataInfoStorable = schemaRegistry.getSchemaMetadata(schemaName);
schemaRegistry.mapSerDesWithSchema(schemaMetadataInfoStorable.getId(), serDesId);
response = WSUtils.respond(true, Response.Status.OK, CatalogResponse.ResponseMessage.SUCCESS);
} catch (Exception ex) {
response = WSUtils.respond(Response.Status.INTERNAL_SERVER_ERROR, CatalogResponse.ResponseMessage.EXCEPTION, ex.getMessage());
}
>>>>>>>
@ApiParam(value = "Serializer/deserializer identifier", required = true) @PathParam("serDesId") Long serDesId,
@Context UriInfo uriInfo) {
return handleLeaderAction(uriInfo, () -> {
Response response;
try {
SchemaMetadataInfo schemaMetadataInfoStorable = schemaRegistry.getSchemaMetadata(schemaName);
schemaRegistry.mapSerDesWithSchema(schemaMetadataInfoStorable.getId(), serDesId);
response = WSUtils.respondEntity(true, Response.Status.OK);
} catch (Exception ex) {
response = WSUtils.respond(Response.Status.INTERNAL_SERVER_ERROR, CatalogResponse.ResponseMessage.EXCEPTION, ex.getMessage());
} |
<<<<<<<
import com.linkedin.camus.coders.CamusWrapper;
import com.linkedin.camus.coders.MessageDecoder;
import com.linkedin.camus.etl.kafka.CamusJob;
import com.linkedin.camus.etl.kafka.CamusJobTest;
import com.linkedin.camus.etl.kafka.coders.KafkaAvroMessageDecoder;
import com.linkedin.camus.etl.kafka.coders.MessageDecoderFactory;
import com.linkedin.camus.etl.kafka.common.EtlKey;
import com.linkedin.camus.etl.kafka.common.EtlRequest;
import com.linkedin.camus.etl.kafka.common.LeaderInfo;
import com.linkedin.camus.workallocater.CamusRequest;
import com.linkedin.camus.workallocater.WorkAllocator;
=======
>>>>>>>
import com.linkedin.camus.coders.CamusWrapper;
import com.linkedin.camus.coders.MessageDecoder;
import com.linkedin.camus.etl.kafka.CamusJob;
import com.linkedin.camus.etl.kafka.coders.KafkaAvroMessageDecoder;
import com.linkedin.camus.etl.kafka.coders.MessageDecoderFactory;
import com.linkedin.camus.etl.kafka.common.EtlKey;
import com.linkedin.camus.etl.kafka.common.EtlRequest;
import com.linkedin.camus.etl.kafka.common.LeaderInfo;
import com.linkedin.camus.workallocater.CamusRequest;
import com.linkedin.camus.workallocater.WorkAllocator;
<<<<<<<
=======
import org.apache.hadoop.conf.Configuration;
>>>>>>>
import org.apache.hadoop.conf.Configuration;
<<<<<<<
public static boolean reportJobFailureDueToOffsetOutOfRange = false;
public static boolean useMockRequestForUnitTest = false;
=======
public static final int NUM_TRIES_FETCH_FROM_LEADER = 3;
public static final int NUM_TRIES_TOPIC_METADATA = 3;
public static boolean reportJobFailureDueToSkippedMsg = false;
>>>>>>>
public static final int NUM_TRIES_FETCH_FROM_LEADER = 3;
public static final int NUM_TRIES_TOPIC_METADATA = 3;
public static boolean reportJobFailureDueToOffsetOutOfRange = false;
public static boolean reportJobFailureUnableToGetOffsetFromKafka = false; |
<<<<<<<
private static final String CAMUS_SWEEPER_PRIORITY_LIST = "camus.sweeper.priority.list";
=======
>>>>>>>
private static final String CAMUS_SWEEPER_PRIORITY_LIST = "camus.sweeper.priority.list"; |
<<<<<<<
import com.yahoo.elide.security.RequestScope;
=======
import com.yahoo.elide.core.exceptions.HttpStatusException;
>>>>>>>
import com.yahoo.elide.security.RequestScope;
import com.yahoo.elide.core.exceptions.HttpStatusException; |
<<<<<<<
=======
/**
* Build the CriterionFilterOperation for provided criteria
* @param criteria the criteria
* @return the CriterionFilterOperation
*/
protected CriterionFilterOperation buildCriterionFilterOperation(Criteria criteria) {
return new CriterionFilterOperation(criteria);
}
>>>>>>>
/**
* Build the CriterionFilterOperation for provided criteria
* @param criteria the criteria
* @return the CriterionFilterOperation
*/
protected CriterionFilterOperation buildCriterionFilterOperation(Criteria criteria) {
return new CriterionFilterOperation(criteria);
}
<<<<<<<
=======
@Deprecated
public <T> Collection filterCollection(Collection collection, Class<T> entityClass, Set<Predicate> predicates) {
if ((collection instanceof AbstractPersistentCollection) && !predicates.isEmpty()) {
String filterString = new HQLFilterOperation().applyAll(predicates);
if (filterString.length() != 0) {
Query query = session.createFilter(collection, filterString);
for (Predicate predicate : predicates) {
if (predicate.getOperator().isParameterized()) {
String name = predicate.getFieldPath().replace('.', '_');
query = query.setParameterList(name, predicate.getValues());
}
}
return query.list();
}
}
return collection;
}
@Override
@Deprecated
public <T> Collection filterCollectionWithSortingAndPagination(final Collection collection,
final Class<T> entityClass,
final EntityDictionary dictionary,
final Optional<Set<Predicate>> filters,
final Optional<Sorting> sorting,
final Optional<Pagination> pagination) {
if (((collection instanceof AbstractPersistentCollection))
&& (filters.isPresent() || sorting.isPresent() || pagination.isPresent())) {
@SuppressWarnings("unchecked")
final Optional<Query> possibleQuery = new HQLTransaction.Builder<>(session, collection, entityClass,
dictionary)
.withPossibleFilters(filters)
.withPossibleSorting(sorting)
.withPossiblePagination(pagination)
.build();
if (possibleQuery.isPresent()) {
return possibleQuery.get().list();
}
}
return collection;
}
@Override
>>>>>>> |
<<<<<<<
=======
import com.google.common.base.Preconditions;
import com.yahoo.elide.annotation.CreatePermission;
>>>>>>>
<<<<<<<
=======
>>>>>>>
import com.yahoo.elide.security.checks.Check;
<<<<<<<
=======
import static lombok.AccessLevel.PACKAGE;
>>>>>>>
<<<<<<<
@Getter private final PermissionExecutor permissionExecutor;
=======
@Getter private final List<Supplier<String>> failedAuthorizations;
>>>>>>>
@Getter private final PermissionExecutor permissionExecutor;
@Getter private final List<Supplier<String>> failedAuthorizations;
<<<<<<<
permissionExecutor = new PermissionExecutor(this);
=======
failedAuthorizations = new ArrayList<>();
>>>>>>>
permissionExecutor = new PermissionExecutor(this);
failedAuthorizations = new ArrayList<>();
<<<<<<<
this.permissionExecutor = new PermissionExecutor(this);
=======
this.failedAuthorizations = outerRequestScope.failedAuthorizations;
>>>>>>>
this.permissionExecutor = new PermissionExecutor(this);
this.failedAuthorizations = outerRequestScope.failedAuthorizations;
<<<<<<<
commitTriggers.add(() -> resource.runTriggers(OnCommit.class, fieldName));
=======
commitTriggers.add(() -> {
resource.runTriggers(OnCommit.class, fieldName);
});
}
/**
* Check permissions
*
* @param annotationClass annotation type
* @param task runnable task
*/
private void checkPermissions(Class<?> annotationClass, Runnable task) {
// CreatePermission queues deferred permission checks
if (deferredChecks == null && CreatePermission.class.equals(annotationClass)) {
deferredChecks = new LinkedHashSet<>();
}
if (deferredChecks == null || notDeferred) {
task.run();
} else {
deferredChecks.add(task);
}
}
private static class CheckPermissions implements Runnable {
final Class<? extends Check>[] anyChecks;
final boolean any;
final PersistentResource resource;
public CheckPermissions(
Class<?> annotationClass,
Class<? extends Check>[] checks,
boolean isAny,
PersistentResource resource) {
Preconditions.checkArgument(checks.length > 0);
this.anyChecks = Arrays.copyOf(checks, checks.length);
this.any = isAny;
this.resource = resource;
}
@Override
public void run() {
PersistentResource.checkPermissions(anyChecks, any, resource);
}
@Override
public String toString() {
return "CheckPermissions [anyChecks=" + Arrays.toString(anyChecks) + ", any=" + any + ", resource="
+ resource.getId() + ", user=" + resource.getRequestScope().getUser() + "]";
}
}
/**
* Field-Aware checks are for checking overrides on fields when appropriate. At time of writing, this should
* really only include ReadPermission and UpdatePermission checks.
*
* @param <A> type annotation
*/
private static class FieldAwareCheck<A extends Annotation> implements Runnable {
final Class<A> annotationClass;
final PersistentResource resource;
final String fieldName;
public FieldAwareCheck(Class<A> annotationClass, PersistentResource resource) {
this.annotationClass = annotationClass;
this.resource = resource;
this.fieldName = null;
}
public FieldAwareCheck(Class<A> annotationClass, PersistentResource resource, String fieldName) {
this.annotationClass = annotationClass;
this.resource = resource;
this.fieldName = fieldName;
}
@Override
public void run() {
// Hack: doNotDefer is a special flag to temporarily disable deferred checking. Presumably, this check
// should not be running if it needs to be deferred (in which case, deferred checks would also be executing)
// We should probably find a cleaner way to do this.
boolean save = resource.getRequestScope().notDeferred;
try {
resource.getRequestScope().notDeferred = true;
if (fieldName != null && !fieldName.isEmpty()) {
specificField(fieldName);
} else {
allFields();
}
} finally {
resource.getRequestScope().notDeferred = save;
}
}
/**
* Determine whether or not a specific field has the specified permission. If this field has the permission
* either by default or override, then this method will return successfully. Otherwise, a
* ForbiddenAccessException is thrown.
*
* @param theField Field to check
*/
private void specificField(String theField) {
assert resource.getRequestScope().isNotDeferred();
try {
resource.checkPermission(annotationClass, resource);
} catch (ForbiddenAccessException e) {
resource.checkFieldPermissionIfExists(annotationClass, resource, theField);
}
resource.checkFieldPermission(annotationClass, resource, theField);
}
/**
* Checks whether or not the object itself or ANY field on the object has the specified permission.
* If either condition is true, then this method will return without error. Otherwise, a
* ForbiddenAccessException is thrown.
*/
private void allFields() {
assert resource.getRequestScope().isNotDeferred();
EntityDictionary dictionary = resource.getDictionary();
try {
resource.checkPermission(annotationClass, resource);
return; // Object has permission
} catch (ForbiddenAccessException e) {
// Ignore
}
// Check attrs
for (String attr : dictionary.getAttributes(resource.getObject().getClass())) {
try {
specificField(attr);
return; // We have at least a single accessible field
} catch (ForbiddenAccessException e) {
// Ignore this.
}
}
// Check relationships
for (String rel : dictionary.getRelationships(resource.getObject().getClass())) {
try {
specificField(rel);
return; // We have at least a single accessible field
} catch (ForbiddenAccessException e) {
// Ignore
}
}
// No accessible fields and object is not accessible
throw new ForbiddenAccessException("Cannot access object '" + resource.getType() + "'",
resource.getRequestScope());
}
}
public void logAuthFailure(List<Class<? extends Check>> checks, String type, String id) {
failedAuthorizations.add(() -> {
return String.format("ForbiddenAccess %s %s#%s", checks, type, id);
});
}
public String getAuthFailureReason() {
Set<String> uniqueReasons = new HashSet<>();
StringBuffer buf = new StringBuffer();
buf.append("Failed authorization checks:\n");
for (Supplier<String> authorizationFailure : failedAuthorizations) {
String reason = authorizationFailure.get();
if (!uniqueReasons.contains(reason)) {
buf.append(authorizationFailure.get());
buf.append("\n");
uniqueReasons.add(reason);
}
}
return buf.toString();
>>>>>>>
commitTriggers.add(() -> resource.runTriggers(OnCommit.class, fieldName));
}
public void logAuthFailure(List<Class<? extends Check>> checks, String type, String id) {
failedAuthorizations.add(() -> {
return String.format("ForbiddenAccess %s %s#%s", checks, type, id);
});
}
public String getAuthFailureReason() {
Set<String> uniqueReasons = new HashSet<>();
StringBuffer buf = new StringBuffer();
buf.append("Failed authorization checks:\n");
for (Supplier<String> authorizationFailure : failedAuthorizations) {
String reason = authorizationFailure.get();
if (!uniqueReasons.contains(reason)) {
buf.append(authorizationFailure.get());
buf.append("\n");
uniqueReasons.add(reason);
}
}
return buf.toString(); |
<<<<<<<
private final ElideSettings elideSettings;
=======
private final boolean useFilterExpressions;
private final int updateStatusCode;
/**
* Instantiates a new Elide.
*
* @param auditLogger the audit logger
* @param dataStore the dataStore
* @param dictionary the dictionary
* @deprecated Since 2.1, use the {@link Elide.Builder} instead
*/
@Deprecated
public Elide(AuditLogger auditLogger, DataStore dataStore, EntityDictionary dictionary) {
this(auditLogger, dataStore, dictionary, new JsonApiMapper(dictionary));
}
/**
* Instantiates a new Elide.
*
* @param auditLogger the audit logger
* @param dataStore the dataStore
* @deprecated Since 2.1, use the {@link Elide.Builder} instead
*/
@Deprecated
public Elide(AuditLogger auditLogger, DataStore dataStore) {
this(auditLogger, dataStore, new EntityDictionary(new HashMap<>()));
}
/**
* Instantiates a new Elide.
*
* @param auditLogger the audit logger
* @param dataStore the dataStore
* @param dictionary the dictionary
* @param mapper Serializer/Deserializer for JSON API
* @deprecated Since 2.1, use the {@link Elide.Builder} instead
*/
@Deprecated
public Elide(AuditLogger auditLogger, DataStore dataStore, EntityDictionary dictionary, JsonApiMapper mapper) {
this(
auditLogger,
dataStore,
dictionary,
mapper,
ActivePermissionExecutor::new,
Collections.singletonList(new DefaultFilterDialect(dictionary)),
Collections.singletonList(new DefaultFilterDialect(dictionary)),
false,
HttpStatus.SC_NO_CONTENT
);
}
>>>>>>>
private final ElideSettings elideSettings;
private final boolean useFilterExpressions;
private final int updateStatusCode;
<<<<<<<
Pagination.MAX_PAGE_LIMIT,
Pagination.DEFAULT_PAGE_LIMIT
=======
false,
HttpStatus.SC_NO_CONTENT
>>>>>>>
Pagination.MAX_PAGE_LIMIT,
Pagination.DEFAULT_PAGE_LIMIT,
false,
HttpStatus.SC_NO_CONTENT
<<<<<<<
DataStore dataStore,
EntityDictionary dictionary,
JsonApiMapper mapper,
Function<RequestScope, PermissionExecutor> permissionExecutor,
List<JoinFilterDialect> joinFilterDialects,
List<SubqueryFilterDialect> subqueryFilterDialects,
int maxDefaultPageSize,
int defaultPageSize) {
=======
DataStore dataStore,
EntityDictionary dictionary,
JsonApiMapper mapper,
Function<RequestScope, PermissionExecutor> permissionExecutor,
List<JoinFilterDialect> joinFilterDialects,
List<SubqueryFilterDialect> subqueryFilterDialects,
boolean useFilterExpressions,
int updateStatusCode) {
>>>>>>>
DataStore dataStore,
EntityDictionary dictionary,
JsonApiMapper mapper,
Function<RequestScope, PermissionExecutor> permissionExecutor,
List<JoinFilterDialect> joinFilterDialects,
List<SubqueryFilterDialect> subqueryFilterDialects,
int maxDefaultPageSize,
int defaultPageSize,
boolean useFilterExpressions,
int updateStatusCode) {
<<<<<<<
this.elideSettings = new ElideSettings(maxDefaultPageSize, defaultPageSize);
=======
this.useFilterExpressions = useFilterExpressions;
this.updateStatusCode = updateStatusCode;
>>>>>>>
this.elideSettings = new ElideSettings(maxDefaultPageSize,
defaultPageSize, useFilterExpressions, updateStatusCode);
this.useFilterExpressions = useFilterExpressions;
this.updateStatusCode = updateStatusCode;
<<<<<<<
private int defaultMaxPageSize = Pagination.MAX_PAGE_LIMIT;
private int defaultPageSize = Pagination.DEFAULT_PAGE_LIMIT;
=======
private boolean useFilterExpressions;
private int updateStatusCode;
/**
* A new builder used to generate Elide instances. Instantiates an {@link EntityDictionary} without
* providing a mapping of security checks.
*
* @param auditLogger the logger to use for audit annotations
* @param dataStore the datastore used to communicate with the persistence layer
* @deprecated 2.3 use {@link #Builder(DataStore)}
*/
public Builder(AuditLogger auditLogger, DataStore dataStore) {
this.auditLogger = auditLogger;
this.dataStore = dataStore;
this.jsonApiMapper = new JsonApiMapper(entityDictionary);
this.joinFilterDialects = new ArrayList<>();
this.subqueryFilterDialects = new ArrayList<>();
updateStatusCode = HttpStatus.SC_NO_CONTENT;
}
>>>>>>>
private int defaultMaxPageSize = Pagination.MAX_PAGE_LIMIT;
private int defaultPageSize = Pagination.DEFAULT_PAGE_LIMIT;
private boolean useFilterExpressions;
private int updateStatusCode;
/**
* A new builder used to generate Elide instances. Instantiates an {@link EntityDictionary} without
* providing a mapping of security checks.
*
* @param auditLogger the logger to use for audit annotations
* @param dataStore the datastore used to communicate with the persistence layer
* @deprecated 2.3 use {@link #Builder(DataStore)}
*/
public Builder(AuditLogger auditLogger, DataStore dataStore) {
this.auditLogger = auditLogger;
this.dataStore = dataStore;
this.jsonApiMapper = new JsonApiMapper(entityDictionary);
this.joinFilterDialects = new ArrayList<>();
this.subqueryFilterDialects = new ArrayList<>();
updateStatusCode = HttpStatus.SC_NO_CONTENT;
}
<<<<<<<
defaultMaxPageSize,
defaultPageSize);
=======
useFilterExpressions,
updateStatusCode);
}
@Deprecated
public Builder auditLogger(final AuditLogger auditLogger) {
return withAuditLogger(auditLogger);
}
@Deprecated
public Builder entityDictionary(final EntityDictionary entityDictionary) {
return withEntityDictionary(entityDictionary);
}
@Deprecated
public Builder jsonApiMapper(final JsonApiMapper jsonApiMapper) {
return withJsonApiMapper(jsonApiMapper);
}
@Deprecated
public Builder permissionExecutor(final Function<RequestScope, PermissionExecutor> permissionExecutorFunction) {
return withPermissionExecutor(permissionExecutorFunction);
}
@Deprecated
public Builder permissionExecutor(final Class<? extends PermissionExecutor> permissionExecutorClass) {
return withPermissionExecutor(permissionExecutorClass);
>>>>>>>
defaultMaxPageSize,
defaultPageSize,
useFilterExpressions,
updateStatusCode);
<<<<<<<
public Builder withDefaultMaxPageSize(int maxPageSize) {
defaultMaxPageSize = maxPageSize;
return this;
}
public Builder withDefaultPageSize(int pageSize) {
defaultPageSize = pageSize;
return this;
}
=======
public Builder withUpdate200Status() {
updateStatusCode = HttpStatus.SC_OK;
return this;
}
public Builder withUpdate204Status() {
updateStatusCode = HttpStatus.SC_NO_CONTENT;
return this;
}
>>>>>>>
public Builder withDefaultMaxPageSize(int maxPageSize) {
defaultMaxPageSize = maxPageSize;
return this;
}
public Builder withDefaultPageSize(int pageSize) {
defaultPageSize = pageSize;
return this;
}
public Builder withUpdate200Status() {
updateStatusCode = HttpStatus.SC_OK;
return this;
}
public Builder withUpdate204Status() {
updateStatusCode = HttpStatus.SC_NO_CONTENT;
return this;
}
public Builder withUseFilterExpressions(boolean useFilterExpressions) {
this.useFilterExpressions = useFilterExpressions;
return this;
}
<<<<<<<
PatchRequestScope patchRequestScope = new PatchRequestScope(
path,
transaction,
user,
dictionary,
mapper,
auditLogger,
permissionExecutor,
elideSettings,
new MultipleFilterDialect(joinFilterDialects, subqueryFilterDialects));
=======
PatchRequestScope patchRequestScope = new PatchRequestScope(
path,
transaction,
user,
dictionary,
mapper,
auditLogger,
permissionExecutor,
new MultipleFilterDialect(joinFilterDialects, subqueryFilterDialects),
useFilterExpressions,
updateStatusCode
);
>>>>>>>
PatchRequestScope patchRequestScope = new PatchRequestScope(
path,
transaction,
user,
dictionary,
mapper,
auditLogger,
permissionExecutor,
elideSettings,
new MultipleFilterDialect(joinFilterDialects, subqueryFilterDialects));
<<<<<<<
elideSettings,
new MultipleFilterDialect(joinFilterDialects, subqueryFilterDialects));
=======
new MultipleFilterDialect(joinFilterDialects, subqueryFilterDialects),
useFilterExpressions,
updateStatusCode);
>>>>>>>
elideSettings,
new MultipleFilterDialect(joinFilterDialects, subqueryFilterDialects)); |
<<<<<<<
import com.fasterxml.jackson.databind.JsonNode;
import com.google.common.collect.Sets;
=======
import example.Child;
import example.FunWithPermissions;
import example.Invoice;
import example.LineItem;
import example.Parent;
import example.User;
>>>>>>>
import com.fasterxml.jackson.databind.JsonNode;
import com.google.common.collect.Sets;
import example.Child;
import example.FunWithPermissions;
import example.Invoice;
import example.LineItem;
import example.Parent;
import example.User;
<<<<<<<
tx.commit(null);
=======
Invoice invoice = new Invoice();
invoice.setId(1);
LineItem item = new LineItem();
invoice.setItems(Sets.newHashSet(item));
item.setInvoice(invoice);
tx.save(invoice);
tx.save(item);
tx.commit();
>>>>>>>
Invoice invoice = new Invoice();
invoice.setId(1);
LineItem item = new LineItem();
invoice.setItems(Sets.newHashSet(item));
item.setInvoice(invoice);
tx.save(invoice, null);
tx.save(item, null);
tx.commit(null); |
<<<<<<<
import com.yahoo.elide.core.exceptions.InvalidOperationException;
=======
import com.yahoo.elide.security.RequestScope;
import com.yahoo.elide.core.filter.InMemoryFilterOperation;
import com.yahoo.elide.core.filter.Predicate;
>>>>>>>
import com.yahoo.elide.security.RequestScope;
<<<<<<<
=======
import java.util.Random;
import java.util.Set;
>>>>>>>
import java.util.Random; |
<<<<<<<
public File build(String baseName, Path dir, File primaryArtifactFile) {
=======
public File build(Path dir, File primaryArtifactFile) throws IOException {
>>>>>>>
public File build(Path dir, File primaryArtifactFile) { |
<<<<<<<
=======
import net.bither.preference.AppSharedPreference;
>>>>>>>
import net.bither.preference.AppSharedPreference;
<<<<<<<
public static int IMAGE_SIZE = 612;
public static int getScreenWidth() {
return BitherApplication.mContext.getResources().getDisplayMetrics().widthPixels;
}
=======
public static int IMAGE_SIZE = 612;
public static int IMAGE_SMALL_SIZE = 150;
>>>>>>>
public static int IMAGE_SMALL_SIZE = 150;
public static int IMAGE_SIZE = 612;
public static int getScreenWidth() {
return BitherApplication.mContext.getResources().getDisplayMetrics().widthPixels;
}
<<<<<<<
=======
public static int getScreenWidth() {
return BitherApplication.mContext.getResources().getDisplayMetrics().widthPixels;
}
>>>>>>>
<<<<<<<
private static Bitmap getBitmapNearestSize(byte[] bytes, int size) {
try {
BitmapFactory.Options opts = new BitmapFactory.Options();
opts.inJustDecodeBounds = true;
BitmapFactory.decodeByteArray(bytes, 0, bytes.length, opts);
int bmpSize = Math.min(opts.outHeight, opts.outWidth);
opts.inSampleSize = getSampleSize(bmpSize, size);
opts.inJustDecodeBounds = false;
opts.inPurgeable = true;
opts.inInputShareable = false;
opts.inPreferredConfig = Config.ARGB_8888;
return BitmapFactory.decodeByteArray(bytes, 0, bytes.length, opts);
} catch (Exception e) {
e.printStackTrace();
return null;
}
}
=======
>>>>>>>
<<<<<<<
=======
private static Bitmap getBitmapNearestSize(byte[] bytes, int size) {
try {
BitmapFactory.Options opts = new BitmapFactory.Options();
opts.inJustDecodeBounds = true;
BitmapFactory.decodeByteArray(bytes, 0, bytes.length, opts);
int bmpSize = Math.min(opts.outHeight, opts.outWidth);
opts.inSampleSize = getSampleSize(bmpSize, size);
opts.inJustDecodeBounds = false;
opts.inPurgeable = true;
opts.inInputShareable = false;
opts.inPreferredConfig = Config.ARGB_8888;
return BitmapFactory.decodeByteArray(bytes, 0, bytes.length, opts);
} catch (Exception e) {
e.printStackTrace();
return null;
}
}
>>>>>>> |
<<<<<<<
public int addHDKey(String encryptSeed, String encryptHdSeed, String firstAddress, boolean isXrandom, String addressOfPS) {
=======
public int addHDKey(String encryptSeed, String encryptHDSeed,
String firstAddress, boolean isXrandom, String addressOfPS) {
>>>>>>>
public int addHDKey(String encryptSeed, String encryptHdSeed, String firstAddress, boolean isXrandom, String addressOfPS) {
<<<<<<<
public void addHDMBId(HDMBId bitherId, String addressOfPS) {
=======
public void addHDMBId(HDMBId hdmId, String addressOfPS) {
>>>>>>>
public void addHDMBId(HDMBId bitherId, String addressOfPS) {
<<<<<<<
cv.put(AbstractDb.HDMBIdColumns.HDM_BID, bitherId.getAddress());
cv.put(AbstractDb.HDMBIdColumns.ENCRYPT_BITHER_PASSWORD, bitherId.getEncryptedBitherPasswordString());
=======
cv.put(AbstractDb.HDMBIdColumns.HDM_BID, hdmId.getAddress());
cv.put(AbstractDb.HDMBIdColumns.ENCRYPT_BITHER_PASSWORD, getEncryptedBitherPasswordString);
>>>>>>>
cv.put(AbstractDb.HDMBIdColumns.HDM_BID, bitherId.getAddress());
cv.put(AbstractDb.HDMBIdColumns.ENCRYPT_BITHER_PASSWORD, bitherId.getEncryptedBitherPasswordString());
cv.put(AbstractDb.HDMBIdColumns.HDM_BID, hdmId.getAddress());
cv.put(AbstractDb.HDMBIdColumns.ENCRYPT_BITHER_PASSWORD, getEncryptedBitherPasswordString); |
<<<<<<<
long chunkKey = ChunkPos.asLong(pos.intX() >> 4, pos.intZ() >> 4);
FootprintRenderer.addFootprint(chunkKey, player.worldObj.provider.getDimension(), pos, player.rotationYaw, player.getName());
=======
long chunkKey = ChunkCoordIntPair.chunkXZ2Int(pos.intX() >> 4, pos.intZ() >> 4);
int lightmapVal = player.worldObj.getCombinedLight(new BlockPos(pos.intX(), pos.intY(), pos.intZ()), 0);
FootprintRenderer.addFootprint(chunkKey, GCCoreUtil.getDimensionID(player.worldObj), pos, player.rotationYaw, player.getName(), lightmapVal);
>>>>>>>
long chunkKey = ChunkPos.asLong(pos.intX() >> 4, pos.intZ() >> 4);
int lightmapVal = player.worldObj.getCombinedLight(new BlockPos(pos.intX(), pos.intY(), pos.intZ()), 0);
FootprintRenderer.addFootprint(chunkKey, GCCoreUtil.getDimensionID(player.worldObj), pos, player.rotationYaw, player.getName(), lightmapVal); |
<<<<<<<
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.util.NonNullList;
import ic2.api.recipe.Recipes;
=======
import net.minecraftforge.oredict.OreDictionary;
>>>>>>>
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.util.NonNullList; |
<<<<<<<
import micdoodle8.mods.galacticraft.core.client.sounds.GCSounds;
import micdoodle8.mods.galacticraft.core.dimension.SpaceRace;
import micdoodle8.mods.galacticraft.core.dimension.SpaceRaceManager;
=======
>>>>>>>
import micdoodle8.mods.galacticraft.core.client.sounds.GCSounds;
<<<<<<<
List<ItemStack> stackList = GalacticraftRegistry.getDungeonLoot(2);
int range = 2;
//If player seems to have Tier 3 rocket already then add Astro Miner to the loot
final EntityPlayer player = this.worldObj.getClosestPlayer(this.posX, this.posY, this.posZ, 20.0, false);
=======
List<ItemStack> stackList = new LinkedList<>();
stackList.addAll(GalacticraftRegistry.getDungeonLoot(2));
boolean hasT3Rocket = false;
boolean hasAstroMiner = false;
// Check if player seems to have Tier 3 rocket or Astro Miner already - in that case we don't want more
// (we don't really want him giving powerful schematics to his friends who are still on Overworld)
final EntityPlayer player = this.worldObj.getClosestPlayer(this.posX, this.posY, this.posZ, 20.0);
>>>>>>>
List<ItemStack> stackList = new LinkedList<>();
stackList.addAll(GalacticraftRegistry.getDungeonLoot(2));
boolean hasT3Rocket = false;
boolean hasAstroMiner = false;
// Check if player seems to have Tier 3 rocket or Astro Miner already - in that case we don't want more
// (we don't really want him giving powerful schematics to his friends who are still on Overworld)
final EntityPlayer player = this.worldObj.getClosestPlayer(this.posX, this.posY, this.posZ, 20.0, false); |
<<<<<<<
final float var5 = playerIn.prevRotationPitch + (playerIn.rotationPitch - playerIn.prevRotationPitch) * var4;
final float var6 = playerIn.prevRotationYaw + (playerIn.rotationYaw - playerIn.prevRotationYaw) * var4;
final double var7 = playerIn.prevPosX + (playerIn.posX - playerIn.prevPosX) * var4;
final double var9 = playerIn.prevPosY + (playerIn.posY - playerIn.prevPosY) * var4 + 1.62D - playerIn.getYOffset();
final double var11 = playerIn.prevPosZ + (playerIn.posZ - playerIn.prevPosZ) * var4;
final Vec3d var13 = new Vec3d(var7, var9, var11);
final float var14 = MathHelper.cos(-var6 * 0.017453292F - (float) Math.PI);
final float var15 = MathHelper.sin(-var6 * 0.017453292F - (float) Math.PI);
final float var16 = -MathHelper.cos(-var5 * 0.017453292F);
final float var17 = MathHelper.sin(-var5 * 0.017453292F);
=======
final float var5 = par3EntityPlayer.prevRotationPitch + (par3EntityPlayer.rotationPitch - par3EntityPlayer.prevRotationPitch) * var4;
final float var6 = par3EntityPlayer.prevRotationYaw + (par3EntityPlayer.rotationYaw - par3EntityPlayer.prevRotationYaw) * var4;
final double var7 = par3EntityPlayer.prevPosX + (par3EntityPlayer.posX - par3EntityPlayer.prevPosX) * var4;
final double var9 = par3EntityPlayer.prevPosY + (par3EntityPlayer.posY - par3EntityPlayer.prevPosY) * var4 + 1.62D - par3EntityPlayer.getYOffset();
final double var11 = par3EntityPlayer.prevPosZ + (par3EntityPlayer.posZ - par3EntityPlayer.prevPosZ) * var4;
final Vec3 var13 = new Vec3(var7, var9, var11);
final float var14 = MathHelper.cos(-var6 / Constants.RADIANS_TO_DEGREES - (float) Math.PI);
final float var15 = MathHelper.sin(-var6 / Constants.RADIANS_TO_DEGREES - (float) Math.PI);
final float var16 = -MathHelper.cos(-var5 / Constants.RADIANS_TO_DEGREES);
final float var17 = MathHelper.sin(-var5 / Constants.RADIANS_TO_DEGREES);
>>>>>>>
final float var5 = playerIn.prevRotationPitch + (playerIn.rotationPitch - playerIn.prevRotationPitch) * var4;
final float var6 = playerIn.prevRotationYaw + (playerIn.rotationYaw - playerIn.prevRotationYaw) * var4;
final double var7 = playerIn.prevPosX + (playerIn.posX - playerIn.prevPosX) * var4;
final double var9 = playerIn.prevPosY + (playerIn.posY - playerIn.prevPosY) * var4 + 1.62D - playerIn.getYOffset();
final double var11 = playerIn.prevPosZ + (playerIn.posZ - playerIn.prevPosZ) * var4;
final Vec3d var13 = new Vec3d(var7, var9, var11);
final float var14 = MathHelper.cos(-var6 / Constants.RADIANS_TO_DEGREES - (float) Math.PI);
final float var15 = MathHelper.sin(-var6 / Constants.RADIANS_TO_DEGREES - (float) Math.PI);
final float var16 = -MathHelper.cos(-var5 / Constants.RADIANS_TO_DEGREES);
final float var17 = MathHelper.sin(-var5 / Constants.RADIANS_TO_DEGREES); |
<<<<<<<
RecipeUtil.addRecipe(new ItemStack(GCItems.battery, 2, 100), new Object[] { " T ", "TRT", "TCT", 'T', "compressedTin", 'R', Items.REDSTONE, 'C', Items.COAL });
=======
RecipeUtil.addRecipe(new ItemStack(GCItems.battery, 2, 100), new Object[] { " T ", "TRT", "TCT", 'T', "compressedTin", 'R', "dustRedstone", 'C', Items.coal });
>>>>>>>
RecipeUtil.addRecipe(new ItemStack(GCItems.battery, 2, 100), new Object[] { " T ", "TRT", "TCT", 'T', "compressedTin", 'R', "dustRedstone", 'C', Items.COAL });
<<<<<<<
RecipeUtil.addRecipe(new ItemStack(GCItems.canvas, 1), new Object[] { " XY", "XXX", "YX ", 'Y', Items.STICK, 'X', Items.STRING });
=======
RecipeUtil.addRecipe(new ItemStack(GCItems.canvas, 1), new Object[] { " XY", "XXX", "YX ", 'Y', "stickWood", 'X', Items.string });
>>>>>>>
RecipeUtil.addRecipe(new ItemStack(GCItems.canvas, 1), new Object[] { " XY", "XXX", "YX ", 'Y', "stickWood", 'X', "string" });
<<<<<<<
RecipeUtil.addRecipe(new ItemStack(GCBlocks.oxygenDetector, 1), new Object[] { "WWW", "YVY", "ZUZ", 'U', "compressedAluminum", 'V', "waferBasic", 'W', "compressedSteel", 'X', GCItems.oxygenFan, 'Y', GCItems.oxygenVent, 'Z', Items.REDSTONE });
=======
RecipeUtil.addRecipe(new ItemStack(GCBlocks.oxygenDetector, 1), new Object[] { "WWW", "YVY", "ZUZ", 'U', "compressedAluminum", 'V', "waferBasic", 'W', "compressedSteel", 'X', GCItems.oxygenFan, 'Y', GCItems.oxygenVent, 'Z', "dustRedstone" });
>>>>>>>
RecipeUtil.addRecipe(new ItemStack(GCBlocks.oxygenDetector, 1), new Object[] { "WWW", "YVY", "ZUZ", 'U', "compressedAluminum", 'V', "waferBasic", 'W', "compressedSteel", 'X', GCItems.oxygenFan, 'Y', GCItems.oxygenVent, 'Z', "dustRedstone" });
<<<<<<<
RecipeUtil.addRecipe(new ItemStack(GCItems.basicItem, 1, 20), new Object[] { "WVW", "YXY", "YZY", 'X', "compressedSteel", 'Y', "compressedBronze", 'Z', "waferBasic", 'W', Items.REDSTONE, 'V', GCItems.oxygenVent });
=======
RecipeUtil.addRecipe(new ItemStack(GCItems.basicItem, 1, 20), new Object[] { "WVW", "YXY", "YZY", 'X', "compressedSteel", 'Y', "compressedBronze", 'Z', "waferBasic", 'W', "dustRedstone", 'V', GCItems.oxygenVent });
>>>>>>>
RecipeUtil.addRecipe(new ItemStack(GCItems.basicItem, 1, 20), new Object[] { "WVW", "YXY", "YZY", 'X', "compressedSteel", 'Y', "compressedBronze", 'Z', "waferBasic", 'W', "dustRedstone", 'V', GCItems.oxygenVent });
<<<<<<<
RecipeUtil.addRecipe(new ItemStack(GCBlocks.refinery), new Object[] { " Z ", "WZW", "XYX", 'X', "compressedSteel", 'Y', Blocks.FURNACE, 'Z', new ItemStack(GCItems.canister, 1, 1), 'W', Blocks.STONE });
=======
RecipeUtil.addRecipe(new ItemStack(GCBlocks.refinery), new Object[] { " Z ", "WZW", "XYX", 'X', "compressedSteel", 'Y', Blocks.furnace, 'Z', new ItemStack(GCItems.canister, 1, 1), 'W', "stone" });
>>>>>>>
RecipeUtil.addRecipe(new ItemStack(GCBlocks.refinery), new Object[] { " Z ", "WZW", "XYX", 'X', "compressedSteel", 'Y', Blocks.FURNACE, 'Z', new ItemStack(GCItems.canister, 1, 1), 'W', "stone" });
<<<<<<<
RecipeUtil.addRecipe(new ItemStack(GCBlocks.radioTelescope), new Object[] { "XFX", " X ", "WYW", 'X', "compressedAluminum", 'Y', new ItemStack(Blocks.IRON_BLOCK), 'W', "waferAdvanced", 'F', new ItemStack(GCItems.basicItem, 1, 19) });
=======
RecipeUtil.addRecipe(new ItemStack(GCBlocks.radioTelescope), new Object[] { "XFX", " X ", "WYW", 'X', "compressedAluminum", 'Y', "blockIron", 'W', "waferAdvanced", 'F', new ItemStack(GCItems.basicItem, 1, 19) });
>>>>>>>
RecipeUtil.addRecipe(new ItemStack(GCBlocks.radioTelescope), new Object[] { "XFX", " X ", "WYW", 'X', "compressedAluminum", 'Y', "blockIron", 'W', "waferAdvanced", 'F', new ItemStack(GCItems.basicItem, 1, 19) });
<<<<<<<
RecipeUtil.addRecipe(new ItemStack(GCBlocks.machineBase3, 1, BlockMachine3.PAINTER_METADATA), new Object[] { "ABC", "DEF", "GHI", 'A', new ItemStack(Items.DYE, 1, 1), 'B', new ItemStack(Items.DYE, 1, 13), 'C', new ItemStack(Items.DYE, 1, 4), 'D', new ItemStack(Items.DYE, 1, 14), 'E', "compressedSteel", 'F', new ItemStack(Items.DYE, 1, 6), 'G', new ItemStack(Items.DYE, 1, 11), 'H', new ItemStack(Items.DYE, 1, 10), 'I', new ItemStack(Items.DYE, 1, 2) });
CraftingManager.getInstance().getRecipeList().add(new ShapelessOreRecipe(new ItemStack(GCBlocks.crafting, 1), Blocks.CRAFTING_TABLE, "compressedIron"));
=======
RecipeUtil.addRecipe(new ItemStack(GCBlocks.machineBase3, 1, BlockMachine3.PAINTER_METADATA), new Object[] { "ABC", "DEF", "GHI", 'A', "dyeRed", 'B', "dyeMagenta", 'C', "dyeBlue", 'D', "dyeOrange", 'E', "compressedSteel", 'F', "dyeCyan", 'G', "dyeYellow", 'H', "dyeLime", 'I', "dyeGreen" });
CraftingManager.getInstance().getRecipeList().add(new ShapelessOreRecipe(new ItemStack(GCBlocks.crafting, 1), new Object[] { Blocks.crafting_table, "compressedIron" }));
>>>>>>>
RecipeUtil.addRecipe(new ItemStack(GCBlocks.machineBase3, 1, BlockMachine3.PAINTER_METADATA), new Object[] { "ABC", "DEF", "GHI", 'A', "dyeRed", 'B', "dyeMagenta", 'C', "dyeBlue", 'D', "dyeOrange", 'E', "compressedSteel", 'F', "dyeCyan", 'G', "dyeYellow", 'H', "dyeLime", 'I', "dyeGreen" });
CraftingManager.getInstance().getRecipeList().add(new ShapelessOreRecipe(new ItemStack(GCBlocks.crafting, 1), Blocks.CRAFTING_TABLE, "compressedIron"));
<<<<<<<
// Concealed redstone
RecipeUtil.addRecipe(new ItemStack(GCBlocks.concealedRedstone, 4, 0), new Object[] { " X ", "XYX", " X ", 'X', new ItemStack(GCBlocks.basicBlock, 1, 4), 'Y', Items.REDSTONE });
RecipeUtil.addRecipe(new ItemStack(GCBlocks.concealedRepeater_Unpowered, 1, 0), new Object[] { " ", "XYX", " ", 'X', new ItemStack(GCBlocks.basicBlock, 1, 4), 'Y', Items.REPEATER });
CraftingManager.getInstance().getRecipeList().add(new ShapelessOreRecipe(new ItemStack(GCItems.basicItem, 1, 15), new Object[] { new ItemStack(GCItems.canister, 1, 0), Items.APPLE, Items.APPLE }));
=======
// Concealed redstone
RecipeUtil.addRecipe(new ItemStack(GCBlocks.concealedRedstone, 4, 0), new Object[] { " X ", "XYX", " X ", 'X', new ItemStack(GCBlocks.basicBlock, 1, 4), 'Y', "dustRedstone" });
RecipeUtil.addRecipe(new ItemStack(GCBlocks.concealedRepeater_Unpowered, 1, 0), new Object[] { " ", "XYX", " ", 'X', new ItemStack(GCBlocks.basicBlock, 1, 4), 'Y', Items.repeater });
CraftingManager.getInstance().getRecipeList().add(new ShapelessOreRecipe(new ItemStack(GCItems.basicItem, 1, 15), new Object[] { new ItemStack(GCItems.canister, 1, 0), Items.apple, Items.apple }));
>>>>>>>
// Concealed redstone
RecipeUtil.addRecipe(new ItemStack(GCBlocks.concealedRedstone, 4, 0), new Object[] { " X ", "XYX", " X ", 'X', new ItemStack(GCBlocks.basicBlock, 1, 4), 'Y', "dustRedstone" });
RecipeUtil.addRecipe(new ItemStack(GCBlocks.concealedRepeater_Unpowered, 1, 0), new Object[] { " ", "XYX", " ", 'X', new ItemStack(GCBlocks.basicBlock, 1, 4), 'Y', Items.REPEATER });
CraftingManager.getInstance().getRecipeList().add(new ShapelessOreRecipe(new ItemStack(GCItems.basicItem, 1, 15), new Object[] { new ItemStack(GCItems.canister, 1, 0), Items.APPLE, Items.APPLE })); |
<<<<<<<
stack.shrink(1);
=======
SpaceRaceManager.teamUnlockSchematic(playerBase, stack);
if (--stack.stackSize <= 0)
{
stack = null;
}
>>>>>>>
SpaceRaceManager.teamUnlockSchematic(playerBase, stack);
stack.shrink(1); |
<<<<<<<
import java.util.Collections;
import java.util.List;
=======
>>>>>>>
import java.util.Collections;
import java.util.List;
<<<<<<<
import org.n52.sos.aqd.AqdConstants.ElementType;
import org.n52.sos.aqd.AqdUomRepository;
import org.n52.sos.aqd.AqdUomRepository.Uom;
import org.n52.sos.ds.hibernate.entities.observation.Observation;
import org.n52.sos.ds.hibernate.entities.observation.ereporting.AbstractEReportingObservation;
import org.n52.sos.ds.hibernate.entities.observation.ereporting.full.EReportingBlobObservation;
import org.n52.sos.ds.hibernate.entities.observation.ereporting.full.EReportingBooleanObservation;
import org.n52.sos.ds.hibernate.entities.observation.ereporting.full.EReportingCategoryObservation;
import org.n52.sos.ds.hibernate.entities.observation.ereporting.full.EReportingCountObservation;
import org.n52.sos.ds.hibernate.entities.observation.ereporting.full.EReportingGeometryObservation;
import org.n52.sos.ds.hibernate.entities.observation.ereporting.full.EReportingNumericObservation;
import org.n52.sos.ds.hibernate.entities.observation.ereporting.full.EReportingSweDataArrayObservation;
import org.n52.sos.ds.hibernate.entities.observation.ereporting.full.EReportingTextObservation;
import org.n52.sos.ogc.OGCConstants;
import org.n52.sos.ogc.gml.time.Time;
import org.n52.sos.ogc.gml.time.TimeInstant;
import org.n52.sos.ogc.gml.time.TimePeriod;
=======
import org.n52.sos.ds.hibernate.entities.AbstractObservation;
import org.n52.sos.ds.hibernate.entities.ereporting.EReportingBlobObservation;
import org.n52.sos.ds.hibernate.entities.ereporting.EReportingBooleanObservation;
import org.n52.sos.ds.hibernate.entities.ereporting.EReportingCategoryObservation;
import org.n52.sos.ds.hibernate.entities.ereporting.EReportingCountObservation;
import org.n52.sos.ds.hibernate.entities.ereporting.EReportingGeometryObservation;
import org.n52.sos.ds.hibernate.entities.ereporting.EReportingNumericObservation;
import org.n52.sos.ds.hibernate.entities.ereporting.EReportingObservation;
import org.n52.sos.ds.hibernate.entities.ereporting.EReportingSeries;
import org.n52.sos.ds.hibernate.entities.ereporting.EReportingSweDataArrayObservation;
import org.n52.sos.ds.hibernate.entities.ereporting.EReportingTextObservation;
>>>>>>>
import org.n52.sos.ds.hibernate.entities.observation.Observation;
import org.n52.sos.ds.hibernate.entities.observation.ereporting.AbstractEReportingObservation;
import org.n52.sos.ds.hibernate.entities.observation.ereporting.full.EReportingBlobObservation;
import org.n52.sos.ds.hibernate.entities.observation.ereporting.full.EReportingBooleanObservation;
import org.n52.sos.ds.hibernate.entities.observation.ereporting.full.EReportingCategoryObservation;
import org.n52.sos.ds.hibernate.entities.observation.ereporting.full.EReportingCountObservation;
import org.n52.sos.ds.hibernate.entities.observation.ereporting.full.EReportingGeometryObservation;
import org.n52.sos.ds.hibernate.entities.observation.ereporting.full.EReportingNumericObservation;
import org.n52.sos.ds.hibernate.entities.observation.ereporting.full.EReportingSweDataArrayObservation;
import org.n52.sos.ds.hibernate.entities.observation.ereporting.full.EReportingTextObservation;
<<<<<<<
private static final Set<AdditionalObservationCreatorKey> KEYS
= AdditionalObservationCreatorRepository
.encoderKeysForElements(AqdConstants.NS_AQD,
AbstractEReportingObservation.class,
EReportingBlobObservation.class,
EReportingBooleanObservation.class,
EReportingCategoryObservation.class,
EReportingCountObservation.class,
EReportingGeometryObservation.class,
EReportingNumericObservation.class,
EReportingSweDataArrayObservation.class,
EReportingTextObservation.class);
private final EReportingObservationHelper helper
= new EReportingObservationHelper();
=======
private final EReportingObservationHelper helper = new EReportingObservationHelper();
>>>>>>>
private static final Set<AdditionalObservationCreatorKey> KEYS
= AdditionalObservationCreatorRepository
.encoderKeysForElements(AqdConstants.NS_AQD,
AbstractEReportingObservation.class,
EReportingBlobObservation.class,
EReportingBooleanObservation.class,
EReportingCategoryObservation.class,
EReportingCountObservation.class,
EReportingGeometryObservation.class,
EReportingNumericObservation.class,
EReportingSweDataArrayObservation.class,
EReportingTextObservation.class);
private final EReportingObservationHelper helper
= new EReportingObservationHelper();
<<<<<<<
public OmObservation create(OmObservation omObservation, Observation<?> observation) {
if (observation instanceof AbstractEReportingObservation) {
for (NamedValue<?> namedValue : helper.createSamplingPointParameter(((AbstractEReportingObservation) observation)
.getEReportingSeries())) {
omObservation.addParameter(namedValue);
}
// if (omObservation.getValue() instanceof
// SingleObservationValue<?>) {
// addQualityFlags((SingleObservationValue<?>)omObservation.getValue(),
// (EReportingObservation)observation);
// }
omObservation.setValue(createSweDataArrayValue(omObservation, (AbstractEReportingObservation) observation));
=======
public OmObservation create(OmObservation omObservation, AbstractObservation observation) {
if (observation instanceof EReportingObservation) {
EReportingObservation eReportingObservation = (EReportingObservation) observation;
create(omObservation, eReportingObservation.getEReportingSeries());
add(omObservation, observation);
omObservation.setValue(EReportingHelper.createSweDataArrayValue(omObservation, eReportingObservation));
>>>>>>>
public OmObservation create(OmObservation omObservation, Observation<?> observation) {
if (observation instanceof AbstractEReportingObservation) {
for (NamedValue<?> namedValue : helper.createSamplingPointParameter(((AbstractEReportingObservation) observation)
.getEReportingSeries())) {
omObservation.addParameter(namedValue);
}
// if (omObservation.getValue() instanceof
// SingleObservationValue<?>) {
// addQualityFlags((SingleObservationValue<?>)omObservation.getValue(),
// (EReportingObservation)observation);
// }
omObservation.setValue(createSweDataArrayValue(omObservation, (AbstractEReportingObservation) observation));
<<<<<<<
private void addQualityFlags(SingleObservationValue<?> value, AbstractEReportingObservation<?> observation) {
value.addQuality(new SosQuality(ElementType.Validation.name(), null, Integer.toString(observation
.getValidation()), ElementType.Validation.getDefinition(), QualityType.category));
value.addQuality(new SosQuality(ElementType.Verification.name(), null, Integer.toString(observation
.getVerification()), ElementType.Verification.getDefinition(), QualityType.category));
}
@SuppressWarnings({ "rawtypes", "unchecked" })
private SingleObservationValue<?> createSweDataArrayValue(OmObservation omObservation,
AbstractEReportingObservation observation) {
SweDataArray sweDataArray = new SweDataArray();
sweDataArray.setElementCount(createElementCount(omObservation));
sweDataArray.setElementType(createElementType(omObservation.getValue().getValue().getUnit()));
sweDataArray.setEncoding(createEncoding(omObservation));
sweDataArray.setValues(createValue(omObservation, observation));
SweDataArrayValue sweDataArrayValue = new SweDataArrayValue();
sweDataArrayValue.setValue(sweDataArray);
SingleObservationValue observationValue = new SingleObservationValue(sweDataArrayValue);
observationValue.setPhenomenonTime(omObservation.getPhenomenonTime());
return observationValue;
}
private SweCount createElementCount(OmObservation omObservation) {
return new SweCount().setValue(1);
}
private SweAbstractDataComponent createElementType(String unit) {
SweDataRecord dataRecord = new SweDataRecord();
dataRecord.setDefinition(AqdConstants.NAME_FIXED_OBSERVATIONS);
dataRecord.addField(createField(ElementType.StartTime, createSweTimeSamplingTime(ElementType.StartTime)));
dataRecord.addField(createField(ElementType.EndTime, createSweTimeSamplingTime(ElementType.EndTime)));
dataRecord.addField(createField(ElementType.Verification, createSweCatagory(ElementType.Verification)));
dataRecord.addField(createField(ElementType.Validation, createSweCatagory(ElementType.Validation)));
dataRecord.addField(createField(ElementType.Pollutant, createSweQuantity(ElementType.Pollutant, unit)));
return dataRecord;
}
private SweField createField(ElementType elementType, SweAbstractDataComponent content) {
return new SweField(elementType.name(), content);
}
private SweAbstractDataComponent createSweTimeSamplingTime(ElementType elementType) {
SweTime time = new SweTime();
time.setDefinition(elementType.getDefinition());
if (elementType.isSetUOM()) {
time.setUom(elementType.getUOM());
}
return time;
}
private SweAbstractDataComponent createSweCatagory(ElementType elementType) {
return new SweCategory().setDefinition(elementType.getDefinition());
}
private SweAbstractDataComponent createSweQuantity(ElementType elementType, String unit) {
SweQuantity quantity = new SweQuantity();
quantity.setDefinition(elementType.getDefinition());
Uom aqdUom = AqdUomRepository.getAqdUom(unit);
if (aqdUom != null) {
quantity.setUom(aqdUom.getConceptURI());
} else {
quantity.setUom(OGCConstants.UNKNOWN);
}
return quantity;
}
private SweAbstractEncoding createEncoding(OmObservation omObservation) {
return SweHelper.createTextEncoding(omObservation);
}
private List<List<String>> createValue(OmObservation omObservation, AbstractEReportingObservation<?> observation) {
List<String> value = Lists.newArrayListWithCapacity(5);
addTimes(value, omObservation.getPhenomenonTime());
addIntegerValue(value, observation.getVerification());
addIntegerValue(value, observation.getValidation());
addPollutant(value, omObservation);
List<List<String>> list = Lists.newArrayList();
list.add(value);
return list;
}
private void addIntegerValue(List<String> list, Integer value) {
if (value != null) {
list.add(Integer.toString(value));
} else {
list.add(Constants.EMPTY_STRING);
}
}
private void addPollutant(List<String> value, OmObservation omObservation) {
if (omObservation.getValue() instanceof SingleObservationValue<?>) {
value.add(JavaHelper.asString(omObservation.getValue().getValue().getValue()));
} else {
value.add(Constants.EMPTY_STRING);
=======
@Override
public OmObservation create(OmObservation omObservation, EReportingSeries series) {
for (NamedValue<?> namedValue : helper.createOmParameterForEReporting(series)) {
omObservation.addParameter(namedValue);
>>>>>>>
private void addQualityFlags(SingleObservationValue<?> value, AbstractEReportingObservation<?> observation) {
value.addQuality(new SosQuality(ElementType.Validation.name(), null, Integer.toString(observation
.getValidation()), ElementType.Validation.getDefinition(), QualityType.category));
value.addQuality(new SosQuality(ElementType.Verification.name(), null, Integer.toString(observation
.getVerification()), ElementType.Verification.getDefinition(), QualityType.category));
}
@SuppressWarnings({ "rawtypes", "unchecked" })
private SingleObservationValue<?> createSweDataArrayValue(OmObservation omObservation,
AbstractEReportingObservation observation) {
SweDataArray sweDataArray = new SweDataArray();
sweDataArray.setElementCount(createElementCount(omObservation));
sweDataArray.setElementType(createElementType(omObservation.getValue().getValue().getUnit()));
sweDataArray.setEncoding(createEncoding(omObservation));
sweDataArray.setValues(createValue(omObservation, observation));
SweDataArrayValue sweDataArrayValue = new SweDataArrayValue();
sweDataArrayValue.setValue(sweDataArray);
SingleObservationValue observationValue = new SingleObservationValue(sweDataArrayValue);
observationValue.setPhenomenonTime(omObservation.getPhenomenonTime());
return observationValue;
}
private SweCount createElementCount(OmObservation omObservation) {
return new SweCount().setValue(1);
}
private SweAbstractDataComponent createElementType(String unit) {
SweDataRecord dataRecord = new SweDataRecord();
dataRecord.setDefinition(AqdConstants.NAME_FIXED_OBSERVATIONS);
dataRecord.addField(createField(ElementType.StartTime, createSweTimeSamplingTime(ElementType.StartTime)));
dataRecord.addField(createField(ElementType.EndTime, createSweTimeSamplingTime(ElementType.EndTime)));
dataRecord.addField(createField(ElementType.Verification, createSweCatagory(ElementType.Verification)));
dataRecord.addField(createField(ElementType.Validation, createSweCatagory(ElementType.Validation)));
dataRecord.addField(createField(ElementType.Pollutant, createSweQuantity(ElementType.Pollutant, unit)));
return dataRecord;
}
private SweField createField(ElementType elementType, SweAbstractDataComponent content) {
return new SweField(elementType.name(), content);
}
private SweAbstractDataComponent createSweTimeSamplingTime(ElementType elementType) {
SweTime time = new SweTime();
time.setDefinition(elementType.getDefinition());
if (elementType.isSetUOM()) {
time.setUom(elementType.getUOM()); |
<<<<<<<
import net.minecraft.util.NonNullList;
import net.minecraft.util.text.ITextComponent;
=======
>>>>>>>
import net.minecraft.util.NonNullList;
<<<<<<<
@Override
public ITextComponent getDisplayName()
{
return null;
}
@Override
public boolean hasCapability(Capability<?> capability, @Nullable EnumFacing facing)
{
return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY || super.hasCapability(capability, facing);
}
@Nullable
@Override
public <T> T getCapability(Capability<T> capability, @Nullable EnumFacing facing)
{
if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY)
{
return (T) new FluidHandlerWrapper(this, facing);
}
return super.getCapability(capability, facing);
}
=======
>>>>>>>
@Override
public boolean hasCapability(Capability<?> capability, @Nullable EnumFacing facing)
{
return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY || super.hasCapability(capability, facing);
}
@Nullable
@Override
public <T> T getCapability(Capability<T> capability, @Nullable EnumFacing facing)
{
if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY)
{
return (T) new FluidHandlerWrapper(this, facing);
}
return super.getCapability(capability, facing);
} |
<<<<<<<
import net.minecraft.entity.MoverType;
import net.minecraft.entity.player.EntityPlayer;
=======
>>>>>>>
import net.minecraft.entity.MoverType; |
<<<<<<<
//Temporary treasure items until we have a specific Asteroids treasure
private static final ItemStack TREASURE1 = new ItemStack(Items.GHAST_TEAR, 2, 0);
private static final ItemStack TREASURE2 = new ItemStack(Items.NETHER_STAR, 1, 0);
=======
>>>>>>>
<<<<<<<
loader.addCargo(new ItemStack(Items.POISONOUS_POTATO, 64, 0), true);
loader.addCargo(new ItemStack(Items.POISONOUS_POTATO, 64, 0), true);
loader.addCargo(new ItemStack(Items.POISONOUS_POTATO, 64, 0), true);
loader.addCargo(new ItemStack(Items.POISONOUS_POTATO, 64, 0), true);
loader.addCargo(new ItemStack(Items.ROTTEN_FLESH, 64, 0), true);
=======
loader.addCargo(new ItemStack(Items.poisonous_potato, 64, 0), true);
loader.addCargo(new ItemStack(Items.poisonous_potato, 64, 0), true);
loader.addCargo(new ItemStack(Items.poisonous_potato, 64, 0), true);
loader.addCargo(new ItemStack(Items.poisonous_potato, 64, 0), true);
loader.addCargo(new ItemStack(Items.rotten_flesh, 64, 0), true);
loader.addCargo(new ItemStack(GCItems.flagPole, semirand % 31 + 2, 0), true);
loader.addCargo(new ItemStack(MarsItems.marsItemBasic, semirand % 2 + 1, 4), true); //Slimeling Inventory Bag
loader.addCargo(new ItemStack(AsteroidsItems.basicItem, semirand % 23 + 41, 7), true); //Thermal cloth
>>>>>>>
loader.addCargo(new ItemStack(Items.POISONOUS_POTATO, 64, 0), true);
loader.addCargo(new ItemStack(Items.POISONOUS_POTATO, 64, 0), true);
loader.addCargo(new ItemStack(Items.POISONOUS_POTATO, 64, 0), true);
loader.addCargo(new ItemStack(Items.POISONOUS_POTATO, 64, 0), true);
loader.addCargo(new ItemStack(Items.ROTTEN_FLESH, 64, 0), true);
loader.addCargo(new ItemStack(GCItems.flagPole, semirand % 31 + 2, 0), true);
loader.addCargo(new ItemStack(MarsItems.marsItemBasic, semirand % 2 + 1, 4), true); //Slimeling Inventory Bag
loader.addCargo(new ItemStack(AsteroidsItems.basicItem, semirand % 23 + 41, 7), true); //Thermal cloth |
<<<<<<<
import net.minecraft.util.NonNullList;
=======
>>>>>>>
import net.minecraft.util.NonNullList;
<<<<<<<
return (this.world.getBlockState(getPos()).getValue(BlockMachineTiered.FACING));
=======
return (state.getValue(BlockMachineTiered.FACING));
>>>>>>>
return (state.getValue(BlockMachineTiered.FACING)); |
<<<<<<<
void getNetworkedData(ArrayList<Object> sendData);
=======
/**
* Note this can be called during the init constructor of the
* entity's superclass, if this is a subclass of the IPacketReceiver
* entity. So make sure any fields referenced in
* getNetworkedData() are either in the superclass, or
* add some null checks!!
*/
public void getNetworkedData(ArrayList<Object> sendData);
>>>>>>>
/**
* Note this can be called during the init constructor of the
* entity's superclass, if this is a subclass of the IPacketReceiver
* entity. So make sure any fields referenced in
* getNetworkedData() are either in the superclass, or
* add some null checks!!
*/
void getNetworkedData(ArrayList<Object> sendData); |
<<<<<<<
=======
import javax.annotation.Nullable;
import java.lang.reflect.Field;
>>>>>>>
import java.lang.reflect.Field; |
<<<<<<<
float f1 = MathHelper.sqrt(x * x + z * z);
this.prevRotationYaw = this.rotationYaw = (float)(MathHelper.atan2(x, z) * 180.0D / Math.PI);
this.prevRotationPitch = this.rotationPitch = (float)(MathHelper.atan2(y, (double)f1) * 180.0D / Math.PI);
=======
float f1 = MathHelper.sqrt_double(x * x + z * z);
this.prevRotationYaw = this.rotationYaw = (float) MathHelper.atan2(x, z) * Constants.RADIANS_TO_DEGREES;
this.prevRotationPitch = this.rotationPitch = (float) MathHelper.atan2(y, (double)f1) * Constants.RADIANS_TO_DEGREES;
>>>>>>>
float f1 = MathHelper.sqrt(x * x + z * z);
this.prevRotationYaw = this.rotationYaw = (float) MathHelper.atan2(x, z) * Constants.RADIANS_TO_DEGREES;
this.prevRotationPitch = this.rotationPitch = (float) MathHelper.atan2(y, (double)f1) * Constants.RADIANS_TO_DEGREES;
<<<<<<<
float f = MathHelper.sqrt(x * x + z * z);
this.prevRotationYaw = this.rotationYaw = (float)(MathHelper.atan2(x, z) * 180.0D / Math.PI);
this.prevRotationPitch = this.rotationPitch = (float)(MathHelper.atan2(y, (double)f) * 180.0D / Math.PI);
=======
float f = MathHelper.sqrt_double(x * x + z * z);
this.prevRotationYaw = this.rotationYaw = (float) MathHelper.atan2(x, z) * Constants.RADIANS_TO_DEGREES;
this.prevRotationPitch = this.rotationPitch = (float) MathHelper.atan2(y, (double)f) * Constants.RADIANS_TO_DEGREES;
>>>>>>>
float f = MathHelper.sqrt(x * x + z * z);
this.prevRotationYaw = this.rotationYaw = (float) MathHelper.atan2(x, z) * Constants.RADIANS_TO_DEGREES;
this.prevRotationPitch = this.rotationPitch = (float) MathHelper.atan2(y, (double)f) * Constants.RADIANS_TO_DEGREES;
<<<<<<<
float f = MathHelper.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ);
this.prevRotationYaw = this.rotationYaw = (float)(MathHelper.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI);
this.prevRotationPitch = this.rotationPitch = (float)(MathHelper.atan2(this.motionY, (double)f) * 180.0D / Math.PI);
=======
float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ);
this.prevRotationYaw = this.rotationYaw = (float) MathHelper.atan2(this.motionX, this.motionZ) * Constants.RADIANS_TO_DEGREES;
this.prevRotationPitch = this.rotationPitch = (float) MathHelper.atan2(this.motionY, (double)f) * Constants.RADIANS_TO_DEGREES;
>>>>>>>
float f = MathHelper.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ);
this.prevRotationYaw = this.rotationYaw = (float) MathHelper.atan2(this.motionX, this.motionZ) * Constants.RADIANS_TO_DEGREES;
this.prevRotationPitch = this.rotationPitch = (float) MathHelper.atan2(this.motionY, (double)f) * Constants.RADIANS_TO_DEGREES;
<<<<<<<
float f3 = MathHelper.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ);
this.rotationYaw = (float)(MathHelper.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI);
=======
float f3 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ);
this.rotationYaw = (float) MathHelper.atan2(this.motionX, this.motionZ) * Constants.RADIANS_TO_DEGREES;
>>>>>>>
float f3 = MathHelper.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ);
this.rotationYaw = (float) MathHelper.atan2(this.motionX, this.motionZ) * Constants.RADIANS_TO_DEGREES; |
<<<<<<<
=======
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.ai.*;
>>>>>>>
import net.minecraft.entity.SharedMonsterAttributes;
<<<<<<<
=======
protected void applyEntityAttributes()
{
super.applyEntityAttributes();
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(30.0D);
double difficulty = 0;
switch (this.worldObj.getDifficulty())
{
case HARD : difficulty = 2D;
break;
case NORMAL : difficulty = 1D;
break;
}
this.getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.96D + 0.05D * difficulty);
this.getEntityAttribute(SharedMonsterAttributes.attackDamage).setBaseValue(3D + difficulty);
this.getEntityAttribute(SharedMonsterAttributes.followRange).setBaseValue(16D + difficulty * 2D);
}
@Override
protected void applyEntityAI()
{
this.tasks.addTask(4, new EntityAIAttackOnCollide(this, EntityVillager.class, 1.0D, true));
this.tasks.addTask(4, new EntityAIAttackOnCollide(this, EntityIronGolem.class, 1.0D, true));
this.tasks.addTask(6, new EntityAIMoveThroughVillage(this, 1.0D, false));
this.targetTasks.addTask(1, new EntityAIHurtByTarget(this, true, new Class[] { EntityPigZombie.class }));
this.targetTasks.addTask(2, new EntityAINearestAttackableTarget(this, EntityPlayer.class, true));
this.targetTasks.addTask(2, new EntityAINearestAttackableTarget(this, EntityVillager.class, false));
this.targetTasks.addTask(2, new EntityAINearestAttackableTarget(this, EntityIronGolem.class, true));
}
@Override
>>>>>>>
protected void applyEntityAttributes()
{
super.applyEntityAttributes();
this.getEntityAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(30.0D);
double difficulty = 0;
switch (this.worldObj.getDifficulty())
{
case HARD : difficulty = 2D;
break;
case NORMAL : difficulty = 1D;
break;
}
this.getEntityAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.96D + 0.05D * difficulty);
this.getEntityAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).setBaseValue(3D + difficulty);
this.getEntityAttribute(SharedMonsterAttributes.FOLLOW_RANGE).setBaseValue(16D + difficulty * 2D);
}
@Override |
<<<<<<<
import micdoodle8.mods.galacticraft.core.util.ConfigManagerCore;
import micdoodle8.mods.galacticraft.planets.GCPlanetDimensions;
=======
>>>>>>>
import micdoodle8.mods.galacticraft.planets.GCPlanetDimensions;
<<<<<<<
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.util.math.MathHelper;
import net.minecraft.world.DimensionType;
import net.minecraft.world.biome.BiomeProvider;
import net.minecraft.world.chunk.IChunkGenerator;
=======
import micdoodle8.mods.galacticraft.planets.mars.world.gen.WorldChunkManagerMars;
import net.minecraft.util.MathHelper;
import net.minecraft.world.biome.WorldChunkManager;
import net.minecraft.world.chunk.IChunkProvider;
>>>>>>>
import net.minecraft.util.math.MathHelper;
import net.minecraft.world.DimensionType;
import net.minecraft.world.biome.BiomeProvider;
import net.minecraft.world.chunk.IChunkGenerator;
<<<<<<<
public boolean shouldForceRespawn()
{
return !ConfigManagerCore.forceOverworldRespawn;
}
@Override
public Class<? extends IChunkGenerator> getChunkProviderClass()
=======
public Class<? extends IChunkProvider> getChunkProviderClass()
>>>>>>>
public Class<? extends IChunkGenerator> getChunkProviderClass()
<<<<<<<
// @Override
// public void setDimension(int var1)
// {
// this.getDimensionId() = var1;
// super.setDimension(var1);
// }
//
// @Override
// protected void generateLightBrightnessTable()
// {
// final float var1 = 0.0F;
//
// for (int var2 = 0; var2 <= 15; ++var2)
// {
// final float var3 = 1.0F - var2 / 15.0F;
// this.lightBrightnessTable[var2] = (1.0F - var3) / (var3 * 3.0F + 1.0F) * (1.0F - var1) + var1;
// }
// }
// @Override
// public float[] calcSunriseSunsetColors(float var1, float var2)
// {
// return null;
// }
// @Override
// public void registerWorldChunkManager()
// {
// this.worldChunkMgr = new WorldChunkManagerMars();
// }
// @SideOnly(Side.CLIENT)
// @Override
// public Vec3d getFogColor(float var1, float var2)
// {
// return Vec3d.createVectorHelper((double) 210F / 255F, (double) 120F / 255F, (double) 59F / 255F);
// }
//
// @Override
// public Vec3d getSkyColor(Entity cameraEntity, float partialTicks)
// {
// return Vec3d.createVectorHelper(154 / 255.0F, 114 / 255.0F, 66 / 255.0F);
// }
=======
>>>>>>>
<<<<<<<
//Overriding only in case the Galacticraft API is not up-to-date
//(with up-to-date API this makes zero difference)
@Override
public int getRespawnDimension(EntityPlayerMP player)
{
return this.shouldForceRespawn() ? this.getDimension() : 0;
}
// @Override
// public String getSaveFolder()
// {
// return "DIM" + ConfigManagerMars.dimensionIDMars;
// }
//
// @Override
// public String getWelcomeMessage()
// {
// return "Entering Mars";
// }
//
// @Override
// public String getDepartMessage()
// {
// return "Leaving Mars";
// }
//
// @Override
// public String getDimensionName()
// {
// return "Mars";
// }
// @Override
// public boolean canSnowAt(int x, int y, int z)
// {
// return false;
// }
// @Override
// public boolean canBlockFreeze(int x, int y, int z, boolean byWater)
// {
// return false;
// }
//
// @Override
// public boolean canDoLightning(Chunk chunk)
// {
// return false;
// }
//
// @Override
// public boolean canDoRainSnowIce(Chunk chunk)
// {
// return false;
// }
=======
>>>>>>>
<<<<<<<
public boolean shouldDisablePrecipitation()
{
return true;
}
@Override
public boolean shouldCorrodeArmor()
=======
public String getInternalNameSuffix()
{
return "_mars";
}
@Override
public int getDungeonSpacing()
>>>>>>>
public int getDungeonSpacing() |
<<<<<<<
RenderHelper.disableStandardItemLighting();
Minecraft.getMinecraft().getTextureManager().bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
=======
Minecraft.getMinecraft().getTextureManager().bindTexture(TextureMap.locationBlocksTexture);
>>>>>>>
Minecraft.getMinecraft().getTextureManager().bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); |
<<<<<<<
import net.minecraft.util.text.ITextComponent;
=======
>>>>>>>
<<<<<<<
@Override
public int getField(int id)
{
return 0;
}
@Override
public void setField(int id, int value)
{
}
@Override
public int getFieldCount()
{
return 0;
}
@Override
public void clear()
{
}
@Override
public ITextComponent getDisplayName()
{
return null;
}
=======
>>>>>>> |
<<<<<<<
rocketStacks[i++] = new ItemStack(GCItems.basicItem, 16, 15); //Canned food
rocketStacks[i++] = new ItemStack(Items.EGG, 12);
=======
rocketStacks[i++] = new ItemStack(GCItems.foodItem, 16, 0); //Canned food
rocketStacks[i++] = new ItemStack(Items.egg, 12);
>>>>>>>
rocketStacks[i++] = new ItemStack(GCItems.foodItem, 16, 0); //Canned food
rocketStacks[i++] = new ItemStack(Items.EGG, 12); |
<<<<<<<
import micdoodle8.mods.galacticraft.core.dimension.WorldProviderZeroGravity;
import micdoodle8.mods.galacticraft.core.entities.player.CapabilityStatsHandler;
import micdoodle8.mods.galacticraft.core.entities.player.IStatsCapability;
=======
import micdoodle8.mods.galacticraft.core.dimension.WorldProviderSpaceStation;
import micdoodle8.mods.galacticraft.core.entities.player.GCPlayerStats;
>>>>>>>
import micdoodle8.mods.galacticraft.core.entities.player.CapabilityStatsHandler;
import micdoodle8.mods.galacticraft.core.entities.player.IStatsCapability;
import micdoodle8.mods.galacticraft.core.dimension.WorldProviderSpaceStation; |
<<<<<<<
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
=======
>>>>>>>
import net.minecraft.item.ItemStack; |
<<<<<<<
for (int i = 0; i < this.input.size(); i++)
=======
if (inputB.isEmpty()) return;
for (int i = 0; i < this.input.length; i++)
>>>>>>>
if (inputB.isEmpty()) return;
for (int i = 0; i < this.input.size(); i++) |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.