conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
import org.zalando.problem.Problem;
import javax.ws.rs.core.Response;
import java.io.Closeable;
import java.io.IOException;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.TimeoutException;
import java.util.stream.Collectors;
=======
>>>>>>>
import org.zalando.problem.Problem;
import javax.ws.rs.core.Response;
import java.io.Closeable;
import java.io.IOException;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.TimeoutException;
import java.util.stream.Collectors;
<<<<<<<
private final TimelineSync timelineSync;
private final NakadiSettings nakadiSettings;
=======
private final PartitionsCalculator partitionsCalculator;
private final FeatureToggleService featureToggleService;
>>>>>>>
private final PartitionsCalculator partitionsCalculator;
private final FeatureToggleService featureToggleService;
private final TimelineSync timelineSync;
private final NakadiSettings nakadiSettings;
<<<<<<<
final SchemaEvolutionService schemaEvolutionService,
final TimelineSync timelineSync,
final NakadiSettings nakadiSettings) {
=======
final SchemaEvolutionService schemaEvolutionService,
final PartitionsCalculator partitionsCalculator,
final FeatureToggleService featureToggleService) {
>>>>>>>
final SchemaEvolutionService schemaEvolutionService,
final PartitionsCalculator partitionsCalculator,
final FeatureToggleService featureToggleService,
final TimelineSync timelineSync,
final NakadiSettings nakadiSettings) {
<<<<<<<
this.timelineSync = timelineSync;
this.nakadiSettings = nakadiSettings;
=======
this.partitionsCalculator = partitionsCalculator;
this.featureToggleService = featureToggleService;
>>>>>>>
this.partitionsCalculator = partitionsCalculator;
this.featureToggleService = featureToggleService;
this.timelineSync = timelineSync;
this.nakadiSettings = nakadiSettings; |
<<<<<<<
=======
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
import org.zalando.nakadi.domain.ConsumedEvent;
import org.zalando.nakadi.domain.NakadiCursor;
import org.zalando.nakadi.exceptions.NakadiException;
import org.zalando.nakadi.repository.kafka.NakadiKafkaConsumer;
import org.zalando.nakadi.util.FeatureToggleService;
>>>>>>> |
<<<<<<<
=======
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import javax.ws.rs.core.Response;
>>>>>>>
<<<<<<<
final TimelineService timelineService = mock(TimelineService.class);
when(timelineService.getTopicRepository(any())).thenReturn(topicRepository);
=======
final NakadiSettings settings = mock(NakadiSettings.class);
when(settings.getMaxSubscriptionPartitions()).thenReturn(PARTITIONS_PER_SUBSCRIPTION);
>>>>>>>
final TimelineService timelineService = mock(TimelineService.class);
when(timelineService.getTopicRepository(any())).thenReturn(topicRepository);
final NakadiSettings settings = mock(NakadiSettings.class);
when(settings.getMaxSubscriptionPartitions()).thenReturn(PARTITIONS_PER_SUBSCRIPTION);
<<<<<<<
zkSubscriptionClientFactory, timelineService, eventTypeRepository);
=======
zkSubscriptionClientFactory, topicRepository, eventTypeRepository, settings);
>>>>>>>
zkSubscriptionClientFactory, timelineService, eventTypeRepository, settings); |
<<<<<<<
=======
import org.zalando.nakadi.exceptions.runtime.DbWriteOperationsBlockedException;
import org.zalando.nakadi.exceptions.runtime.ErrorGettingCursorTimeLagException;
import org.zalando.nakadi.exceptions.runtime.FeatureNotAvailableException;
>>>>>>>
<<<<<<<
=======
import org.zalando.nakadi.exceptions.runtime.TimeLagStatsTimeoutException;
import org.zalando.nakadi.service.FeatureToggleService;
>>>>>>>
<<<<<<<
import static org.springframework.http.HttpStatus.NO_CONTENT;
import static org.springframework.http.HttpStatus.OK;
import static org.springframework.http.ResponseEntity.status;
=======
import static javax.ws.rs.core.Response.Status.NOT_IMPLEMENTED;
import static javax.ws.rs.core.Response.Status.SERVICE_UNAVAILABLE;
import static org.springframework.http.HttpStatus.NO_CONTENT;
import static org.springframework.http.HttpStatus.OK;
import static org.springframework.http.ResponseEntity.status;
import static org.zalando.problem.MoreStatus.UNPROCESSABLE_ENTITY;
>>>>>>>
import static org.springframework.http.HttpStatus.NO_CONTENT;
import static org.springframework.http.HttpStatus.OK;
import static org.springframework.http.ResponseEntity.status;
<<<<<<<
final NativeWebRequest request) {
return status(OK)
.body(subscriptionService
.listSubscriptions(owningApplication, eventTypes, showStatus, limit, offset));
=======
final NativeWebRequest request)
throws InvalidLimitException, ServiceTemporarilyUnavailableException {
return status(OK)
.body(subscriptionService
.listSubscriptions(owningApplication, eventTypes, showStatus, limit, offset));
>>>>>>>
final NativeWebRequest request)
throws InvalidLimitException, ServiceTemporarilyUnavailableException {
return status(OK)
.body(subscriptionService
.listSubscriptions(owningApplication, eventTypes, showStatus, limit, offset));
<<<<<<<
final NativeWebRequest request) {
return status(OK).body(subscriptionService.getSubscription(subscriptionId));
=======
final NativeWebRequest request)
throws NoSuchSubscriptionException, ServiceTemporarilyUnavailableException {
return status(OK).body(subscriptionService.getSubscription(subscriptionId));
>>>>>>>
final NativeWebRequest request)
throws NoSuchSubscriptionException, ServiceTemporarilyUnavailableException {
return status(OK).body(subscriptionService.getSubscription(subscriptionId));
<<<<<<<
final NativeWebRequest request) {
subscriptionService.deleteSubscription(subscriptionId);
return status(NO_CONTENT).build();
=======
final NativeWebRequest request)
throws DbWriteOperationsBlockedException, NoSuchSubscriptionException, NoSuchEventTypeException,
ServiceTemporarilyUnavailableException, InternalNakadiException {
subscriptionService.deleteSubscription(subscriptionId);
return status(NO_CONTENT).build();
>>>>>>>
final NativeWebRequest request)
throws DbWriteOperationsBlockedException, NoSuchSubscriptionException, NoSuchEventTypeException,
ServiceTemporarilyUnavailableException, InternalNakadiException {
subscriptionService.deleteSubscription(subscriptionId);
return status(NO_CONTENT).build();
<<<<<<<
=======
@ExceptionHandler(FeatureNotAvailableException.class)
public ResponseEntity<Problem> handleFeatureTurnedOff(final FeatureNotAvailableException ex,
final NativeWebRequest request) {
LOG.debug(ex.getMessage(), ex);
return Responses.create(Problem.valueOf(NOT_IMPLEMENTED, ex.getMessage()), request);
}
@ExceptionHandler(ErrorGettingCursorTimeLagException.class)
public ResponseEntity<Problem> handleTimeLagException(final ErrorGettingCursorTimeLagException ex,
final NativeWebRequest request) {
LOG.debug(ex.getMessage(), ex);
return Responses.create(Problem.valueOf(UNPROCESSABLE_ENTITY, ex.getMessage()), request);
}
@ExceptionHandler({InconsistentStateException.class, ServiceTemporarilyUnavailableException.class})
public ResponseEntity<Problem> handleServiceUnavailableResponses(final NakadiBaseException exception,
final NativeWebRequest request) {
LOG.debug(exception.getMessage(), exception);
return Responses.create(
Problem.valueOf(
SERVICE_UNAVAILABLE,
exception.getMessage()),
request);
}
@ExceptionHandler(TimeLagStatsTimeoutException.class)
public ResponseEntity<Problem> handleTimeLagStatsTimeoutException(final TimeLagStatsTimeoutException e,
final NativeWebRequest request) {
LOG.warn(e.getMessage());
return Responses.create(Response.Status.REQUEST_TIMEOUT, e.getMessage(), request);
}
>>>>>>> |
<<<<<<<
private void switchTimelines(final Timeline activeTimeline, final Timeline nextTimeline)
throws InconsistentStateException, RepositoryProblemException, TimelineException, ConflictException {
=======
public EventConsumer.ReassignableEventConsumer createEventConsumer(@Nullable final String clientId) {
return new MultiTimelineEventConsumer(clientId, this, timelineSync);
}
private void switchTimelines(final Timeline activeTimeline, final Timeline nextTimeline) {
>>>>>>>
public EventConsumer.ReassignableEventConsumer createEventConsumer(@Nullable final String clientId) {
return new MultiTimelineEventConsumer(clientId, this, timelineSync);
}
private void switchTimelines(final Timeline activeTimeline, final Timeline nextTimeline)
throws InconsistentStateException, RepositoryProblemException, TimelineException, ConflictException { |
<<<<<<<
import org.zalando.nakadi.utils.TestUtils;
=======
import org.zalando.nakadi.utils.EventTypeTestBuilder;
>>>>>>>
import org.zalando.nakadi.utils.EventTypeTestBuilder;
import org.zalando.nakadi.utils.TestUtils;
<<<<<<<
=======
import javax.ws.rs.core.Response;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
import static org.mockito.Mockito.when;
import static org.zalando.nakadi.config.SecuritySettings.AuthMode.OFF;
>>>>>>>
<<<<<<<
private final FeatureToggleService featureToggleService = Mockito.mock(FeatureToggleService.class);
=======
private final ObjectMapper objectMapper;
>>>>>>>
<<<<<<<
=======
objectMapper = new JsonConfig().jacksonObjectMapper();
when(securitySettings.getAuthMode()).thenReturn(OFF);
when(securitySettings.getAdminClientId()).thenReturn("nakadi");
>>>>>>>
when(securitySettings.getAuthMode()).thenReturn(OFF);
when(securitySettings.getAdminClientId()).thenReturn("nakadi");
<<<<<<<
.setMessageConverters(new StringHttpMessageConverter(), TestUtils.JACKSON_2_HTTP_MESSAGE_CONVERTER)
.setCustomArgumentResolvers(new ClientResolver(securitySettings, featureToggleService))
=======
.setMessageConverters(new StringHttpMessageConverter(),
new MappingJackson2HttpMessageConverter(objectMapper))
.setCustomArgumentResolvers(new ClientResolver(securitySettings))
.setControllerAdvice(new ExceptionHandling())
>>>>>>>
.setMessageConverters(new StringHttpMessageConverter(), TestUtils.JACKSON_2_HTTP_MESSAGE_CONVERTER)
.setCustomArgumentResolvers(new ClientResolver(securitySettings))
<<<<<<<
.andExpect(MockMvcResultMatchers.content().json(TestUtils.OBJECT_MAPPER.writeValueAsString(
Problem.valueOf(Response.Status.FORBIDDEN, "whenForbiddenAccessExceptionThen403"))));
=======
.andExpect(MockMvcResultMatchers.content().json(objectMapper.writeValueAsString(
Problem.valueOf(Response.Status.FORBIDDEN,
"Access on ADMIN event-type:" + eventType.getName()+ " denied"))));
>>>>>>>
.andExpect(MockMvcResultMatchers.content().json(TestUtils.OBJECT_MAPPER.writeValueAsString(
Problem.valueOf(Response.Status.FORBIDDEN,
"Access on ADMIN event-type:" + eventType.getName()+ " denied")))); |
<<<<<<<
/**
* A key for knowing if the {@link ColorItem} can be deleted.
* <p/>
* If the color item can not be deleted, the delete action will be removed from the menu.
*/
private static final String EXTRA_CAN_BE_DELETED = "ColorDetailActivity.Extras.EXTRA_CAN_BE_DELETED";
public static void startWithColorItem(Context context, ColorItem colorItem, View colorPreviewClicked,
boolean canBeDeleted) {
=======
/**
* The quality of the image compressed before sharing.
*/
private static final int SHARED_IMAGE_QUALITY = 100;
/**
* The size in pixels of the shared image.
*/
private static final int SHARED_IMAGE_SIZE = 150;
/**
* The name of the directory where the shared image is created.
*/
private static final String SHARED_DIRECTORY = "colors";
/**
* The name of the file used to write the shared image.
*/
private static final String SHARED_IMAGE_FILE = "shared_colors.jpg";
/**
* The authority of the file provider declared in our manifest.
*/
private static final String FILE_PROVIDER_AUTHORITY = "fr.tvbarthel.apps.cameracolorpicker.fileprovider";
public static void startWithColorItem(Context context, ColorItem colorItem, View colorPreviewClicked) {
>>>>>>>
/**
* A key for knowing if the {@link ColorItem} can be deleted.
* <p/>
* If the color item can not be deleted, the delete action will be removed from the menu.
*/
private static final String EXTRA_CAN_BE_DELETED = "ColorDetailActivity.Extras.EXTRA_CAN_BE_DELETED";
/**
* The quality of the image compressed before sharing.
*/
private static final int SHARED_IMAGE_QUALITY = 100;
/**
* The size in pixels of the shared image.
*/
private static final int SHARED_IMAGE_SIZE = 150;
/**
* The name of the directory where the shared image is created.
*/
private static final String SHARED_DIRECTORY = "colors";
/**
* The name of the file used to write the shared image.
*/
private static final String SHARED_IMAGE_FILE = "shared_colors.jpg";
/**
* The authority of the file provider declared in our manifest.
*/
private static final String FILE_PROVIDER_AUTHORITY = "fr.tvbarthel.apps.cameracolorpicker.fileprovider";
public static void startWithColorItem(Context context, ColorItem colorItem, View colorPreviewClicked,
boolean canBeDeleted) {
<<<<<<<
} else if (id == android.R.id.home) {
finish();
=======
} else if (id == R.id.menu_color_detail_action_share) {
return handleActionShare();
>>>>>>>
} else if (id == android.R.id.home) {
finish();
} else if (id == R.id.menu_color_detail_action_share) {
return handleActionShare(); |
<<<<<<<
* @param ipnMap
* representing IPN name/value pair
=======
* Constructs {@link IPNMessage} using the given {@link Map} for name and
* values.
*
* @param ipnMap
* {@link Map} representing IPN name/value pair
>>>>>>>
* Constructs {@link IPNMessage} using the given {@link Map} for name and
* values.
*
* @param ipnMap
* {@link Map} representing IPN name/value pair
<<<<<<<
}
/**
* @param request
* HttpServletrequest received from PayPal IPN call back.
*/
public IPNMessage(HttpServletRequest request) {
this(request.getParameterMap());
=======
>>>>>>> |
<<<<<<<
if (balance.pendingReceiving.moreThanZero()) {
String receivingString = ValueExtensionsKt.toStringWithUnit(balance.pendingReceiving, _mbwManager.getDenomination());
=======
if (balance.pendingReceiving.value > 0) {
String receivingString = ValueExtensionsKt.toStringWithUnit(balance.pendingReceiving,
_mbwManager.getDenomination(_account.getCoinType()));
>>>>>>>
if (balance.pendingReceiving.moreThanZero()) {
String receivingString = ValueExtensionsKt.toStringWithUnit(balance.pendingReceiving,
_mbwManager.getDenomination(_account.getCoinType()));
<<<<<<<
if (balance.getSendingToForeignAddresses().moreThanZero()) {
String sendingString = ValueExtensionsKt.toStringWithUnit(balance.getSendingToForeignAddresses(), _mbwManager.getDenomination());
=======
if (balance.getSendingToForeignAddresses().value > 0) {
String sendingString = ValueExtensionsKt.toStringWithUnit(balance.getSendingToForeignAddresses(),
_mbwManager.getDenomination(_account.getCoinType()));
>>>>>>>
if (balance.getSendingToForeignAddresses().moreThanZero()) {
String sendingString = ValueExtensionsKt.toStringWithUnit(balance.getSendingToForeignAddresses(),
_mbwManager.getDenomination(_account.getCoinType())); |
<<<<<<<
int captionStartOffsetX = 700 + Hospital.getInstance().getWidth() + 40;
int captionStartOffsetY = 40;
int captionSize = 24;
=======
>>>>>>>
int captionStartOffsetX = 700 + Hospital.getInstance().getWidth() + 40;
int captionStartOffsetY = 40;
int captionSize = 24; |
<<<<<<<
// //System.out.println("REMOVED GUNPOWDER");
=======
>>>>>>>
<<<<<<<
////System.out.println(Math.max(1.0F, 12.0F*(speed/100.0F)));
=======
>>>>>>>
<<<<<<<
////System.out.println(Math.max(1.0F, 12.0F*(speed/100.0F)));
=======
>>>>>>>
<<<<<<<
////System.out.println(Math.max(1.0F, 12.0F*(speed/100.0F)));
=======
>>>>>>>
<<<<<<<
////System.out.println(ticksLeft);
=======
>>>>>>>
<<<<<<<
////System.out.println(((TileEntitySteamHeater)event.entityPlayer.worldObj.getTileEntity(event.x, event.y, event.z)).master);
=======
>>>>>>>
<<<<<<<
////System.out.println("I AM THE CLIENT");
=======
>>>>>>>
////System.out.println("I AM THE CLIENT");
<<<<<<<
// //System.out.println("trans cap: "+trans.getCapacity()+" trans steam: "+trans.getSteam() + "; trans press: " + trans.getPressure() + "; network: " + trans.getNetworkName() + "; net cap: "+trans.getNetwork().getCapacity()+"; net steam: " + trans.getNetwork().getSteam()+"; net press: "+trans.getNetwork().getPressure());
=======
>>>>>>>
// //System.out.println("trans cap: "+trans.getCapacity()+" trans steam: "+trans.getSteam() + "; trans press: " + trans.getPressure() + "; network: " + trans.getNetworkName() + "; net cap: "+trans.getNetwork().getCapacity()+"; net steam: " + trans.getNetwork().getSteam()+"; net press: "+trans.getNetwork().getPressure()); |
<<<<<<<
import flaxbeard.steamcraft.api.CrucibleLiquid;
import flaxbeard.steamcraft.api.SteamcraftRegistry;
import flaxbeard.steamcraft.api.exosuit.ExosuitPlate;
=======
import flaxbeard.steamcraft.api.util.SPLog;
>>>>>>>
import flaxbeard.steamcraft.api.CrucibleLiquid;
import flaxbeard.steamcraft.api.SteamcraftRegistry;
import flaxbeard.steamcraft.api.exosuit.ExosuitPlate;
import flaxbeard.steamcraft.api.util.SPLog; |
<<<<<<<
import net.minecraft.potion.Potion;
import net.minecraft.world.gen.structure.MapGenStructureIO;
=======
import net.minecraft.world.gen.structure.MapGenStructureIO;
>>>>>>>
import net.minecraft.potion.Potion;
import net.minecraft.world.gen.structure.MapGenStructureIO;
<<<<<<<
import flaxbeard.steamcraft.world.SteampunkVillagerTradeHandler;
import flaxbeard.steamcraft.world.TophatVillagerTradeHandler;
=======
import flaxbeard.steamcraft.world.SteampunkVillagerTradeHandler;
>>>>>>>
import flaxbeard.steamcraft.world.SteampunkVillagerTradeHandler;
import flaxbeard.steamcraft.world.TophatVillagerTradeHandler;
<<<<<<<
int id = Config.villagerId;
VillagerRegistry.instance().registerVillagerId(id);
VillagerRegistry.instance().registerVillageTradeHandler(id, new SteampunkVillagerTradeHandler());
VillagerRegistry.instance().registerVillageCreationHandler(new SteamWorkshopCreationHandler());
MapGenStructureIO.func_143031_a(ComponentSteamWorkshop.class, "steamcraft:workshop");
=======
int id = Config.villagerId;
VillagerRegistry.instance().registerVillagerId(id);
VillagerRegistry.instance().registerVillageTradeHandler(id, new SteampunkVillagerTradeHandler());
VillagerRegistry.instance().registerVillageCreationHandler(new SteamWorkshopCreationHandler());
MapGenStructureIO.func_143031_a(ComponentSteamWorkshop.class, "steamcraft:workshop");
>>>>>>>
int id = Config.villagerId;
VillagerRegistry.instance().registerVillagerId(id);
VillagerRegistry.instance().registerVillageTradeHandler(id, new SteampunkVillagerTradeHandler());
VillagerRegistry.instance().registerVillageCreationHandler(new SteamWorkshopCreationHandler());
MapGenStructureIO.func_143031_a(ComponentSteamWorkshop.class, "steamcraft:workshop");
<<<<<<<
//FMLInterModComms.sendMessage("Waila", "register", "flaxbeard.steamcraft.integration.waila.WailaIntegration.callbackRegister");
=======
>>>>>>> |
<<<<<<<
import net.minecraftforge.oredict.OreDictionary;
import org.lwjgl.opengl.GL11;
import flaxbeard.steamcraft.Steamcraft;
import flaxbeard.steamcraft.SteamcraftItems;
=======
import org.lwjgl.opengl.GL11;
>>>>>>>
import net.minecraftforge.oredict.OreDictionary;
import org.lwjgl.opengl.GL11;
import flaxbeard.steamcraft.SteamcraftItems;
<<<<<<<
public ResourceLocation hornTexture = new ResourceLocation("steamcraft:textures/models/armor/horns.png");
private static final ComparatorUpgrade comparator = new ComparatorUpgrade();
private ModelRenderer[] horn1;
private ModelRenderer[] horn2;
private ModelRenderer[] horn3;
public ResourceLocation g1 = new ResourceLocation("steamcraft:textures/models/armor/exo_1_grey.png");
public ResourceLocation g2 = new ResourceLocation("steamcraft:textures/models/armor/exo_2_grey.png");
public ResourceLocation g3 = new ResourceLocation("steamcraft:textures/models/armor/exo_3_grey.png");
=======
public ResourceLocation test = new ResourceLocation("steamcraft:textures/models/armor/joshiePenguin.png");
private ModelRenderer penguinBody;
private ModelRenderer penguinHead;
private ModelRenderer penguinArm1;
private ModelRenderer penguinArm2;
private ModelRenderer penguinNose;
>>>>>>>
public ResourceLocation hornTexture = new ResourceLocation("steamcraft:textures/models/armor/horns.png");
private static final ComparatorUpgrade comparator = new ComparatorUpgrade();
private ModelRenderer[] horn1;
private ModelRenderer[] horn2;
private ModelRenderer[] horn3;
public ResourceLocation g1 = new ResourceLocation("steamcraft:textures/models/armor/exo_1_grey.png");
public ResourceLocation g2 = new ResourceLocation("steamcraft:textures/models/armor/exo_2_grey.png");
public ResourceLocation g3 = new ResourceLocation("steamcraft:textures/models/armor/exo_3_grey.png");
public ResourceLocation test = new ResourceLocation("steamcraft:textures/models/armor/joshiePenguin.png");
private ModelRenderer penguinBody;
private ModelRenderer penguinHead;
private ModelRenderer penguinArm1;
private ModelRenderer penguinArm2;
private ModelRenderer penguinNose;
<<<<<<<
if (armor == 0) {
if (((ItemExosuitArmor) me.getItem()).hasPlates(me) && UtilPlates.getPlate(me.stackTagCompound.getString("plate")).getIdentifier() == "Yeti") {
horn1 = addPairHorns(-8.0F, 35.0F);
horn2 = addPairHorns(-6.0F, 15.0F);
horn3 = addPairHorns(-4.0F, -5.0F);
}
}
=======
penguinBody = new ModelRenderer(this, 0, 16).setTextureSize(64, 32);
penguinBody.addBox(-1.5F, -14F, -1.5F, 3, 5, 3);
bipedHead.addChild(penguinBody);
penguinArm1 = new ModelRenderer(this, 28, 16).setTextureSize(64, 32);
penguinArm1.addBox(-2.5F, -14F, -1.0F, 1, 3, 2);
bipedHead.addChild(penguinArm1);
penguinArm2 = new ModelRenderer(this, 28, 16).setTextureSize(64, 32);
penguinArm2.addBox(1.5F, -14F, -1.0F, 1, 3, 2);
bipedHead.addChild(penguinArm2);
penguinHead = new ModelRenderer(this, 12, 16).setTextureSize(64, 32);
penguinHead.addBox(-2.0F, -18F, -2.0F, 4, 4, 4);
bipedHead.addChild(penguinHead);
penguinNose = new ModelRenderer(this, 34, 16).setTextureSize(64, 32);
penguinNose.addBox(-0.5F, -16.5F, -4.0F, 1, 1, 2);
bipedHead.addChild(penguinNose);
// Jetpack2 = new ModelRenderer(this, 28, 0);
// if (itemStack.getItem() == SteamcraftItems.exoArmorBody && ((ItemExosuitArmor)itemStack.getItem()).getStackInSlot(itemStack, 2) != null && ((ItemExosuitArmor)itemStack.getItem()).getStackInSlot(itemStack, 2).getItem() == SteamcraftItems.jetpack) {
// Jetpack1.addBox(-7.0F, -2F, 3F, 4, 14, 4);
// bipedBody.addChild(Jetpack1);
//
// Jetpack2.addBox(3.0F, -2F, 3F, 4, 14, 4);
// bipedBody.addChild(Jetpack2);
// }
>>>>>>>
if (armor == 0) {
if (((ItemExosuitArmor) me.getItem()).hasPlates(me) && UtilPlates.getPlate(me.stackTagCompound.getString("plate")).getIdentifier() == "Yeti") {
horn1 = addPairHorns(-8.0F, 35.0F);
horn2 = addPairHorns(-6.0F, 15.0F);
horn3 = addPairHorns(-4.0F, -5.0F);
}
}
penguinBody = new ModelRenderer(this, 0, 16).setTextureSize(64, 32);
penguinBody.addBox(-1.5F, -14F, -1.5F, 3, 5, 3);
bipedHead.addChild(penguinBody);
penguinArm1 = new ModelRenderer(this, 28, 16).setTextureSize(64, 32);
penguinArm1.addBox(-2.5F, -14F, -1.0F, 1, 3, 2);
bipedHead.addChild(penguinArm1);
penguinArm2 = new ModelRenderer(this, 28, 16).setTextureSize(64, 32);
penguinArm2.addBox(1.5F, -14F, -1.0F, 1, 3, 2);
bipedHead.addChild(penguinArm2);
penguinHead = new ModelRenderer(this, 12, 16).setTextureSize(64, 32);
penguinHead.addBox(-2.0F, -18F, -2.0F, 4, 4, 4);
bipedHead.addChild(penguinHead);
penguinNose = new ModelRenderer(this, 34, 16).setTextureSize(64, 32);
penguinNose.addBox(-0.5F, -16.5F, -4.0F, 1, 1, 2);
bipedHead.addChild(penguinNose);
// Jetpack2 = new ModelRenderer(this, 28, 0);
// if (itemStack.getItem() == SteamcraftItems.exoArmorBody && ((ItemExosuitArmor)itemStack.getItem()).getStackInSlot(itemStack, 2) != null && ((ItemExosuitArmor)itemStack.getItem()).getStackInSlot(itemStack, 2).getItem() == SteamcraftItems.jetpack) {
// Jetpack1.addBox(-7.0F, -2F, 3F, 4, 14, 4);
// bipedBody.addChild(Jetpack1);
//
// Jetpack2.addBox(3.0F, -2F, 3F, 4, 14, 4);
// bipedBody.addChild(Jetpack2);
// }
<<<<<<<
GL11.glPushMatrix();
// if ((entity instanceof EntityLivingBase) && ((EntityLivingBase) entity).isPotionActive(Steamcraft.semiInvisible)) {
// GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.15F);
// GL11.glDepthMask(false);
// GL11.glEnable(GL11.GL_BLEND);
// GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
// GL11.glAlphaFunc(GL11.GL_GREATER, 0.003921569F);
// }
ItemExosuitArmor item = ((ItemExosuitArmor)me.getItem());
if (item.hasUpgrade(me, SteamcraftItems.enderShroud)) {
if ((entity instanceof EntityLivingBase) && ((EntityLivingBase) entity).hurtTime != 0) {
System.out.println(((EntityLivingBase) entity).hurtTime);
GL11.glColor4f(1.0F, 1.0F, 1.0F, (float)((EntityLivingBase) entity).hurtTime/9F);
GL11.glDepthMask(false);
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GL11.glAlphaFunc(GL11.GL_GREATER, 0.003921569F);
}
else
{
GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.0F);
GL11.glDepthMask(false);
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GL11.glAlphaFunc(GL11.GL_GREATER, 0.003921569F);
}
}
this.setRotationAngles(par2, par3, par4, par5, par6, par7, entity);
if (armor == 0) {
if (((ItemExosuitArmor) me.getItem()).hasPlates(me) && UtilPlates.getPlate(me.stackTagCompound.getString("plate")).getIdentifier() == "Yeti") {
for (ModelRenderer horn : horn1) {
horn.showModel = false;
}
for (ModelRenderer horn : horn2) {
horn.showModel = false;
}
for (ModelRenderer horn : horn3) {
horn.showModel = false;
}
}
}
//this.Jetpack1.showModel = false;
=======
this.setRotationAngles(par2, par3, par4, par5, par6, par7, par1Entity);
>>>>>>>
GL11.glPushMatrix();
// if ((entity instanceof EntityLivingBase) && ((EntityLivingBase) entity).isPotionActive(Steamcraft.semiInvisible)) {
// GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.15F);
// GL11.glDepthMask(false);
// GL11.glEnable(GL11.GL_BLEND);
// GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
// GL11.glAlphaFunc(GL11.GL_GREATER, 0.003921569F);
// }
ItemExosuitArmor item = ((ItemExosuitArmor)me.getItem());
if (item.hasUpgrade(me, SteamcraftItems.enderShroud)) {
if ((entity instanceof EntityLivingBase) && ((EntityLivingBase) entity).hurtTime != 0) {
System.out.println(((EntityLivingBase) entity).hurtTime);
GL11.glColor4f(1.0F, 1.0F, 1.0F, (float)((EntityLivingBase) entity).hurtTime/9F);
GL11.glDepthMask(false);
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GL11.glAlphaFunc(GL11.GL_GREATER, 0.003921569F);
}
else
{
GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.0F);
GL11.glDepthMask(false);
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GL11.glAlphaFunc(GL11.GL_GREATER, 0.003921569F);
}
}
if (armor == 0) {
if (((ItemExosuitArmor) me.getItem()).hasPlates(me) && UtilPlates.getPlate(me.stackTagCompound.getString("plate")).getIdentifier() == "Yeti") {
for (ModelRenderer horn : horn1) {
horn.showModel = false;
}
for (ModelRenderer horn : horn2) {
horn.showModel = false;
}
for (ModelRenderer horn : horn3) {
horn.showModel = false;
}
}
}
//this.Jetpack1.showModel = false;
this.setRotationAngles(par2, par3, par4, par5, par6, par7, entity); |
<<<<<<<
import flaxbeard.steamcraft.SteamcraftBlocks;
import net.minecraft.block.Block;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
=======
import net.minecraft.block.Block;
>>>>>>>
import flaxbeard.steamcraft.SteamcraftBlocks;
import net.minecraft.block.Block;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.block.Block;
<<<<<<<
Block block = worldObj.getBlock(x, y, z);
Item item = block.getItem(worldObj, x, y, z);
ItemStack stack = new ItemStack(block.getItem(worldObj, x, y, z), worldObj.getBlockMetadata(x, y, z));
EntityItem eItem = new EntityItem(worldObj, (float) x, (float) y, (float) z, stack);
=======
this.smooshingBlock = worldObj.getBlock(x, y, z);
this.smooshingMeta = worldObj.getBlockMetadata(x, y, z);
>>>>>>>
// Block block = worldObj.getBlock(x, y, z);
// Item item = block.getItem(worldObj, x, y, z);
// ItemStack stack = new ItemStack(block.getItem(worldObj, x, y, z), worldObj.getBlockMetadata(x, y, z));
// EntityItem eItem = new EntityItem(worldObj, (float) x, (float) y, (float) z, stack);
// eItem.setVelocity(0D, 0D, 0D);
// worldObj.spawnEntityInWorld(eItem);
this.smooshingBlock = worldObj.getBlock(x, y, z);
this.smooshingMeta = worldObj.getBlockMetadata(x, y, z); |
<<<<<<<
if (Config.enableSpyglass){
SteamcraftRegistry.addResearch("research.Spyglass.name","category.Basics.name",new BookPageItem("research.Spyglass.name","research.Spyglass.0", new ItemStack(SteamcraftItems.spyglass)),new BookPageCrafting("","spyglass1","spyglass2"));
}
if (Config.enableSurvivalist){
if (Loader.isModLoaded("Baubles")) {
SteamcraftRegistry.addResearch("research.Survivalist.name","category.Basics.name",new BookPageItem("research.Survivalist.name","research.SurvivalistBaubles.0", new ItemStack(SteamcraftItems.survivalist)),new BookPageCrafting("","survivalist"));
}
else
{
SteamcraftRegistry.addResearch("research.Survivalist.name","category.Basics.name",new BookPageItem("research.Survivalist.name","research.Survivalist.0", new ItemStack(SteamcraftItems.survivalist)),new BookPageCrafting("","survivalist"));
}
}
SteamcraftRegistry.addResearch(
"research.SteamSystem.name",
"category.Basics.name",
new BookPageItem(
"research.SteamSystem.name",
"research.SteamSystem.0",
new ItemStack(SteamcraftBlocks.boiler,1,0),
new ItemStack(SteamcraftBlocks.pipe, 1,0)
),
new BookPageText("research.SteamSystem.name", "research.SteamSystem.1"),
new BookPageText("research.SteamSystem.name", "research.SteamSystem.2"),
new BookPageText("research.SteamSystem.name", "research.SteamSystem.3"),
new BookPageText("research.SteamSystem.name", "research.SteamSystem.4"),
new BookPageText("research.SteamSystem.name", "research.SteamSystem.5")
);
=======
>>>>>>>
if (Config.enableSpyglass){
SteamcraftRegistry.addResearch("research.Spyglass.name","category.Basics.name",new BookPageItem("research.Spyglass.name","research.Spyglass.0", new ItemStack(SteamcraftItems.spyglass)),new BookPageCrafting("","spyglass1","spyglass2"));
}
if (Config.enableSurvivalist){
if (Loader.isModLoaded("Baubles")) {
SteamcraftRegistry.addResearch("research.Survivalist.name","category.Basics.name",new BookPageItem("research.Survivalist.name","research.SurvivalistBaubles.0", new ItemStack(SteamcraftItems.survivalist)),new BookPageCrafting("","survivalist"));
}
else
{
SteamcraftRegistry.addResearch("research.Survivalist.name","category.Basics.name",new BookPageItem("research.Survivalist.name","research.Survivalist.0", new ItemStack(SteamcraftItems.survivalist)),new BookPageCrafting("","survivalist"));
}
}
SteamcraftRegistry.addResearch(
"research.SteamSystem.name",
"category.Basics.name",
new BookPageItem(
"research.SteamSystem.name",
"research.SteamSystem.0",
new ItemStack(SteamcraftBlocks.boiler,1,0),
new ItemStack(SteamcraftBlocks.pipe, 1,0)
),
new BookPageText("research.SteamSystem.name", "research.SteamSystem.1"),
new BookPageText("research.SteamSystem.name", "research.SteamSystem.2"),
new BookPageText("research.SteamSystem.name", "research.SteamSystem.3"),
new BookPageText("research.SteamSystem.name", "research.SteamSystem.4"),
new BookPageText("research.SteamSystem.name", "research.SteamSystem.5")
); |
<<<<<<<
=======
bindSingleton(SendingMessageTracker.class);
bindSingleton(NoOperationSendingTracker.class);
bindSingleton(Trackers.class);
bindSingleton(InstrumentedExecutorServiceFactory.class);
>>>>>>>
bindSingleton(InstrumentedExecutorServiceFactory.class); |
<<<<<<<
.withCodes2xx(metrics.metricValue(codes2xxPath))
.withCodes4xx(metrics.metricValue(codes4xxPath))
.withCodes5xx(metrics.metricValue(codes5xxPath))
.withTimeouts(metrics.metricValue(timeouts))
.withOtherErrors(metrics.metricValue(otherErrors))
=======
.withLag(lagSource.getLag(topicName, subscriptionName))
>>>>>>>
.withCodes2xx(metrics.metricValue(codes2xxPath))
.withCodes4xx(metrics.metricValue(codes4xxPath))
.withCodes5xx(metrics.metricValue(codes5xxPath))
.withTimeouts(metrics.metricValue(timeouts))
.withOtherErrors(metrics.metricValue(otherErrors))
.withLag(lagSource.getLag(topicName, subscriptionName)) |
<<<<<<<
import com.google.common.util.concurrent.ListenableFuture;
=======
>>>>>>>
<<<<<<<
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static pl.allegro.tech.hermes.common.http.MessageMetadataHeaders.MESSAGE_ID;
=======
import static org.mockito.Mockito.*;
>>>>>>>
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static pl.allegro.tech.hermes.common.http.MessageMetadataHeaders.MESSAGE_ID;
<<<<<<<
// when
ListenableFuture<MessageSendingResult> future = messageSender.send(SOME_MESSAGE);
=======
CompletableFuture<MessageSendingResult> future = new CompletableFuture<>();
messageSender.sendMessage(SOME_MESSAGE, future);
>>>>>>>
// when
CompletableFuture<MessageSendingResult> future = messageSender.send(SOME_MESSAGE);
<<<<<<<
=======
public void shouldReleaseSemaphoreWhenMessageSuccessfullyPublished() throws Exception {
CompletableFuture<MessageSendingResult> future = new CompletableFuture<>();
messageSender.sendMessage(SOME_MESSAGE, future);
ArgumentCaptor<CompletionListener> listenerCaptor = ArgumentCaptor.forClass(CompletionListener.class);
verify(jmsProducerMock).setAsync(listenerCaptor.capture());
listenerCaptor.getValue().onCompletion(messageMock);
}
@Test
>>>>>>>
<<<<<<<
// when
ListenableFuture<MessageSendingResult> future = messageSender.send(SOME_MESSAGE);
=======
CompletableFuture<MessageSendingResult> future = new CompletableFuture<>();
messageSender.sendMessage(SOME_MESSAGE, future);
>>>>>>>
// when
CompletableFuture<MessageSendingResult> future = messageSender.send(SOME_MESSAGE);
<<<<<<<
=======
public void shouldReleaseSemaphoreWhenOnExceptionCalledOnListener() throws Exception {
CompletableFuture<MessageSendingResult> future = new CompletableFuture<>();
messageSender.sendMessage(SOME_MESSAGE, future);
ArgumentCaptor<CompletionListener> listenerCaptor = ArgumentCaptor.forClass(CompletionListener.class);
verify(jmsProducerMock).setAsync(listenerCaptor.capture());
listenerCaptor.getValue().onException(messageMock, new RuntimeException());
}
@Test
>>>>>>>
<<<<<<<
// given
=======
CompletableFuture<MessageSendingResult> future = new CompletableFuture<>();
>>>>>>>
// given
<<<<<<<
// given
=======
CompletableFuture<MessageSendingResult> future = new CompletableFuture<>();
>>>>>>> |
<<<<<<<
private String timeouts;
private String otherErrors;
private String codes2xx;
private String codes4xx;
private String codes5xx;
=======
private long lag;
private String rate = "0.0";
>>>>>>>
private String timeouts;
private String otherErrors;
private String codes2xx;
private String codes4xx;
private String codes5xx;
private long lag;
<<<<<<<
public String getOtherErrors() {
return otherErrors;
=======
public long getLag() {
return lag;
}
public void setLag(long lag) {
this.lag = lag;
}
public String getRate() {
return rate;
>>>>>>>
public long getLag() {
return lag;
}
public String getRate() {
return rate;
}
public String getOtherErrors() {
return otherErrors; |
<<<<<<<
import org.eclipse.jetty.client.HttpClient;
=======
import com.mongodb.DB;
import com.squareup.okhttp.OkHttpClient;
import com.squareup.okhttp.Request;
>>>>>>>
import com.squareup.okhttp.OkHttpClient;
import com.squareup.okhttp.Request;
<<<<<<<
.withBinding(configFactory, ConfigFactory.class)
.withLogRepository(serviceLocator -> new MongoLogRepository(FongoFactory.hermesDB(),
10,
1000,
configFactory.getStringProperty(Configs.KAFKA_CLUSTER_NAME),
serviceLocator.getService(MetricRegistry.class),
serviceLocator.getService(PathsCompiler.class)))
.build();
=======
.withBinding(new FongoFactory().provide(), DB.class)
.withBinding(configFactory, ConfigFactory.class)
.build();
client = new OkHttpClient();
>>>>>>>
.withBinding(configFactory, ConfigFactory.class)
.withLogRepository(serviceLocator -> new MongoLogRepository(FongoFactory.hermesDB(),
10,
1000,
configFactory.getStringProperty(Configs.KAFKA_CLUSTER_NAME),
serviceLocator.getService(MetricRegistry.class),
serviceLocator.getService(PathsCompiler.class)))
.build();
client = new OkHttpClient(); |
<<<<<<<
/**
* Delete a module object pointer.
*/
=======
private Module() {
}
>>>>>>>
private Module() {
}
/**
* Delete a module object pointer.
*/ |
<<<<<<<
=======
Date now = new Date();
long timestamp = now.getTime();
final Map<String, Pattern> collections = WebMapping.collectionParser(crawl.optString("collection"));
>>>>>>>
Date now = new Date();
long timestamp = now.getTime();
final Map<String, Pattern> collections = WebMapping.collectionParser(crawl.optString("collection"));
<<<<<<<
crawlStatus.setUrl(u);
=======
>>>>>>>
<<<<<<<
// double check with the fast double cache
=======
// check with the fast double cache
>>>>>>>
// double check with the fast double cache
<<<<<<<
// double check with the elastic index
if (Data.gridIndex.exist(GridIndex.CRAWLER_INDEX_NAME, GridIndex.EVENT_TYPE_NAME, urlid)) {
continue urlcheck;
}
// check matcher rules
if (!mustmatch.matcher(u).matches() || mustnotmatch.matcher(u).matches()) {
crawlStatus
.setStatus(Status.rejected)
.setComment(!mustmatch.matcher(u).matches() ? "does not match mustmatch: " + mustmatch.toString() : "does not match mustnotmatch: " + mustnotmatch.toString());
crawlStatus.store(Data.gridIndex);
continue urlcheck;
}
=======
// double-check with the elastic index
if (Data.gridIndex.exist(GridIndex.CRAWLER_INDEX_NAME, GridIndex.EVENT_TYPE_NAME, urlid)) {
continue urlcheck;
}
// prepare status document
CrawlerDocument crawlStatus = new CrawlerDocument()
.setCrawlId(crawlID)
.setURL(u)
.setInitDate(now)
.setStatusDate(now)
.setCollections(collections.keySet());
// check matcher rules
if (!mustmatch.matcher(u).matches() || mustnotmatch.matcher(u).matches()) {
crawlStatus
.setStatus(Status.rejected)
.setComment(!mustmatch.matcher(u).matches() ? "url does not match must-match filter " + mustmatchs : "url matches mustnotmatch filter " + mustnotmatchs);
crawlStatus.store(Data.gridIndex);
continue urlcheck;
}
>>>>>>>
// double check with the elastic index
if (Data.gridIndex.exist(GridIndex.CRAWLER_INDEX_NAME, GridIndex.EVENT_TYPE_NAME, urlid)) {
continue urlcheck;
}
// create new crawl status document
CrawlerDocument crawlStatus = new CrawlerDocument()
.setCrawlId(crawlID)
.setInitDate(now)
.setStatusDate(now)
.setCollections(collections.keySet())
.setUrl(u);
// check matcher rules
if (!mustmatch.matcher(u).matches() || mustnotmatch.matcher(u).matches()) {
crawlStatus
.setStatus(Status.rejected)
.setComment(!mustmatch.matcher(u).matches() ? "url does not match must-match filter " + mustmatchs : "url matches mustnotmatch filter " + mustnotmatchs);
crawlStatus.store(Data.gridIndex);
continue urlcheck;
}
<<<<<<<
//Data.logger.info("Crawler.processAction crawler blacklist pattern '" + blacklistInfo.matcher.pattern().toString() + "' removed url '" + u + "' from crawl list " + blacklistInfo.source + ": " + blacklistInfo.info);
crawlStatus
.setStatus(Status.rejected)
.setComment("url is blacklisted");
crawlStatus.store(Data.gridIndex);
=======
Data.logger.info("Crawler.processAction crawler blacklist pattern '" + blacklistInfo.matcher.pattern().toString() + "' removed url '" + u + "' from crawl list " + blacklistInfo.source + ": " + blacklistInfo.info);
crawlStatus
.setStatus(Status.rejected)
.setComment("url matches blacklist");
crawlStatus.store(Data.gridIndex);
>>>>>>>
Data.logger.info("Crawler.processAction crawler blacklist pattern '" + blacklistInfo.matcher.pattern().toString() + "' removed url '" + u + "' from crawl list " + blacklistInfo.source + ": " + blacklistInfo.info);
crawlStatus
.setStatus(Status.rejected)
.setComment("url matches blacklist");
crawlStatus.store(Data.gridIndex);
<<<<<<<
long timestamp = now.getTime();
=======
>>>>>>> |
<<<<<<<
=======
* List of columns defined on the table.
*/
@SuppressWarnings("CollectionWithoutInitialCapacity")
private final List<PgColumn> columns = new ArrayList<PgColumn>();
/**
* List of inheritedColumns defined on the table.
*/
@SuppressWarnings("CollectionWithoutInitialCapacity")
private final List<PgInheritedColumn> inheritedColumns = new ArrayList<PgInheritedColumn>();
/**
>>>>>>>
* List of inheritedColumns defined on the table.
*/
@SuppressWarnings("CollectionWithoutInitialCapacity")
private final List<PgInheritedColumn> inheritedColumns = new ArrayList<PgInheritedColumn>();
/**
<<<<<<<
public PgTable(final String name) {
setName(name);
=======
public PgTable(final String name, final PgDatabase database, final PgSchema schema) {
this.name = name;
this.database = database;
this.schema = schema;
}
/**
* Setter for {@link #clusterIndexName}.
*
* @param name {@link #clusterIndexName}
*/
public void setClusterIndexName(final String name) {
clusterIndexName = name;
}
/**
* Getter for {@link #clusterIndexName}.
*
* @return {@link #clusterIndexName}
*/
public String getClusterIndexName() {
return clusterIndexName;
}
/**
* Finds column according to specified column {@code name}.
*
* @param name name of the column to be searched
*
* @return found column or null if no such column has been found
*/
public PgColumn getColumn(final String name) {
for (PgColumn column : columns) {
if (column.getName().equals(name)) {
return column;
}
}
return null;
}
/**
* Finds inheritedColumn according to specified name {@code name}.
*
* @param name name of the inheritedColumn to be searched
*
* @return found inheritedColumn or null if no such inheritedColumn
* has been found
*/
public PgInheritedColumn getInheritedColumn(final String name) {
if (inherits != null && !inherits.isEmpty()) {
for (PgInheritedColumn inheritedColumn : inheritedColumns) {
if (inheritedColumn.getInheritedColumn().getName().equals(name)) {
return inheritedColumn;
}
}
}
return null;
}
/**
* Getter for {@link #columns}. The list cannot be modified.
*
* @return {@link #columns}
*/
public List<PgColumn> getColumns() {
return Collections.unmodifiableList(columns);
}
/**
* Getter for {@link #inheritedColumns}. The list cannot be modified.
*
* @return {@link #inheritedColumns}
*/
public List<PgInheritedColumn> getInheritedColumns() {
return Collections.unmodifiableList(inheritedColumns);
}
/**
* Getter for {@link #comment}.
*
* @return {@link #comment}
*/
public String getComment() {
return comment;
}
/**
* Setter for {@link #comment}.
*
* @param comment {@link #comment}
*/
public void setComment(final String comment) {
this.comment = comment;
>>>>>>>
public PgTable(final String name, final PgDatabase database, final PgSchema schema) {
setName(name);
this.database = database;
this.schema = schema;
<<<<<<<
=======
* Getter for {@link #tablespace}.
*
* @return {@link #tablespace}
*/
public String getTablespace() {
return tablespace;
}
/**
* Setter for {@link #tablespace}.
*
* @param tablespace {@link #tablespace}
*/
public void setTablespace(final String tablespace) {
this.tablespace = tablespace;
}
/**
* Adds {@code column} to the list of columns.
*
* @param column column
*/
public void addColumn(final PgColumn column) {
columns.add(column);
}
/**
* Adds {@code inheritedColumn} to the list of inheritedColumns.
*
* @param inheritedColumn inheritedColumn
*/
public void addInheritedColumn(final PgInheritedColumn inheritedColumn) {
inheritedColumns.add(inheritedColumn);
}
/**
>>>>>>>
* Getter for {@link #tablespace}.
*
* @return {@link #tablespace}
*/
public String getTablespace() {
return tablespace;
}
/**
* Setter for {@link #tablespace}.
*
* @param tablespace {@link #tablespace}
*/
public void setTablespace(final String tablespace) {
this.tablespace = tablespace;
}
/**
* Adds {@code column} to the list of columns.
*
* @param column column
*/
public void addColumn(final PgColumn column) {
columns.add(column);
}
/**
* Adds {@code inheritedColumn} to the list of inheritedColumns.
*
* @param inheritedColumn inheritedColumn
*/
public void addInheritedColumn(final PgInheritedColumn inheritedColumn) {
inheritedColumns.add(inheritedColumn);
}
/**
* Finds inheritedColumn according to specified name {@code name}.
*
* @param name name of the inheritedColumn to be searched
*
* @return found inheritedColumn or null if no such inheritedColumn
* has been found
*/
public PgInheritedColumn getInheritedColumn(final String name) {
if (inherits != null && !inherits.isEmpty()) {
for (PgInheritedColumn inheritedColumn : inheritedColumns) {
if (inheritedColumn.getInheritedColumn().getName().equals(name)) {
return inheritedColumn;
}
}
}
return null;
}
/**
* Getter for {@link #inheritedColumns}. The list cannot be modified.
*
* @return {@link #inheritedColumns}
*/
public List<PgInheritedColumn> getInheritedColumns() {
return Collections.unmodifiableList(inheritedColumns);
}
/**
<<<<<<<
=======
* Adds {@code index} to the list of indexes.
*
* @param index index
*/
public void addIndex(final PgIndex index) {
indexes.add(index);
}
/**
* Adds {@code trigger} to the list of triggers.
*
* @param trigger trigger
*/
public void addTrigger(final PgTrigger trigger) {
triggers.add(trigger);
}
/**
* Returns true if table contains given column {@code name}, otherwise
* false.
*
* @param name name of the column
*
* @return true if table contains given column {@code name}, otherwise false
*/
public boolean containsColumn(final String name) {
for (PgColumn column : columns) {
if (column.getName().equals(name)) {
return true;
}
}
return false;
}
/**
* Returns true if table contains given inheritedColumn {@code name},
* otherwise false.
*
* @param name name of the inheritedColumn
*
* @return true if table contains given inheritedColumn {@code name},
* otherwise false
*/
public boolean containsInheritedColumn(final String name) {
if (inherits != null && !inherits.isEmpty()) {
for (PgInheritedColumn inheritedColumn : inheritedColumns) {
if (inheritedColumn.getInheritedColumn().getName().equals(name)) {
return true;
}
}
}
return false;
}
/**
>>>>>>>
* Returns true if table contains given inheritedColumn {@code name},
* otherwise false.
*
* @param name name of the inheritedColumn
*
* @return true if table contains given inheritedColumn {@code name},
* otherwise false
*/
public boolean containsInheritedColumn(final String name) {
if (inherits != null && !inherits.isEmpty()) {
for (PgInheritedColumn inheritedColumn : inheritedColumns) {
if (inheritedColumn.getInheritedColumn().getName().equals(name)) {
return true;
}
}
}
return false;
}
/** |
<<<<<<<
import cz.startnet.utils.pgdiff.Pair;
import cz.startnet.utils.pgdiff.PgDiffUtils;
=======
>>>>>>>
import cz.startnet.utils.pgdiff.Pair;
import cz.startnet.utils.pgdiff.PgDiffUtils;
<<<<<<<
* Is this a UNLOGGED table?
=======
* Tablespace value.
*/
private String tablespace;
/**
* Comment.
*/
private String comment;
/**
* List of privileges defined on the table.
*/
@SuppressWarnings("CollectionWithoutInitialCapacity")
private final List<PgTablePrivilege> privileges = new ArrayList<PgTablePrivilege>();
/**
* Column the table is owner to.
*/
private String ownerTo;
/**
* Creates a new PgTable object.
*
* @param name
* {@link #name}
*/
public PgTable(final String name) {
this.name = name;
}
/**
* Setter for {@link #clusterIndexName}.
*
* @param name
* {@link #clusterIndexName}
>>>>>>>
* Is this a UNLOGGED table?
<<<<<<<
* PgDatabase
=======
* Finds column according to specified column {@code name}.
*
* @param name
* name of the column to be searched
*
* @return found column or null if no such column has been found
>>>>>>>
* Copyright 2006 StartNet s.r.o.
*
* Distributed under MIT license
*/
package cz.startnet.utils.pgdiff.schema;
import cz.startnet.utils.pgdiff.Pair;
import cz.startnet.utils.pgdiff.PgDiffUtils;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/**
* Stores table information.
*
* @author fordfrog
*/
public class PgTable extends PgRelation {
/**
* List of inheritedColumns defined on the table.
*/
@SuppressWarnings("CollectionWithoutInitialCapacity")
private final List<PgInheritedColumn> inheritedColumns = new ArrayList<PgInheritedColumn>();
/**
* List of constraints defined on the table.
*/
@SuppressWarnings("CollectionWithoutInitialCapacity")
private final List<PgConstraint> constraints =
new ArrayList<PgConstraint>();
/**
* List of names of inherited tables.
*/
@SuppressWarnings("CollectionWithoutInitialCapacity")
private final List<Pair<String,String>> inherits = new ArrayList<Pair<String,String>>();
/**
* WITH clause. If value is null then it is not set, otherwise can be set to
* OIDS=true, OIDS=false, or storage parameters can be set.
*/
private String with;
/**
* Is this a UNLOGGED table?
*/
private boolean unlogged;
/**
* PgDatabase
<<<<<<<
* PgSchema
=======
* Getter for {@link #columns}. The list cannot be modified.
*
* @return {@link #columns}
>>>>>>>
* PgSchema
<<<<<<<
*
* @param schema schema of current statement
*
=======
*
>>>>>>>
*
* @param schema schema of current statement
*
<<<<<<<
=======
* Setter for {@link #name}.
*
* @param name
* {@link #name}
*/
public void setName(final String name) {
this.name = name;
}
/**
* Getter for {@link #name}.
*
* @return {@link #name}
*/
public String getName() {
return name;
}
/**
* Getter for {@link #triggers}. The list cannot be modified.
*
* @return {@link #triggers}
*/
public List<PgTrigger> getTriggers() {
return Collections.unmodifiableList(triggers);
}
/**
>>>>>>>
<<<<<<<
* Adds {@code inheritedColumn} to the list of inheritedColumns.
*
* @param inheritedColumn inheritedColumn
=======
* Adds {@code constraint} to the list of constraints.
*
* @param constraint
* constraint
>>>>>>>
* Adds {@code inheritedColumn} to the list of inheritedColumns.
*
* @param inheritedColumn inheritedColumn
<<<<<<<
* Finds inheritedColumn according to specified name {@code name}.
*
* @param name name of the inheritedColumn to be searched
*
* @return found inheritedColumn or null if no such inheritedColumn
* has been found
=======
* Adds {@code index} to the list of indexes.
*
* @param index
* index
>>>>>>>
* Finds inheritedColumn according to specified name {@code name}.
*
* @param name name of the inheritedColumn to be searched
*
* @return found inheritedColumn or null if no such inheritedColumn
* has been found
<<<<<<<
* Getter for {@link #inheritedColumns}. The list cannot be modified.
*
* @return {@link #inheritedColumns}
=======
* Adds {@code trigger} to the list of triggers.
*
* @param trigger
* trigger
>>>>>>>
* Getter for {@link #inheritedColumns}. The list cannot be modified.
*
* @return {@link #inheritedColumns}
<<<<<<<
=======
* Returns true if table contains given index {@code name}, otherwise false.
*
* @param name
* name of the index
*
* @return true if table contains given index {@code name}, otherwise false
*/
public boolean containsIndex(final String name) {
for (PgIndex index : indexes) {
if (index.getName().equals(name)) {
return true;
}
}
return false;
}
/**
>>>>>>> |
<<<<<<<
final boolean ignoreSlonyTriggers, final boolean ignoreSchemaCreation) {
=======
final boolean ignoreSlonyTriggers) {
if (file.equals("-"))
return loadDatabaseSchema(System.in, charsetName,
outputIgnoredStatements, ignoreSlonyTriggers);
>>>>>>>
final boolean ignoreSlonyTriggers, final boolean ignoreSchemaCreation) {
if (file.equals("-"))
return loadDatabaseSchema(System.in, charsetName,
outputIgnoredStatements, ignoreSlonyTriggers); |
<<<<<<<
=======
/**
* List of optional column default values.
*/
private final List<DefaultValue> defaultValues = new ArrayList<DefaultValue>(
0);
/**
* List of optional column comments.
*/
private final List<ColumnComment> columnComments = new ArrayList<ColumnComment>(
0);
/**
* Comment.
*/
private String comment;
/**
* List of privileges defined on the view.
*/
@SuppressWarnings("CollectionWithoutInitialCapacity")
private final List<PgViewPrivilege> privileges = new ArrayList<PgViewPrivilege>();
>>>>>>>
/**
* List of privileges defined on the view.
*/
@SuppressWarnings("CollectionWithoutInitialCapacity")
private final List<PgViewPrivilege> privileges = new ArrayList<PgViewPrivilege>();
<<<<<<<
* Sets the list of declared column names for the view.
*
* @param columnNames list of column names
=======
* Setter for {@link #columnNames}.
*
* @param columnNames
* {@link #columnNames}
>>>>>>>
* Sets the list of declared column names for the view.
*
* @param columnNames list of column names
<<<<<<<
if (columnNames == null || columnNames.isEmpty())
return;
declareColumnNames = true;
for (final String colName: columnNames) {
addColumn(new PgColumn(colName));
}
=======
/**
* Getter for {@link #columnNames}. The list cannot be modified.
*
* @return {@link #columnNames}
*/
public List<String> getColumnNames() {
return Collections.unmodifiableList(columnNames);
>>>>>>>
if (columnNames == null || columnNames.isEmpty())
return;
declareColumnNames = true;
for (final String colName: columnNames) {
addColumn(new PgColumn(colName));
}
}
/**
* Returns a list of column names if the names were declared along with the view, null otherwise.
*
* @return list of column names or null
*/
public List<String> getDeclaredColumnNames() {
@SuppressWarnings("CollectionWithoutInitialCapacity")
final List<String> list = new ArrayList<String>();
if (!declareColumnNames)
return null;
for (PgColumn column : columns) {
list.add(column.getName());
}
return list;
<<<<<<<
/* Column default values */
for (final PgColumn col : getColumns()) {
String defaultValue = col.getDefaultValue();
if (defaultValue != null && !defaultValue.isEmpty()) {
sbSQL.append(System.getProperty("line.separator"));
sbSQL.append(System.getProperty("line.separator"));
sbSQL.append("ALTER ");
sbSQL.append(getRelationKind());
sbSQL.append(' ');
sbSQL.append(PgDiffUtils.getQuotedName(name));
sbSQL.append(" ALTER COLUMN ");
sbSQL.append(PgDiffUtils.getQuotedName(col.getName()));
sbSQL.append(" SET DEFAULT ");
sbSQL.append(defaultValue);
=======
for (final DefaultValue defaultValue : defaultValues) {
sbSQL.append("\n\nALTER VIEW ");
sbSQL.append(PgDiffUtils.getQuotedName(name));
sbSQL.append(" ALTER COLUMN ");
sbSQL.append(PgDiffUtils.getQuotedName(defaultValue.getColumnName()));
sbSQL.append(" SET DEFAULT ");
sbSQL.append(defaultValue.getDefaultValue());
sbSQL.append(';');
}
if (comment != null && !comment.isEmpty()) {
sbSQL.append("\n\nCOMMENT ON VIEW ");
sbSQL.append(PgDiffUtils.getQuotedName(name));
sbSQL.append(" IS ");
sbSQL.append(comment);
sbSQL.append(';');
}
for (final ColumnComment columnComment : columnComments) {
if (columnComment.getComment() != null
&& !columnComment.getComment().isEmpty()) {
sbSQL.append("\n\nCOMMENT ON COLUMN ");
sbSQL.append(PgDiffUtils.getQuotedName(columnComment
.getColumnName()));
sbSQL.append(" IS ");
sbSQL.append(columnComment.getComment());
>>>>>>>
/* Column default values */
for (final PgColumn col : getColumns()) {
String defaultValue = col.getDefaultValue();
if (defaultValue != null && !defaultValue.isEmpty()) {
sbSQL.append(System.getProperty("line.separator"));
sbSQL.append(System.getProperty("line.separator"));
sbSQL.append("ALTER ");
sbSQL.append(getRelationKind());
sbSQL.append(' ');
sbSQL.append(PgDiffUtils.getQuotedName(name));
sbSQL.append(" ALTER COLUMN ");
sbSQL.append(PgDiffUtils.getQuotedName(col.getName()));
sbSQL.append(" SET DEFAULT ");
sbSQL.append(defaultValue);
<<<<<<<
* Setter for {@link #materialized}.
*
* @param materialized {@link #materialized}
=======
* Creates and returns SQL statement for dropping the view.
*
* @return created SQL statement
>>>>>>>
* Setter for {@link #materialized}.
*
* @param materialized {@link #materialized}
<<<<<<<
* Getter for {@link #materialized}.
*
* @return {@link #materialized}
=======
* Getter for {@link #name}.
*
* @return {@link #name}
>>>>>>>
* Getter for {@link #materialized}.
*
* @return {@link #materialized}
<<<<<<<
* Finds column according to specified column {@code name}.
*
* @param name name of the column to be searched
*
* @return found column or null if no such column has been found
=======
* Adds/replaces column default value specification.
*
* @param columnName
* column name
* @param defaultValue
* default value
*/
public void addColumnDefaultValue(final String columnName,
final String defaultValue) {
removeColumnDefaultValue(columnName);
defaultValues.add(new DefaultValue(columnName, defaultValue));
}
/**
* Removes column default value if present.
*
* @param columnName
* column name
>>>>>>>
* Finds column according to specified column {@code name}.
*
* @param name name of the column to be searched
*
* @return found column or null if no such column has been found |
<<<<<<<
final PgSchema oldSchema, final PgSchema newSchema) {
if (oldSchema == null) {
return;
}
=======
final PgSchema oldSchema, final PgSchema newSchema,
final SearchPathHelper searchPathHelper) {
>>>>>>>
final PgSchema oldSchema, final PgSchema newSchema,
final SearchPathHelper searchPathHelper) {
if (oldSchema == null) {
return;
}
<<<<<<<
for (final PgSequence sequence : oldSchema.getSequences()) {
if (!newSchema.containsSequence(sequence.getName())) {
writer.println();
writer.println(sequence.getDropSQL());
=======
if (oldSchema != null) {
for (final PgSequence sequence : oldSchema.getSequences()) {
if (!newSchema.containsSequence(sequence.getName())) {
searchPathHelper.outputSearchPath(writer);
writer.println();
writer.println(sequence.getDropSQL());
}
>>>>>>>
for (final PgSequence sequence : oldSchema.getSequences()) {
if (!newSchema.containsSequence(sequence.getName())) {
searchPathHelper.outputSearchPath(writer);
writer.println();
writer.println(sequence.getDropSQL());
<<<<<<<
final PgSchema newSchema) {
if (oldSchema == null) {
return;
}
=======
final PgSchema newSchema, final SearchPathHelper searchPathHelper) {
>>>>>>>
final PgSchema newSchema, final SearchPathHelper searchPathHelper) {
if (oldSchema == null) {
return;
}
<<<<<<<
final String oldCache = oldSequence.getCache();
final String newCache = newSequence.getCache();
if (newCache != null && !newCache.equals(oldCache)) {
sbSQL.append("\n\tCACHE ");
sbSQL.append(newCache);
}
final boolean oldCycle = oldSequence.isCycle();
final boolean newCycle = newSequence.isCycle();
if (oldCycle && !newCycle) {
sbSQL.append("\n\tNO CYCLE");
} else if (!oldCycle && newCycle) {
sbSQL.append("\n\tCYCLE");
}
if (sbSQL.length() > 0) {
writer.println();
writer.print("ALTER SEQUENCE "
+ PgDiffUtils.getQuotedName(newSequence.getName()));
writer.print(sbSQL.toString());
writer.println(';');
}
if (oldSequence.getComment() == null
&& newSequence.getComment() != null
|| oldSequence.getComment() != null
&& newSequence.getComment() != null
&& !oldSequence.getComment().equals(
newSequence.getComment())) {
writer.println();
writer.print("COMMENT ON SEQUENCE ");
writer.print(PgDiffUtils.getQuotedName(newSequence.getName()));
writer.print(" IS ");
writer.print(newSequence.getComment());
writer.println(';');
} else if (oldSequence.getComment() != null
&& newSequence.getComment() == null) {
writer.println();
writer.print("COMMENT ON SEQUENCE ");
writer.print(newSequence.getName());
writer.println(" IS NULL;");
=======
if (sbSQL.length() > 0) {
searchPathHelper.outputSearchPath(writer);
writer.println();
writer.print("ALTER SEQUENCE "
+ PgDiffUtils.getQuotedName(newSequence.getName()));
writer.print(sbSQL.toString());
writer.println(';');
}
>>>>>>>
final String oldCache = oldSequence.getCache();
final String newCache = newSequence.getCache();
if (newCache != null && !newCache.equals(oldCache)) {
sbSQL.append("\n\tCACHE ");
sbSQL.append(newCache);
}
final boolean oldCycle = oldSequence.isCycle();
final boolean newCycle = newSequence.isCycle();
if (oldCycle && !newCycle) {
sbSQL.append("\n\tNO CYCLE");
} else if (!oldCycle && newCycle) {
sbSQL.append("\n\tCYCLE");
}
if (sbSQL.length() > 0) {
searchPathHelper.outputSearchPath(writer);
writer.println();
writer.print("ALTER SEQUENCE "
+ PgDiffUtils.getQuotedName(newSequence.getName()));
writer.print(sbSQL.toString());
writer.println(';');
}
if (oldSequence.getComment() == null
&& newSequence.getComment() != null
|| oldSequence.getComment() != null
&& newSequence.getComment() != null
&& !oldSequence.getComment().equals(
newSequence.getComment())) {
searchPathHelper.outputSearchPath(writer);
writer.println();
writer.print("COMMENT ON SEQUENCE ");
writer.print(PgDiffUtils.getQuotedName(newSequence.getName()));
writer.print(" IS ");
writer.print(newSequence.getComment());
writer.println(';');
} else if (oldSequence.getComment() != null
&& newSequence.getComment() == null) {
searchPathHelper.outputSearchPath(writer);
writer.println();
writer.print("COMMENT ON SEQUENCE ");
writer.print(newSequence.getName());
writer.println(" IS NULL;"); |
<<<<<<<
=======
import android.net.Uri;
import android.os.AsyncTask;
>>>>>>>
import android.net.Uri;
<<<<<<<
import java.util.concurrent.ExecutionException;
=======
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
>>>>>>>
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.concurrent.ExecutionException; |
<<<<<<<
if ("pbf".equals(format) || "ntvt".equals(format)) {
UnsignedCharVector styleBytes = AssetUtils.loadBytes("mongolie-style.zip");
=======
if ("mbvt".equals(format)) {
UnsignedCharVector styleBytes = AssetUtils.loadBytes("nutibright-v2a.zip");
>>>>>>>
if ("pbf".equals(format) || "ntvt".equals(format)) {
UnsignedCharVector styleBytes = AssetUtils.loadBytes("nutibright-v2a.zip"); |
<<<<<<<
=======
List<Product> findAllByPrice(double price, Pageable pageable);
>>>>>>>
List<Product> findAllByPrice(double price, Pageable pageable); |
<<<<<<<
import javax.persistence.CascadeType;
=======
import javax.persistence.CascadeType;
import javax.persistence.Column;
>>>>>>>
import javax.persistence.CascadeType;
import javax.persistence.Column;
<<<<<<<
private static final long serialVersionUID = 1L;
=======
>>>>>>>
private static final long serialVersionUID = 1L;
<<<<<<<
private int id;
=======
private long id;
@Column(nullable = false)
private String name;
>>>>>>>
private long id;
@Column(nullable = false)
private String name;
<<<<<<<
private String name;
public Bar(){
=======
public Bar() {
>>>>>>>
public Bar() {
<<<<<<<
public void setId(final int id) {
=======
public void setId(final long id) {
>>>>>>>
public void setId(final long id) {
<<<<<<<
=======
public List<Foo> getFooList() {
return fooList;
}
public void setFooList(final List<Foo> fooList) {
this.fooList = fooList;
}
>>>>>>>
public List<Foo> getFooList() {
return fooList;
}
public void setFooList(final List<Foo> fooList) {
this.fooList = fooList;
} |
<<<<<<<
private Integer role;
=======
private Integer role;
>>>>>>>
private Integer role;
<<<<<<<
public String getMatchingPassword() {
return matchingPassword;
}
public void setMatchingPassword(String matchingPassword) {
this.matchingPassword = matchingPassword;
}
=======
>>>>>>>
public String getMatchingPassword() {
return matchingPassword;
}
public void setMatchingPassword(String matchingPassword) {
this.matchingPassword = matchingPassword;
} |
<<<<<<<
import org.springframework.data.mongodb.gridfs.GridFsTemplate;
import org.springframework.core.convert.converter.Converter;
=======
>>>>>>>
import org.springframework.data.mongodb.gridfs.GridFsTemplate; |
<<<<<<<
import javax.persistence.*;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
=======
import javax.persistence.ElementCollection;
import javax.persistence.Entity;
import javax.persistence.Id;
import java.util.ArrayList;
import java.util.List;
>>>>>>>
import java.util.ArrayList;
import java.util.List;
import javax.persistence.ElementCollection;
import javax.persistence.Entity;
import javax.persistence.Id;
<<<<<<<
@ElementCollection
private List<String> tags = new ArrayList<>();
@ElementCollection
private List<SkillTag> skillTags = new ArrayList<>();
@ElementCollection
private List<KVTag> kvTags = new ArrayList<>();
=======
@ElementCollection
private List<String> tags = new ArrayList<>();
>>>>>>>
@ElementCollection
private List<String> tags = new ArrayList<>();
@ElementCollection
private List<SkillTag> skillTags = new ArrayList<>();
@ElementCollection
private List<KVTag> kvTags = new ArrayList<>();
<<<<<<<
public List<String> getTags() {
return tags;
}
public void setTags(List<String> tags) {
this.tags.addAll(tags);
}
public List<SkillTag> getSkillTags() {
return skillTags;
}
public void setSkillTags(List<SkillTag> skillTags) {
this.skillTags.addAll(skillTags);
}
public List<KVTag> getKVTags() {
return this.kvTags;
}
public void setKVTags(List<KVTag> kvTags) {
this.kvTags.addAll(kvTags);
}
=======
public List<String> getTags() {
return tags;
}
public void setTags(List<String> tags) {
this.tags.addAll(tags);
}
>>>>>>>
public List<String> getTags() {
return tags;
}
public void setTags(List<String> tags) {
this.tags.addAll(tags);
}
public List<SkillTag> getSkillTags() {
return skillTags;
}
public void setSkillTags(List<SkillTag> skillTags) {
this.skillTags.addAll(skillTags);
}
public List<KVTag> getKVTags() {
return this.kvTags;
}
public void setKVTags(List<KVTag> kvTags) {
this.kvTags.addAll(kvTags);
} |
<<<<<<<
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import java.util.Arrays;
import java.util.Properties;
=======
>>>>>>>
<<<<<<<
MockitoAnnotations.openMocks(this);
this.testee = new CompoundListenerFactory(Arrays.asList(this.firstChild,
=======
MockitoAnnotations.initMocks(this);
when(firstChild.provides()).thenReturn(MutationResultListenerFactory.LEGACY_MODE);
when(secondChild.provides()).thenReturn(MutationResultListenerFactory.LEGACY_MODE);
this.testee = new CompoundListenerFactory(emptyList(),asList(this.firstChild,
>>>>>>>
MockitoAnnotations.openMocks(this);
when(firstChild.provides()).thenReturn(MutationResultListenerFactory.LEGACY_MODE);
when(secondChild.provides()).thenReturn(MutationResultListenerFactory.LEGACY_MODE);
this.testee = new CompoundListenerFactory(emptyList(),asList(this.firstChild,
<<<<<<<
this.testee.getListener(new Properties(), mock(ListenerArguments.class)).runStart();
=======
this.testee.getListener(null, someArgs()).runStart();
>>>>>>>
this.testee.getListener(new Properties(), someArgs()).runStart(); |
<<<<<<<
computer.turnOn();
m_startOn = false;
=======
if( m_startOn || (m_fresh && m_on) )
{
computer.turnOn();
m_startOn = false;
}
computer.keepAlive();
m_fresh = false;
m_computerID = computer.getID();
label = computer.getLabel();
m_on = computer.isOn();
if( computer.hasOutputChanged() ) updateOutput();
>>>>>>>
computer.turnOn();
m_startOn = false;
<<<<<<<
if( m_computerID >= 0 ) nbt.putInt( NBT_ID, m_computerID );
if( m_label != null ) nbt.putString( NBT_LABEL, m_label );
nbt.putBoolean( NBT_ON, m_on );
return super.write( nbt );
=======
if( m_computerID >= 0 )
{
nbt.setInteger( "computerID", m_computerID );
}
if( label != null )
{
nbt.setString( "label", label );
}
nbt.setBoolean( "on", m_on );
return super.writeToNBT( nbt );
>>>>>>>
if( m_computerID >= 0 ) nbt.putInt( NBT_ID, m_computerID );
if( label != null ) nbt.putString( NBT_LABEL, label );
nbt.putBoolean( NBT_ON, m_on );
return super.write( nbt );
<<<<<<<
// Load ID, label and power state
m_computerID = nbt.contains( NBT_ID ) ? nbt.getInt( NBT_ID ) : -1;
m_label = nbt.contains( NBT_LABEL ) ? nbt.getString( NBT_LABEL ) : null;
m_on = m_startOn = nbt.getBoolean( NBT_ON );
=======
// Load ID
int id = -1;
if( nbt.hasKey( "computerID" ) )
{
// Post-1.6 computers
id = nbt.getInteger( "computerID" );
}
else if( nbt.hasKey( "userDir" ) )
{
// Pre-1.6 computers
String userDir = nbt.getString( "userDir" );
try
{
id = Integer.parseInt( userDir );
}
catch( NumberFormatException e )
{
// Ignore badly formatted data
}
}
m_computerID = id;
// Load label
label = nbt.hasKey( "label" ) ? nbt.getString( "label" ) : null;
// Load power state
m_startOn = nbt.getBoolean( "on" );
m_on = m_startOn;
>>>>>>>
// Load ID, label and power state
m_computerID = nbt.contains( NBT_ID ) ? nbt.getInt( NBT_ID ) : -1;
label = nbt.contains( NBT_LABEL ) ? nbt.getString( NBT_LABEL ) : null;
m_on = m_startOn = nbt.getBoolean( NBT_ON );
<<<<<<<
if( m_computerID >= 0 ) nbt.putInt( NBT_ID, m_computerID );
if( m_label != null ) nbt.putString( NBT_LABEL, m_label );
=======
if( m_instanceID >= 0 ) nbt.setInteger( "instanceID", m_instanceID );
if( label != null ) nbt.setString( "label", label );
if( m_computerID >= 0 ) nbt.setInteger( "computerID", m_computerID );
>>>>>>>
if( label != null ) nbt.putString( NBT_LABEL, label );
if( m_computerID >= 0 ) nbt.putInt( NBT_ID, m_computerID );
<<<<<<<
m_label = nbt.contains( NBT_LABEL ) ? nbt.getString( NBT_LABEL ) : null;
m_computerID = nbt.contains( NBT_ID ) ? nbt.getInt( NBT_ID ) : -1;
=======
m_instanceID = nbt.getInteger( "instanceID" );
label = nbt.hasKey( "label" ) ? nbt.getString( "label" ) : null;
m_computerID = nbt.hasKey( "computerID" ) ? nbt.getInteger( "computerID" ) : -1;
>>>>>>>
label = nbt.contains( NBT_LABEL ) ? nbt.getString( NBT_LABEL ) : null;
m_computerID = nbt.contains( NBT_ID ) ? nbt.getInt( NBT_ID ) : -1;
<<<<<<<
return hasCustomName() ? new StringTextComponent( m_label ) : getBlockState().getBlock().getNameTextComponent();
=======
return hasCustomName() ? label : getBlockType().getTranslationKey();
>>>>>>>
return hasCustomName() ? new StringTextComponent( label ) : getBlockState().getBlock().getNameTextComponent(); |
<<<<<<<
import net.minecraft.client.renderer.*;
=======
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.BufferBuilder;
import net.minecraft.client.renderer.GLAllocation;
import net.minecraft.client.renderer.Tessellator;
>>>>>>>
import net.minecraft.client.renderer.*;
<<<<<<<
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
=======
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
>>>>>>>
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
<<<<<<<
=======
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL13;
import org.lwjgl.opengl.GL15;
import org.lwjgl.opengl.GL31;
>>>>>>>
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL13;
import org.lwjgl.opengl.GL20;
import org.lwjgl.opengl.GL31;
<<<<<<<
=======
import static dan200.computercraft.client.gui.FixedWidthFontRenderer.*;
import static dan200.computercraft.shared.peripheral.monitor.TileMonitor.RENDER_MARGIN;
>>>>>>>
import static dan200.computercraft.client.gui.FixedWidthFontRenderer.*;
<<<<<<<
=======
GlStateManager.colorMask( true, true, true, true );
GlStateManager.popMatrix();
}
private static void renderTerminal( ClientMonitor monitor, float xMargin, float yMargin )
{
Tessellator tessellator = Tessellator.getInstance();
BufferBuilder buffer = tessellator.getBuffer();
boolean redraw = monitor.pollTerminalChanged();
// Setup the buffers if needed. We get the renderer here, to avoid the (unlikely) race condition between
// creating the buffers and rendering.
MonitorRenderer renderer = MonitorRenderer.current();
if( monitor.createBuffer( renderer ) ) redraw = true;
FixedWidthFontRenderer.bindFont();
switch( renderer )
{
case TBO:
{
if( !MonitorTextureBufferShader.use() ) return;
Terminal terminal = monitor.getTerminal();
int width = terminal.getWidth(), height = terminal.getHeight();
int pixelWidth = width * FONT_WIDTH, pixelHeight = height * FONT_HEIGHT;
if( redraw )
{
ByteBuffer monitorBuffer = GLAllocation.createDirectByteBuffer( width * height * 3 );
for( int y = 0; y < height; y++ )
{
TextBuffer text = terminal.getLine( y ), textColour = terminal.getTextColourLine( y ), background = terminal.getBackgroundColourLine( y );
for( int x = 0; x < width; x++ )
{
monitorBuffer.put( (byte) (text.charAt( x ) & 0xFF) );
monitorBuffer.put( (byte) getColour( textColour.charAt( x ), Colour.White ) );
monitorBuffer.put( (byte) getColour( background.charAt( x ), Colour.Black ) );
}
}
monitorBuffer.flip();
GLX.glBindBuffer( GL31.GL_TEXTURE_BUFFER, monitor.tboBuffer );
GLX.glBufferData( GL31.GL_TEXTURE_BUFFER, monitorBuffer, GL15.GL_STATIC_DRAW );
GLX.glBindBuffer( GL31.GL_TEXTURE_BUFFER, 0 );
}
// Bind TBO texture and set up the uniforms. We've already set up the main font above.
GlStateManager.activeTexture( MonitorTextureBufferShader.TEXTURE_INDEX );
GL11.glBindTexture( GL31.GL_TEXTURE_BUFFER, monitor.tboTexture );
GlStateManager.activeTexture( GL13.GL_TEXTURE0 );
MonitorTextureBufferShader.setupUniform( width, height, terminal.getPalette(), !monitor.isColour() );
buffer.begin( GL11.GL_TRIANGLE_STRIP, DefaultVertexFormats.POSITION );
buffer.pos( -xMargin, -yMargin, 0 ).endVertex();
buffer.pos( -xMargin, pixelHeight + yMargin, 0 ).endVertex();
buffer.pos( pixelWidth + xMargin, -yMargin, 0 ).endVertex();
buffer.pos( pixelWidth + xMargin, pixelHeight + yMargin, 0 ).endVertex();
tessellator.draw();
GLX.glUseProgram( 0 );
break;
}
case VBO:
{
VertexBuffer vbo = monitor.buffer;
if( redraw )
{
renderTerminalTo( monitor, buffer, xMargin, yMargin );
buffer.finishDrawing();
buffer.reset();
vbo.bufferData( buffer.getByteBuffer() );
}
vbo.bindBuffer();
setupBufferFormat();
vbo.drawArrays( GL11.GL_TRIANGLES );
VertexBuffer.unbindBuffer();
break;
}
}
// We don't draw the cursor with a buffer, as it's dynamic and so we'll end up refreshing far more than is
// reasonable.
FixedWidthFontRenderer.begin( buffer );
FixedWidthFontRenderer.drawCursor( buffer, 0, 0, monitor.getTerminal(), !monitor.isColour() );
tessellator.draw();
}
private static void renderTerminalTo( ClientMonitor monitor, BufferBuilder buffer, float xMargin, float yMargin )
{
FixedWidthFontRenderer.begin( buffer );
FixedWidthFontRenderer.drawTerminalWithoutCursor(
buffer, 0, 0,
monitor.getTerminal(), !monitor.isColour(), yMargin, yMargin, xMargin, xMargin
);
}
public static void setupBufferFormat()
{
int stride = FixedWidthFontRenderer.POSITION_COLOR_TEX.getSize();
GlStateManager.vertexPointer( 3, GL11.GL_FLOAT, stride, 0 );
GlStateManager.enableClientState( GL11.GL_VERTEX_ARRAY );
GlStateManager.colorPointer( 4, GL11.GL_UNSIGNED_BYTE, stride, 12 );
GlStateManager.enableClientState( GL11.GL_COLOR_ARRAY );
>>>>>>> |
<<<<<<<
import static com.mrd.bitlib.util.CoinUtil.Denomination.mBTC;
=======
>>>>>>> |
<<<<<<<
import net.minecraft.nbt.CompoundNBT;
=======
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.PacketBuffer;
>>>>>>>
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.network.PacketBuffer;
<<<<<<<
public CompoundNBT writeToNBT( CompoundNBT nbt )
=======
public void write( PacketBuffer buffer )
{
for( double[] colour : colours )
{
for( double channel : colour ) buffer.writeByte( (int) (channel * 0xFF) & 0xFF );
}
}
public void read( PacketBuffer buffer )
{
for( double[] colour : colours )
{
for( int i = 0; i < colour.length; i++ ) colour[i] = buffer.readByte() * 255;
}
}
public NBTTagCompound writeToNBT( NBTTagCompound nbt )
>>>>>>>
public void write( PacketBuffer buffer )
{
for( double[] colour : colours )
{
for( double channel : colour ) buffer.writeByte( (int) (channel * 0xFF) & 0xFF );
}
}
public void read( PacketBuffer buffer )
{
for( double[] colour : colours )
{
for( int i = 0; i < colour.length; i++ ) colour[i] = buffer.readByte() * 255;
}
}
public CompoundNBT writeToNBT( CompoundNBT nbt ) |
<<<<<<<
private ComputerProxy m_proxy;
=======
private GameProfile m_owningPlayer;
>>>>>>>
private ComputerProxy m_proxy;
private GameProfile m_owningPlayer; |
<<<<<<<
ComputerCraft.modemRange = modemRange.get();
ComputerCraft.modemHighAltitudeRange = modemHighAltitudeRange.get();
ComputerCraft.modemRangeDuringStorm = modemRangeDuringStorm.get();
ComputerCraft.modemHighAltitudeRangeDuringStorm = modemHighAltitudeRangeDuringStorm.get();
=======
ComputerCraft.modem_range = modemRange.get();
ComputerCraft.modem_highAltitudeRange = modemHighAltitudeRange.get();
ComputerCraft.modem_rangeDuringStorm = modemRangeDuringStorm.get();
ComputerCraft.modem_highAltitudeRangeDuringStorm = modemHighAltitudeRangeDuringStorm.get();
ComputerCraft.monitorBandwidth = monitorBandwidth.get();
>>>>>>>
ComputerCraft.modemRange = modemRange.get();
ComputerCraft.modemHighAltitudeRange = modemHighAltitudeRange.get();
ComputerCraft.modemRangeDuringStorm = modemRangeDuringStorm.get();
ComputerCraft.modemHighAltitudeRangeDuringStorm = modemHighAltitudeRangeDuringStorm.get();
ComputerCraft.monitorBandwidth = monitorBandwidth.get(); |
<<<<<<<
import dan200.computercraft.core.tracking.TrackingField;
=======
import dan200.computercraft.core.filesystem.FileSystemWrapper;
>>>>>>>
import dan200.computercraft.core.filesystem.FileSystemWrapper;
import dan200.computercraft.core.tracking.TrackingField; |
<<<<<<<
import dan200.computercraft.shared.computer.core.ComputerFamily;
import dan200.computercraft.shared.computer.core.IContainerComputer;
import dan200.computercraft.shared.computer.core.ServerComputer;
import dan200.computercraft.shared.network.container.ContainerData;
import dan200.computercraft.shared.network.container.ViewComputerContainerData;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.inventory.container.ContainerType;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.text.TranslationTextComponent;
=======
import dan200.computercraft.shared.computer.blocks.TileCommandComputer;
import dan200.computercraft.shared.computer.core.*;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container;
>>>>>>>
import dan200.computercraft.shared.computer.blocks.TileCommandComputer;
import dan200.computercraft.shared.computer.core.ComputerFamily;
import dan200.computercraft.shared.computer.core.IContainerComputer;
import dan200.computercraft.shared.computer.core.ServerComputer;
import dan200.computercraft.shared.network.container.ContainerData;
import dan200.computercraft.shared.network.container.ViewComputerContainerData;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.inventory.container.ContainerType; |
<<<<<<<
=======
@Deprecated
public void addAPI( dan200.computercraft.core.apis.ILuaAPI api )
{
m_computer.addAPI( api );
}
@Deprecated
>>>>>>> |
<<<<<<<
import net.minecraft.client.renderer.ItemRenderer;
import net.minecraft.client.renderer.model.IBakedModel;
import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.client.renderer.texture.TextureMap;
=======
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
>>>>>>>
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
<<<<<<<
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.client.ForgeHooksClient;
=======
>>>>>>>
import net.minecraftforge.api.distmarker.Dist;
<<<<<<<
synchronized( terminal )
{
GlStateManager.pushMatrix();
GlStateManager.disableDepthTest();
// Reset the position to be at the top left corner of the pocket computer
// Note we translate towards the screen slightly too.
GlStateManager.translated( -8 / 16.0, -8 / 16.0, 0.5 / 16.0 );
// Translate to the top left of the screen.
GlStateManager.translated( 4 / 16.0, 3 / 16.0, 0 );
// Work out the scaling required to resize the terminal in order to fit on the computer
final int margin = 2;
int tw = terminal.getWidth();
int th = terminal.getHeight();
int width = tw * FONT_WIDTH + margin * 2;
int height = th * FONT_HEIGHT + margin * 2;
int max = Math.max( height, width );
// The grid is 8 * 8 wide, so we start with a base of 1/2 (8 / 16).
double scale = 1.0 / 2.0 / max;
GlStateManager.scaled( scale, scale, scale );
// The margin/start positions are determined in order for the terminal to be centred.
int startX = (max - width) / 2 + margin;
int startY = (max - height) / 2 + margin;
FixedWidthFontRenderer fontRenderer = FixedWidthFontRenderer.instance();
boolean greyscale = !computer.isColour();
Palette palette = terminal.getPalette();
// Render the actual text
for( int line = 0; line < th; line++ )
{
TextBuffer text = terminal.getLine( line );
TextBuffer colour = terminal.getTextColourLine( line );
TextBuffer backgroundColour = terminal.getBackgroundColourLine( line );
fontRenderer.drawString(
text, startX, startY + line * FONT_HEIGHT,
colour, backgroundColour, margin, margin, greyscale, palette
);
}
// And render the cursor;
int tx = terminal.getCursorX(), ty = terminal.getCursorY();
if( terminal.getCursorBlink() && FrameInfo.getGlobalCursorBlink() &&
tx >= 0 && ty >= 0 && tx < tw && ty < th )
{
TextBuffer cursorColour = new TextBuffer( "0123456789abcdef".charAt( terminal.getTextColour() ), 1 );
fontRenderer.drawString(
new TextBuffer( '_', 1 ), startX + FONT_WIDTH * tx, startY + FONT_HEIGHT * ty,
cursorColour, null, 0, 0, greyscale, palette
);
}
GlStateManager.enableDepthTest();
GlStateManager.popMatrix();
}
=======
TextBuffer text = terminal.getLine( line );
TextBuffer colour = terminal.getTextColourLine( line );
TextBuffer backgroundColour = terminal.getBackgroundColourLine( line );
fontRenderer.drawString(
text, MARGIN, MARGIN + line * FONT_HEIGHT,
colour, backgroundColour, MARGIN, MARGIN, greyscale, palette
);
}
// And render the cursor;
int tx = terminal.getCursorX(), ty = terminal.getCursorY();
if( terminal.getCursorBlink() && FrameInfo.getGlobalCursorBlink() &&
tx >= 0 && ty >= 0 && tx < termWidth && ty < termHeight )
{
TextBuffer cursorColour = new TextBuffer( "0123456789abcdef".charAt( terminal.getTextColour() ), 1 );
fontRenderer.drawString(
new TextBuffer( '_', 1 ), MARGIN + FONT_WIDTH * tx, MARGIN + FONT_HEIGHT * ty,
cursorColour, null, 0, 0, greyscale, palette
);
>>>>>>>
TextBuffer text = terminal.getLine( line );
TextBuffer colour = terminal.getTextColourLine( line );
TextBuffer backgroundColour = terminal.getBackgroundColourLine( line );
fontRenderer.drawString(
text, MARGIN, MARGIN + line * FONT_HEIGHT,
colour, backgroundColour, MARGIN, MARGIN, greyscale, palette
);
}
// And render the cursor;
int tx = terminal.getCursorX(), ty = terminal.getCursorY();
if( terminal.getCursorBlink() && FrameInfo.getGlobalCursorBlink() &&
tx >= 0 && ty >= 0 && tx < termWidth && ty < termHeight )
{
TextBuffer cursorColour = new TextBuffer( "0123456789abcdef".charAt( terminal.getTextColour() ), 1 );
fontRenderer.drawString(
new TextBuffer( '_', 1 ), MARGIN + FONT_WIDTH * tx, MARGIN + FONT_HEIGHT * ty,
cursorColour, null, 0, 0, greyscale, palette
); |
<<<<<<<
private static final String NBT_NAME = "CustomName";
private static final String NBT_PRINTING = "Printing";
private static final String NBT_PAGE_TITLE = "PageTitle";
=======
private static final int[] BOTTOM_SLOTS = new int[] { 7, 8, 9, 10, 11, 12 };
private static final int[] TOP_SLOTS = new int[] { 1, 2, 3, 4, 5, 6 };
private static final int[] SIDE_SLOTS = new int[] { 0 };
>>>>>>>
private static final String NBT_NAME = "CustomName";
private static final String NBT_PRINTING = "Printing";
private static final String NBT_PAGE_TITLE = "PageTitle";
<<<<<<<
synchronized( m_inventory )
{
ItemStack result = m_inventory.get( i );
m_inventory.set( i, ItemStack.EMPTY );
markDirty();
updateBlockState();
return result;
}
=======
ItemStack result = m_inventory.get( slot );
m_inventory.set( slot, ItemStack.EMPTY );
markDirty();
updateAnim();
return result;
>>>>>>>
ItemStack result = m_inventory.get( slot );
m_inventory.set( slot, ItemStack.EMPTY );
markDirty();
updateBlockState();
return result;
<<<<<<<
synchronized( m_inventory )
{
m_inventory.set( i, stack );
markDirty();
updateBlockState();
}
=======
m_inventory.set( slot, stack );
markDirty();
updateAnim();
>>>>>>>
m_inventory.set( slot, stack );
markDirty();
updateBlockState();
<<<<<<<
synchronized( m_inventory )
{
for( int i = 0; i < m_inventory.size(); i++ ) m_inventory.set( i, ItemStack.EMPTY );
markDirty();
updateBlockState();
}
=======
for( int i = 0; i < m_inventory.size(); i++ ) m_inventory.set( i, ItemStack.EMPTY );
markDirty();
updateAnim();
>>>>>>>
for( int i = 0; i < m_inventory.size(); i++ ) m_inventory.set( i, ItemStack.EMPTY );
markDirty();
updateBlockState();
<<<<<<<
// Setup the new page
DyeColor dye = ColourUtils.getStackColour( inkStack );
m_page.setTextColour( dye != null ? dye.getId() : 15 );
m_page.clear();
if( paperStack.getItem() instanceof ItemPrintout )
{
m_pageTitle = ItemPrintout.getTitle( paperStack );
String[] text = ItemPrintout.getText( paperStack );
String[] textColour = ItemPrintout.getColours( paperStack );
for( int y = 0; y < m_page.getHeight(); y++ )
{
m_page.setLine( y, text[y], textColour[y], "" );
}
}
else
{
m_pageTitle = "";
}
m_page.setCursorPos( 0, 0 );
// Decrement ink
inkStack.shrink( 1 );
if( inkStack.isEmpty() ) m_inventory.set( 0, ItemStack.EMPTY );
// Decrement paper
paperStack.shrink( 1 );
if( paperStack.isEmpty() )
{
m_inventory.set( i, ItemStack.EMPTY );
updateBlockState();
}
markDirty();
m_printing = true;
return true;
=======
m_page.setLine( y, text[y], textColour[y], "" );
>>>>>>>
m_page.setLine( y, text[y], textColour[y], "" );
<<<<<<<
for( int slot : BOTTOM_SLOTS )
{
if( m_inventory.get( slot ).isEmpty() )
{
setInventorySlotContents( slot, stack );
m_printing = false;
return true;
}
}
=======
setInventorySlotContents( slot, stack );
m_printing = false;
return true;
>>>>>>>
setInventorySlotContents( slot, stack );
m_printing = false;
return true; |
<<<<<<<
private Set<String> m_mounts;
=======
>>>>>>>
<<<<<<<
m_mounts = new HashSet<>();
=======
>>>>>>>
<<<<<<<
synchronized( this )
{
m_attached = false;
// Unmount everything the detach function forgot to do
for( String m_mount : m_mounts )
{
m_fileSystem.unmount( m_mount );
}
m_mounts.clear();
}
=======
m_attached = false;
// Unmount everything the detach function forgot to do
unmountAll();
>>>>>>>
synchronized( this )
{
// Unmount everything the detach function forgot to do
unmountAll();
}
m_attached = false;
<<<<<<<
// Mount the location
String location;
synchronized( m_fileSystem )
{
location = findFreeLocation( desiredLoc );
if( location != null )
{
try {
m_fileSystem.mount( driveName, location, mount );
} catch( FileSystemException e ) {
// fail and return null
}
}
}
if( location != null )
{
m_mounts.add( location );
}
return location;
}
=======
>>>>>>>
<<<<<<<
// Mount the location
String location;
synchronized( m_fileSystem )
{
location = findFreeLocation( desiredLoc );
if( location != null )
{
try {
m_fileSystem.mountWritable( driveName, location, mount );
} catch( FileSystemException e ) {
// fail and return null
}
}
}
if( location != null )
{
m_mounts.add( location );
}
return location;
=======
return super.mountWritable( desiredLoc, mount, driveName );
>>>>>>>
return super.mountWritable( desiredLoc, mount, driveName );
<<<<<<<
}
m_environment.queueEvent( event, arguments );
=======
}
super.queueEvent( event, arguments );
>>>>>>>
}
super.queueEvent( event, arguments );
<<<<<<<
public void advance( double _dt )
{
}
@Override
=======
>>>>>>>
<<<<<<<
private String findFreeLocation( String desiredLoc )
{
try
{
synchronized( m_fileSystem )
{
if( !m_fileSystem.exists( desiredLoc ) )
{
return desiredLoc;
}
// We used to check foo2,foo3,foo4,etc here
// but the disk drive does this itself now
return null;
}
}
catch( FileSystemException e )
{
return null;
}
}
=======
>>>>>>> |
<<<<<<<
import dan200.computercraft.shared.util.NamedTileEntityType;
import dan200.computercraft.shared.util.TickScheduler;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.nbt.CompoundNBT;
=======
import dan200.computercraft.shared.network.client.TerminalState;
import dan200.computercraft.shared.peripheral.PeripheralType;
import dan200.computercraft.shared.peripheral.common.BlockPeripheral;
import dan200.computercraft.shared.peripheral.common.ITilePeripheral;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
>>>>>>>
import dan200.computercraft.shared.network.client.TerminalState;
import dan200.computercraft.shared.util.NamedTileEntityType;
import dan200.computercraft.shared.util.TickScheduler;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.nbt.CompoundNBT;
<<<<<<<
nbt.putInt( NBT_X, m_xIndex );
nbt.putInt( NBT_Y, m_yIndex );
nbt.putInt( NBT_WIDTH, m_width );
nbt.putInt( NBT_HEIGHT, m_height );
if( m_xIndex == 0 && m_yIndex == 0 && m_serverMonitor != null )
{
m_serverMonitor.writeDescription( nbt );
}
=======
nbt.setInteger( "xIndex", m_xIndex );
nbt.setInteger( "yIndex", m_yIndex );
nbt.setInteger( "width", m_width );
nbt.setInteger( "height", m_height );
nbt.setInteger( "monitorDir", m_dir );
>>>>>>>
nbt.putInt( NBT_X, m_xIndex );
nbt.putInt( NBT_Y, m_yIndex );
nbt.putInt( NBT_WIDTH, m_width );
nbt.putInt( NBT_HEIGHT, m_height );
<<<<<<<
// If we're the origin terminal then read the description
if( m_clientMonitor == null ) m_clientMonitor = new ClientMonitor( advanced, this );
m_clientMonitor.readDescription( nbt );
=======
// If we're the origin terminal then create it.
if( m_clientMonitor == null ) m_clientMonitor = new ClientMonitor( m_advanced, this );
>>>>>>>
// If we're the origin terminal then create it.
if( m_clientMonitor == null ) m_clientMonitor = new ClientMonitor( advanced, this );
<<<<<<<
=======
public final void read( TerminalState state )
{
if( m_xIndex != 0 || m_yIndex != 0 )
{
ComputerCraft.log.warn( "Receiving monitor state for non-origin terminal at {}", getPos() );
return;
}
if( m_clientMonitor == null ) m_clientMonitor = new ClientMonitor( m_advanced, this );
m_clientMonitor.read( state );
}
// Sizing and placement stuff
>>>>>>>
public final void read( TerminalState state )
{
if( m_xIndex != 0 || m_yIndex != 0 )
{
ComputerCraft.log.warn( "Receiving monitor state for non-origin terminal at {}", getPos() );
return;
}
if( m_clientMonitor == null ) m_clientMonitor = new ClientMonitor( advanced, this );
m_clientMonitor.read( state );
}
// Sizing and placement stuff |
<<<<<<<
import net.minecraft.nbt.CompoundNBT;
=======
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.PacketBuffer;
>>>>>>>
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.network.PacketBuffer;
<<<<<<<
// Networking stuff
public void writeDescription( CompoundNBT nbt )
=======
public void writeDescription( NBTTagCompound nbt )
>>>>>>>
public void writeDescription( CompoundNBT nbt )
<<<<<<<
CompoundNBT terminal = new CompoundNBT();
terminal.putInt( "term_width", m_terminal.getWidth() );
terminal.putInt( "term_height", m_terminal.getHeight() );
m_terminal.writeToNBT( terminal );
nbt.put( "terminal", terminal );
=======
// We have a 10 byte header (2 integer positions, then blinking and current colours), followed by the
// contents and palette.
// Yes, this serialisation code is terrible, but we need to serialise to NBT in order to work with monitors
// (or rather tile entity serialisation).
final int length = 10 + (2 * m_terminal.getWidth() * m_terminal.getHeight()) + (16 * 3);
ByteBuf buffer = Unpooled.buffer( length );
m_terminal.write( new PacketBuffer( buffer ) );
if( buffer.writableBytes() != 0 )
{
ComputerCraft.log.warn( "Should have written {} bytes, but have {} ({} remaining).", length, buffer.writerIndex(), buffer.writableBytes() );
}
NBTTagCompound terminal = new NBTTagCompound();
terminal.setInteger( "term_width", m_terminal.getWidth() );
terminal.setInteger( "term_height", m_terminal.getHeight() );
terminal.setByteArray( "term_contents", buffer.array() );
nbt.setTag( "terminal", terminal );
>>>>>>>
// We have a 10 byte header (2 integer positions, then blinking and current colours), followed by the
// contents and palette.
// Yes, this serialisation code is terrible, but we need to serialise to NBT in order to work with monitors
// (or rather tile entity serialisation).
final int length = 10 + (2 * m_terminal.getWidth() * m_terminal.getHeight()) + (16 * 3);
ByteBuf buffer = Unpooled.buffer( length );
m_terminal.write( new PacketBuffer( buffer ) );
if( buffer.writableBytes() != 0 )
{
ComputerCraft.log.warn( "Should have written {} bytes, but have {} ({} remaining).", length, buffer.writerIndex(), buffer.writableBytes() );
}
CompoundNBT terminal = new CompoundNBT();
terminal.putInt( "term_width", m_terminal.getWidth() );
terminal.putInt( "term_height", m_terminal.getHeight() );
terminal.putByteArray( "term_contents", buffer.array() );
nbt.put( "terminal", terminal ); |
<<<<<<<
import dan200.computercraft.core.apis.http.AddressRule;
import dan200.computercraft.core.apis.http.websocket.Websocket;
=======
import dan200.computercraft.core.apis.AddressPredicate;
>>>>>>>
import dan200.computercraft.core.apis.http.AddressRule; |
<<<<<<<
import dan200.computercraft.core.filesystem.JarMount;
import dan200.computercraft.core.terminal.Terminal;
import dan200.computercraft.core.tracking.Tracking;
import dan200.computercraft.shared.command.CommandComputer;
import dan200.computercraft.shared.command.CommandComputerCraft;
=======
import dan200.computercraft.core.filesystem.FileSystemMount;
>>>>>>>
import dan200.computercraft.core.filesystem.FileSystemMount;
import dan200.computercraft.core.terminal.Terminal;
import dan200.computercraft.core.tracking.Tracking;
import dan200.computercraft.shared.command.CommandComputer;
import dan200.computercraft.shared.command.CommandComputerCraft;
<<<<<<<
import java.util.*;
import java.util.function.Function;
=======
import java.nio.file.FileSystem;
import java.nio.file.FileSystems;
import java.nio.file.ProviderNotFoundException;
import java.util.*;
>>>>>>>
import java.nio.file.FileSystem;
import java.nio.file.FileSystems;
import java.nio.file.ProviderNotFoundException;
import java.util.*;
import java.util.function.Function; |
<<<<<<<
public static final NamedTileEntityType<TileTurtle> FACTORY_NORMAL = NamedTileEntityType.create(
new ResourceLocation( ComputerCraft.MOD_ID, "turtle_normal" ),
type -> new TileTurtle( type, ComputerFamily.Normal )
);
public static final NamedTileEntityType<TileTurtle> FACTORY_ADVANCED = NamedTileEntityType.create(
new ResourceLocation( ComputerCraft.MOD_ID, "turtle_advanced" ),
type -> new TileTurtle( type, ComputerFamily.Advanced )
);
// Members
=======
>>>>>>>
public static final NamedTileEntityType<TileTurtle> FACTORY_NORMAL = NamedTileEntityType.create(
new ResourceLocation( ComputerCraft.MOD_ID, "turtle_normal" ),
type -> new TileTurtle( type, ComputerFamily.Normal )
);
public static final NamedTileEntityType<TileTurtle> FACTORY_ADVANCED = NamedTileEntityType.create(
new ResourceLocation( ComputerCraft.MOD_ID, "turtle_advanced" ),
type -> new TileTurtle( type, ComputerFamily.Advanced )
);
<<<<<<<
private LazyOptional<IItemHandlerModifiable> itemHandlerCap;
private boolean m_inventoryChanged;
private TurtleBrain m_brain;
private MoveState m_moveState;
=======
private boolean m_inventoryChanged = false;
private TurtleBrain m_brain = new TurtleBrain( this );
private MoveState m_moveState = MoveState.NOT_MOVED;
private ComputerFamily m_family;
>>>>>>>
private LazyOptional<IItemHandlerModifiable> itemHandlerCap;
private boolean m_inventoryChanged = false;
private TurtleBrain m_brain = new TurtleBrain( this );
private MoveState m_moveState = MoveState.NOT_MOVED;
<<<<<<<
super( type, family );
m_inventory = NonNullList.withSize( INVENTORY_SIZE, ItemStack.EMPTY );
m_previousInventory = NonNullList.withSize( INVENTORY_SIZE, ItemStack.EMPTY );
m_inventoryChanged = false;
m_brain = new TurtleBrain( this );
m_moveState = MoveState.NOT_MOVED;
=======
m_family = family;
>>>>>>>
super( type, family );
<<<<<<<
ListNBT nbttaglist = nbt.getList( "Items", Constants.NBT.TAG_COMPOUND );
m_inventory = NonNullList.withSize( INVENTORY_SIZE, ItemStack.EMPTY );
m_previousInventory = NonNullList.withSize( INVENTORY_SIZE, ItemStack.EMPTY );
for( int i = 0; i < nbttaglist.size(); i++ )
=======
NBTTagList nbttaglist = nbt.getTagList( "Items", Constants.NBT.TAG_COMPOUND );
m_inventory.clear();
m_previousInventory.clear();
for( int i = 0; i < nbttaglist.tagCount(); i++ )
>>>>>>>
ListNBT nbttaglist = nbt.getList( "Items", Constants.NBT.TAG_COMPOUND );
m_inventory.clear();
m_previousInventory.clear();
for( int i = 0; i < nbttaglist.size(); i++ )
<<<<<<<
public void setOwningPlayer( GameProfile player )
=======
// IComputerTile
@Override
public ComputerFamily getFamily()
{
return m_family;
}
void setOwningPlayer( GameProfile player )
>>>>>>>
void setOwningPlayer( GameProfile player )
<<<<<<<
if( stack.getCount() <= count )
{
setInventorySlotContents( slot, ItemStack.EMPTY );
return stack;
}
ItemStack part = stack.split( count );
onInventoryDefinitelyChanged();
return part;
=======
if( stack.getCount() <= count )
{
setInventorySlotContents( slot, ItemStack.EMPTY );
return stack;
>>>>>>>
if( stack.getCount() <= count )
{
setInventorySlotContents( slot, ItemStack.EMPTY );
return stack; |
<<<<<<<
super( id, TurtleUpgradeType.Tool, adjective, item );
m_item = new ItemStack( item );
=======
super( id, legacyID, TurtleUpgradeType.Tool, adjective, item );
this.item = new ItemStack( item, 1, 0 );
>>>>>>>
super( id, TurtleUpgradeType.Tool, adjective, item );
this.item = new ItemStack( item );
<<<<<<<
super( id, TurtleUpgradeType.Tool, item );
m_item = new ItemStack( item );
=======
super( id, legacyID, TurtleUpgradeType.Tool, item );
this.item = new ItemStack( item, 1, 0 );
>>>>>>>
super( id, TurtleUpgradeType.Tool, item );
this.item = new ItemStack( item );
<<<<<<<
mc.getItemRenderer().getItemModelMesher().getItemModel( m_item ),
=======
mc.getRenderItem().getItemModelMesher().getItemModel( item ),
>>>>>>>
mc.getItemRenderer().getItemModelMesher().getItemModel( item ), |
<<<<<<<
Map<String, String> headers = m_responseHeaders = new HashMap<>();
=======
Map<String, String> headers = new HashMap<String, String>();
>>>>>>>
Map<String, String> headers = new HashMap<>(); |
<<<<<<<
if( computer.getFamily() == ComputerFamily.COMMAND )
=======
if( computer.getFamily() == ComputerFamily.Command && !TileCommandComputer.isUsable( player ) )
>>>>>>>
if( computer.getFamily() == ComputerFamily.COMMAND && !TileCommandComputer.isUsable( player ) ) |
<<<<<<<
// IComputerTile
@Override
public ComputerFamily getFamily()
{
return m_family;
}
=======
public void setOwningPlayer( GameProfile player )
{
m_brain.setOwningPlayer( player );
markDirty();
}
>>>>>>>
// IComputerTile
@Override
public ComputerFamily getFamily()
{
return m_family;
}
public void setOwningPlayer( GameProfile player )
{
m_brain.setOwningPlayer( player );
markDirty();
} |
<<<<<<<
=======
public boolean getRedstoneConnectivity( EnumFacing side )
{
if( side == null ) return false;
ComputerSide localDir = remapLocalSide( DirectionUtil.toLocal( this, side.getOpposite() ) );
return !isRedstoneBlockedOnSide( localDir );
}
@Override
public int getRedstoneOutput( EnumFacing side )
{
ComputerSide localDir = remapLocalSide( DirectionUtil.toLocal( this, side ) );
if( !isRedstoneBlockedOnSide( localDir ) && world != null && !world.isRemote )
{
ServerComputer computer = getServerComputer();
if( computer != null ) return computer.getRedstoneOutput( localDir );
}
return 0;
}
@Override
public boolean getBundledRedstoneConnectivity( @Nonnull EnumFacing side )
{
ComputerSide localDir = remapLocalSide( DirectionUtil.toLocal( this, side ) );
return !isRedstoneBlockedOnSide( localDir );
}
@Override
public int getBundledRedstoneOutput( @Nonnull EnumFacing side )
{
ComputerSide localDir = remapLocalSide( DirectionUtil.toLocal( this, side ) );
if( !isRedstoneBlockedOnSide( localDir ) && !world.isRemote )
{
ServerComputer computer = getServerComputer();
if( computer != null ) return computer.getBundledRedstoneOutput( localDir );
}
return 0;
}
@Override
>>>>>>>
<<<<<<<
EnumFacing localDir = remapToLocalSide( dir );
=======
ComputerSide localDir = remapLocalSide( DirectionUtil.toLocal( this, dir ) );
>>>>>>>
ComputerSide localDir = remapToLocalSide( dir );
<<<<<<<
if( computer == null ) return;
// Find the appropriate side and update.
BlockPos pos = computer.getPosition();
for( EnumFacing dir : DirectionUtil.FACINGS )
=======
if( computer == null ) return;
BlockPos pos = computer.getPosition();
for( EnumFacing dir : EnumFacing.VALUES )
>>>>>>>
if( computer == null ) return;
BlockPos pos = computer.getPosition();
for( EnumFacing dir : DirectionUtil.FACINGS )
<<<<<<<
updateSideInput( computer, dir, offset );
break;
=======
updateSideInput( computer, dir, offset );
return;
>>>>>>>
updateSideInput( computer, dir, offset );
break; |
<<<<<<<
import dan200.computercraft.shared.util.CapabilityUtil;
=======
import dan200.computercraft.shared.network.client.TerminalState;
>>>>>>>
import dan200.computercraft.shared.util.CapabilityUtil;
import dan200.computercraft.shared.network.client.TerminalState; |
<<<<<<<
import net.minecraft.nbt.CompoundNBT;
=======
import io.netty.buffer.Unpooled;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.PacketBuffer;
>>>>>>>
import io.netty.buffer.Unpooled;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.network.PacketBuffer;
<<<<<<<
CompoundNBT terminal = nbt.getCompound( "terminal" );
resizeTerminal( terminal.getInt( "term_width" ), terminal.getInt( "term_height" ) );
m_terminal.readFromNBT( terminal );
=======
NBTTagCompound terminal = nbt.getCompoundTag( "terminal" );
resizeTerminal( terminal.getInteger( "term_width" ), terminal.getInteger( "term_height" ) );
m_terminal.read( new PacketBuffer( Unpooled.wrappedBuffer( terminal.getByteArray( "term_contents" ) ) ) );
>>>>>>>
CompoundNBT terminal = nbt.getCompound( "terminal" );
resizeTerminal( terminal.getInt( "term_width" ), terminal.getInt( "term_height" ) );
m_terminal.read( new PacketBuffer( Unpooled.wrappedBuffer( terminal.getByteArray( "term_contents" ) ) ) ); |
<<<<<<<
=======
import net.minecraft.block.Block;
import net.minecraft.block.BlockRedstoneWire;
import net.minecraft.block.state.IBlockState;
>>>>>>>
import net.minecraft.block.BlockRedstoneWire;
import net.minecraft.block.state.IBlockState;
<<<<<<<
=======
import net.minecraft.util.text.TextComponentTranslation;
import net.minecraft.world.IWorldNameable;
import net.minecraft.world.World;
>>>>>>>
import net.minecraft.world.World;
<<<<<<<
=======
public boolean getRedstoneConnectivity( EnumFacing side )
{
return true;
}
@Override
public int getRedstoneOutput( EnumFacing side )
{
ComputerSide localDir = remapLocalSide( DirectionUtil.toLocal( this, side ) );
if( world != null && !world.isRemote )
{
ServerComputer computer = getServerComputer();
if( computer != null ) return computer.getRedstoneOutput( localDir );
}
return 0;
}
@Override
public boolean getBundledRedstoneConnectivity( @Nonnull EnumFacing side )
{
return true;
}
@Override
public int getBundledRedstoneOutput( @Nonnull EnumFacing side )
{
ComputerSide localDir = remapLocalSide( DirectionUtil.toLocal( this, side ) );
if( !world.isRemote )
{
ServerComputer computer = getServerComputer();
if( computer != null ) return computer.getBundledRedstoneOutput( localDir );
}
return 0;
}
@Override
>>>>>>>
<<<<<<<
protected boolean isRedstoneBlockedOnSide( ComputerSide localSide )
{
return false;
}
protected abstract EnumFacing getDirection();
protected ComputerSide remapToLocalSide( EnumFacing globalSide )
{
return remapLocalSide( DirectionUtil.toLocal( getDirection(), globalSide ) );
}
=======
>>>>>>>
protected abstract EnumFacing getDirection();
protected ComputerSide remapToLocalSide( EnumFacing globalSide )
{
return remapLocalSide( DirectionUtil.toLocal( getDirection(), globalSide ) );
}
<<<<<<<
ComputerSide localDir = remapToLocalSide( dir );
if( !isRedstoneBlockedOnSide( localDir ) )
{
computer.setRedstoneInput( localDir, getWorld().getRedstonePower( offset, dir ) );
computer.setBundledRedstoneInput( localDir, BundledRedstone.getOutput( getWorld(), offset, offsetSide ) );
}
=======
ComputerSide localDir = remapLocalSide( DirectionUtil.toLocal( this, dir ) );
computer.setRedstoneInput( localDir, getRedstoneInput( world, offset, dir ) );
computer.setBundledRedstoneInput( localDir, BundledRedstone.getOutput( getWorld(), offset, offsetSide ) );
>>>>>>>
ComputerSide localDir = remapToLocalSide( dir );
computer.setRedstoneInput( localDir, getRedstoneInput( world, offset, dir ) );
computer.setBundledRedstoneInput( localDir, BundledRedstone.getOutput( getWorld(), offset, offsetSide ) ); |
<<<<<<<
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import androidx.viewpager.widget.ViewPager;
=======
>>>>>>> |
<<<<<<<
import androidx.annotation.IntDef;
import androidx.annotation.NonNull;
import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
import me.dkzwm.widget.srl.utils.PixelUtl;
=======
import me.dkzwm.widget.srl.util.PixelUtl;
>>>>>>>
import androidx.annotation.IntDef;
import androidx.annotation.NonNull;
import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
import me.dkzwm.widget.srl.util.PixelUtl; |
<<<<<<<
import android.os.Build;
=======
import android.support.v4.view.ViewCompat;
>>>>>>>
<<<<<<<
import androidx.core.view.ViewCompat;
=======
>>>>>>>
import androidx.core.view.ViewCompat;
<<<<<<<
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
public HorizontalSmoothRefreshLayout(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
}
=======
>>>>>>>
<<<<<<<
protected int layoutContentView(View child, boolean pin, int offsetHeader, int offsetFooter) {
final LayoutParams lp = (LayoutParams) child.getLayoutParams();
final int top = getPaddingTop() + lp.topMargin;
final int bottom = top + child.getMeasuredHeight();
final int left = getPaddingLeft() + lp.leftMargin;
final int right = left + child.getMeasuredWidth();
child.layout(left, top, right, bottom);
if (sDebug)
Log.d(TAG, String.format("onLayout(): content: %s %s %s %s", left, top, right, bottom));
return right;
}
@Override
protected void layoutHeaderView(View child, int offsetHeader) {
if (mMode != Constants.MODE_DEFAULT || isDisabledRefresh()
|| child.getMeasuredWidth() == 0) {
=======
protected void layoutHeaderView(View child) {
if (mMode != Constants.MODE_DEFAULT
|| isDisabledRefresh()
|| child.getMeasuredHeight() == 0) {
>>>>>>>
protected void layoutHeaderView(View child) {
if (mMode != Constants.MODE_DEFAULT
|| isDisabledRefresh()
|| child.getMeasuredHeight() == 0) {
<<<<<<<
mHeaderView.getView().setTranslationX(mIndicator.getCurrentPos());
else
mHeaderView.getView().setTranslationX(mIndicator.getHeaderHeight());
=======
mHeaderView.getView().setTranslationX(mIndicator.getCurrentPos());
else mHeaderView.getView().setTranslationX(mIndicator.getHeaderHeight());
>>>>>>>
mHeaderView.getView().setTranslationX(mIndicator.getCurrentPos());
else mHeaderView.getView().setTranslationX(mIndicator.getHeaderHeight());
<<<<<<<
mFooterView.getView().setTranslationX(-mIndicator.getCurrentPos());
else
mFooterView.getView().setTranslationX(-mIndicator.getFooterHeight());
=======
mFooterView.getView().setTranslationX(-mIndicator.getCurrentPos());
else mFooterView.getView().setTranslationX(-mIndicator.getFooterHeight());
>>>>>>>
mFooterView.getView().setTranslationX(-mIndicator.getCurrentPos());
else mFooterView.getView().setTranslationX(-mIndicator.getFooterHeight());
<<<<<<<
} else if (mTargetView != null) {
if (isMovingHeader)
mTargetView.setTranslationX(mIndicator.getCurrentPos());
else if (isMovingFooter)
mTargetView.setTranslationX(-mIndicator.getCurrentPos());
=======
} else if (mTargetView != null) {
if (isMovingHeader) mTargetView.setTranslationX(mIndicator.getCurrentPos());
else if (isMovingFooter)
mTargetView.setTranslationX(-mIndicator.getCurrentPos());
>>>>>>>
} else if (mTargetView != null) {
if (isMovingHeader) mTargetView.setTranslationX(mIndicator.getCurrentPos());
else if (isMovingFooter)
mTargetView.setTranslationX(-mIndicator.getCurrentPos()); |
<<<<<<<
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
=======
>>>>>>>
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity; |
<<<<<<<
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
=======
>>>>>>>
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity; |
<<<<<<<
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
=======
>>>>>>> |
<<<<<<<
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import androidx.viewpager.widget.ViewPager;
=======
>>>>>>> |
<<<<<<<
=======
import android.support.annotation.Nullable;
import android.support.v7.app.AppCompatActivity;
>>>>>>>
<<<<<<<
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
=======
>>>>>>> |
<<<<<<<
import androidx.annotation.CallSuper;
import androidx.annotation.FloatRange;
import androidx.annotation.IntRange;
import java.lang.ref.WeakReference;
=======
>>>>>>>
import androidx.annotation.CallSuper;
import androidx.annotation.FloatRange;
import androidx.annotation.IntRange; |
<<<<<<<
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
=======
>>>>>>>
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity; |
<<<<<<<
import androidx.annotation.NonNull;
=======
>>>>>>>
import androidx.annotation.NonNull; |
<<<<<<<
import androidx.annotation.IntRange;
import androidx.annotation.NonNull;
import androidx.core.view.ViewCompat;
=======
>>>>>>>
import androidx.annotation.IntRange;
import androidx.annotation.NonNull;
import androidx.core.view.ViewCompat; |
<<<<<<<
import androidx.annotation.CallSuper;
import androidx.annotation.ColorInt;
import androidx.annotation.FloatRange;
import androidx.annotation.IdRes;
import androidx.annotation.IntRange;
import androidx.annotation.MainThread;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.view.GravityCompat;
import androidx.core.view.NestedScrollingChild2;
import androidx.core.view.NestedScrollingChildHelper;
import androidx.core.view.NestedScrollingParent2;
import androidx.core.view.NestedScrollingParentHelper;
import androidx.core.view.ViewCompat;
import java.lang.ref.WeakReference;
=======
>>>>>>>
import androidx.annotation.CallSuper;
import androidx.annotation.ColorInt;
import androidx.annotation.FloatRange;
import androidx.annotation.IdRes;
import androidx.annotation.IntRange;
import androidx.annotation.MainThread;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.view.GravityCompat;
import androidx.core.view.NestedScrollingChild2;
import androidx.core.view.NestedScrollingChildHelper;
import androidx.core.view.NestedScrollingParent2;
import androidx.core.view.NestedScrollingParentHelper;
import androidx.core.view.ViewCompat; |
<<<<<<<
=======
public static final CharMatcher AMOUNT = CharMatcher.JAVA_DIGIT.or(CharMatcher.anyOf(".,"));
private static final int REQUEST_CODE_UNINSTALL = 1;
>>>>>>>
private static final int REQUEST_CODE_UNINSTALL = 1; |
<<<<<<<
import androidx.annotation.StringRes;
=======
>>>>>>>
import androidx.annotation.StringRes; |
<<<<<<<
=======
mObservation = (Observation) savedInstanceState.getSerializable("mObservation");
mIdCount = savedInstanceState.getInt("mIdCount");
mCommentCount = savedInstanceState.getInt("mCommentCount");
mReadOnly = savedInstanceState.getBoolean("mReadOnly");
mReloadTaxon = savedInstanceState.getBoolean("mReloadTaxon");
mObsJson = savedInstanceState.getString("mObsJson");
mTaxonJson = savedInstanceState.getString("mTaxonJson");
mFlagAsCaptive = savedInstanceState.getBoolean("mFlagAsCaptive");
mTaxonName = savedInstanceState.getString("mTaxonName");
mTaxonRankLevel = savedInstanceState.getInt("mTaxonRankLevel");
mTaxonIdName = savedInstanceState.getString("mTaxonIdName");
mTaxonImage = savedInstanceState.getString("mTaxonImage");
try {
String taxonJson = savedInstanceState.getString("mTaxon");
if (taxonJson != null) mTaxon = new JSONObject(savedInstanceState.getString("mTaxon"));
} catch (JSONException e) {
e.printStackTrace();
}
mActiveTab = savedInstanceState.getString("mActiveTab");
mCommentsIds = loadListFromBundle(savedInstanceState, "mCommentsIds");
mFavorites = loadListFromBundle(savedInstanceState, "mFavorites");
mProjects = loadListFromBundle(savedInstanceState, "mProjects");
mAttributes = (SerializableJSONArray) savedInstanceState.getSerializable("mAttributes");
>>>>>>>
<<<<<<<
=======
outState.putSerializable("mObservation", mObservation);
outState.putInt("mIdCount", mIdCount);
outState.putInt("mCommentCount", mCommentCount);
outState.putBoolean("mReadOnly", mReadOnly);
outState.putBoolean("mReloadTaxon", mReloadTaxon);
outState.putString("mObsJson", mObsJson);
outState.putString("mTaxonJson", mTaxonJson);
outState.putBoolean("mFlagAsCaptive", mFlagAsCaptive);
outState.putString("mTaxonIdName", mTaxonIdName);
outState.putString("mTaxonName", mTaxonName);
outState.putInt("mTaxonRankLevel", mTaxonRankLevel);
outState.putString("mTaxonImage", mTaxonImage);
outState.putString("mTaxon", mTaxon != null ? mTaxon.toString() : null);
outState.putString("mActiveTab", mActiveTab);
saveListToBundle(outState, mCommentsIds, "mCommentsIds");
saveListToBundle(outState, mFavorites, "mFavorites");
saveListToBundle(outState, mProjects, "mProjects");
outState.putSerializable("mAttributes", mAttributes);
>>>>>>> |
<<<<<<<
=======
import mmarquee.automation.pattern.BasePattern;
import mmarquee.automation.pattern.Dock;
import mmarquee.automation.pattern.ExpandCollapse;
import mmarquee.automation.pattern.Grid;
import mmarquee.automation.pattern.GridItem;
import mmarquee.automation.pattern.Invoke;
import mmarquee.automation.pattern.ItemContainer;
import mmarquee.automation.pattern.MultipleView;
import mmarquee.automation.pattern.PatternNotFoundException;
import mmarquee.automation.pattern.Range;
import mmarquee.automation.pattern.Scroll;
import mmarquee.automation.pattern.ScrollItem;
import mmarquee.automation.pattern.Selection;
import mmarquee.automation.pattern.SelectionItem;
import mmarquee.automation.pattern.Table;
import mmarquee.automation.pattern.TableItem;
import mmarquee.automation.pattern.Text;
import mmarquee.automation.pattern.Toggle;
import mmarquee.automation.pattern.Transform;
import mmarquee.automation.pattern.Value;
import mmarquee.automation.pattern.Window;
>>>>>>>
import mmarquee.automation.pattern.ExpandCollapse;
import mmarquee.automation.pattern.Grid;
import mmarquee.automation.pattern.GridItem;
import mmarquee.automation.pattern.Invoke;
import mmarquee.automation.pattern.ItemContainer;
import mmarquee.automation.pattern.PatternNotFoundException;
import mmarquee.automation.pattern.Range;
import mmarquee.automation.pattern.Selection;
import mmarquee.automation.pattern.SelectionItem;
import mmarquee.automation.pattern.Table;
import mmarquee.automation.pattern.Text;
import mmarquee.automation.pattern.Toggle;
import mmarquee.automation.pattern.Value;
import mmarquee.automation.pattern.Window;
<<<<<<<
* The basic IAccessible pattern.
*/
private LegacyIAccessible accessible;
/**
* The invoke pattern.
=======
* The available Patterns.
>>>>>>>
* The basic IAccessible pattern.
*/
private LegacyIAccessible accessible;
/**
* The available Patterns.
<<<<<<<
* Gets the underlying automation pattern.
*
* @param id The control id to look for
* @return The pattern
* @throws PatternNotFoundException Pattern not found
* @throws AutomationException Error in automation library
*/
PointerByReference getPattern(final int id)
throws PatternNotFoundException, AutomationException {
PointerByReference unknown = this.element.getPattern(id);
if (unknown != null) {
return unknown;
} else {
logger.warn("Failed to find pattern");
throw new PatternNotFoundException();
}
}
/**
* <p>
* Gets the selectItem pattern for this control.
* </p>
* @return Returns the IUIAutomationSelectionItemPattern associated with this control, or null if not available
* @throws PatternNotFoundException Pattern not found
* @throws AutomationException Error in automation library
*/
public SelectionItem getSelectItemPattern()
throws PatternNotFoundException, AutomationException {
if (this.isSelectionItemPatternAvailable()) {
SelectionItem pattern = new SelectionItem();
PointerByReference unknown = this.getPattern(PatternID.SelectionItem.getValue());
if (unknown instanceof PatternProvider) { // Hook for mocking tests
return (SelectionItem)((PatternProvider) unknown).getPattern();
}
pattern.setPattern(unknown.getValue());
return pattern;
}
return null;
}
/**
* <p>
* Gets the legacy IAccessible pattern for this control.
* </p>
* @return Returns the LegacyIAccessible associated with this control, or null if not available
* @throws PatternNotFoundException Pattern not found
* @throws AutomationException Error in automation library
*/
public LegacyIAccessible getAccessiblePattern()
throws PatternNotFoundException, AutomationException {
if (this.isLegacyIAccessiblePatternAvailable()) {
LegacyIAccessible pattern = new LegacyIAccessible();
PointerByReference unknown = this.getPattern(PatternID.LegacyIAccessible.getValue());
if (unknown instanceof PatternProvider) { // Hook for mocking tests
return (LegacyIAccessible)((PatternProvider) unknown).getPattern();
}
pattern.setPattern(unknown.getValue());
return pattern;
}
return null;
}
/**
* <p>
* Gets the selection pattern for this control.
* </p>
* @return Returns the IUIAutomationSelectionPattern associated with this control, or null if not available
* @throws PatternNotFoundException Pattern not found
* @throws AutomationException Error in automation library
*/
Selection getSelectionPattern()
throws PatternNotFoundException, AutomationException {
if (this.isSelectionPatternAvailable()) {
Selection pattern = new Selection();
PointerByReference unknown = this.getPattern(PatternID.Selection.getValue());
if (unknown instanceof PatternProvider) { // Hook for mocking tests
return (Selection)((PatternProvider) unknown).getPattern();
}
pattern.setPattern(unknown.getValue());
return pattern;
}
return null;
}
/**
* <p>
* Gets the value pattern for this control.
* </p>
* @return Returns the IUIAutomationValuePattern associated with this control, or null if not available
* @throws PatternNotFoundException Pattern is not found
* @throws AutomationException Error in automation library
*/
Value getValuePattern() throws PatternNotFoundException, AutomationException {
if (this.isValuePatternAvailable()) {
Value pattern = new Value();
PointerByReference unknown = this.getPattern(PatternID.Value.getValue());
if (unknown instanceof PatternProvider) { // Hook for mocking tests
return (Value)((PatternProvider) unknown).getPattern();
}
pattern.setPattern(unknown.getValue());
return pattern;
}
return null;
}
/**
* <p>
* Gets the gridItem pattern for this control.
* </p>
* @return Returns the IUIAutomationGridItemPattern associated with this control, or null if not available
* @throws PatternNotFoundException Pattern is not found
* @throws AutomationException Error in automation library
*/
GridItem getGridItemPattern() throws PatternNotFoundException, AutomationException {
if (this.isGridItemPatternAvailable()) {
GridItem pattern = new GridItem();
PointerByReference unknown = this.getPattern(PatternID.GridItem.getValue());
if (unknown instanceof PatternProvider) { // Hook for mocking tests
return (GridItem)((PatternProvider) unknown).getPattern();
}
pattern.setPattern(unknown.getValue());
return pattern;
}
return null;
}
/**
* <p>
* Gets the rangevalue pattern for this control.
* </p>
* @return Returns the IUIAutomationRangeValuePattern associated with this control, or null if not available
* @throws PatternNotFoundException Pattern is not found
* @throws AutomationException Error in automation library
*/
Range getRangePattern() throws PatternNotFoundException, AutomationException {
if (isRangeValuePatternAvailable()) {
Range pattern = new Range();
PointerByReference unknown = this.getPattern(PatternID.RangeValue.getValue());
if (unknown instanceof PatternProvider) { // Hook for mocking tests
return (Range)((PatternProvider) unknown).getPattern();
}
pattern.setPattern(unknown.getValue());
return pattern;
}
return null;
}
/**
* <p>
* Gets the table pattern for this control.
* </p>
* @return Returns the IUIAutomationTablePattern associated with this control, or null if not available
* @throws PatternNotFoundException Pattern is not found
* @throws AutomationException Error in automation library
*/
Table getTablePattern() throws PatternNotFoundException, AutomationException {
if (isTablePatternAvailable()) {
Table pattern = new Table();
PointerByReference unknown = this.getPattern(PatternID.Table.getValue());
if (unknown instanceof PatternProvider) { // Hook for mocking tests
return (Table)((PatternProvider) unknown).getPattern();
}
pattern.setPattern(unknown.getValue());
return pattern;
}
return null;
}
/**
* <p>
* Gets the window pattern for this control.
* </p>
* @return Returns the IUIAutomationWindowPattern associated with this control, or null if not available
* @throws PatternNotFoundException Pattern is not found
* @throws AutomationException Error in automation library
*/
Window getWindowPattern() throws PatternNotFoundException, AutomationException {
if (this.isWindowPatternAvailable()) {
Window pattern = new Window();
PointerByReference unknown = this.getPattern(PatternID.Window.getValue());
if (unknown instanceof PatternProvider) { // Hook for mocking tests
return (Window)((PatternProvider) unknown).getPattern();
}
pattern.setPattern(unknown.getValue());
return pattern;
}
return null;
}
/**
* <p>
* Gets the expand/collapse pattern for this control.
* </p>
* @return Returns the IUIAutomationExpandCollapsePattern associated with this control, or null if not available
* @throws PatternNotFoundException Pattern is not found
* @throws AutomationException Error in automation library
*/
protected ExpandCollapse getExpandCollapsePattern()
throws PatternNotFoundException, AutomationException {
if (isExpandCollapsePatternAvailable()) {
ExpandCollapse pattern = new ExpandCollapse();
PointerByReference unknown = this.getPattern(PatternID.ExpandCollapse.getValue());
if (unknown instanceof PatternProvider) { // Hook for mocking tests
return (ExpandCollapse)((PatternProvider) unknown).getPattern();
}
pattern.setPattern(unknown.getValue());
return pattern;
}
return null;
}
/**
* <p>
* Gets the grid pattern for this control.
* </p>
* @return Returns the IUIAutomationGridPattern associated with this control, or null if not available
* @throws PatternNotFoundException Pattern is not found
* @throws AutomationException Error in automation library
*/
Grid getGridPattern() throws PatternNotFoundException, AutomationException {
if (isGridPatternAvailable()) {
Grid pattern = new Grid();
PointerByReference unknown = this.getPattern(PatternID.Grid.getValue());
if (unknown instanceof PatternProvider) { // Hook for mocking tests
return (Grid)((PatternProvider) unknown).getPattern();
}
pattern.setPattern(unknown.getValue());
return pattern;
}
return null;
}
/**
* <p>
* Gets the toggle pattern for this control.
* </p>
* @return Returns the IUIAutomationTogglePattern associated with this control, or null if not available
* @throws PatternNotFoundException Pattern is not found
* @throws AutomationException Error in automation library
*/
Toggle getTogglePattern() throws PatternNotFoundException, AutomationException {
if (isTogglePatternAvailable()) {
Toggle pattern = new Toggle();
PointerByReference unknown = this.getPattern(PatternID.Toggle.getValue());
if (unknown instanceof PatternProvider) { // Hook for mocking tests
return (Toggle)((PatternProvider) unknown).getPattern();
}
pattern.setPattern(unknown.getValue());
return pattern;
}
return null;
}
/**
* <p>
* Gets the item container pattern for this control.
* </p>
* @return Returns the IUIAutomationItemContainerPattern associated with this control, or null if not available
* @throws PatternNotFoundException Pattern is not found
* @throws AutomationException Error in automation library
*/
ItemContainer getItemContainerPattern() throws PatternNotFoundException, AutomationException {
ItemContainer pattern = new ItemContainer();
if (isItemContainerPatternAvailable()) {
PointerByReference unknown = this.getPattern(PatternID.ItemContainer.getValue());
if (unknown instanceof PatternProvider) { // Hook for mocking tests
return (ItemContainer)((PatternProvider) unknown).getPattern();
}
pattern.setPattern(unknown.getValue());
}
return pattern;
}
/**
* <p>
* Gets the invoke pattern for this control.
* </p>
* @return Returns the IUIAutomationInvokePattern associated with this control, or null if not available
* @throws PatternNotFoundException Pattern is not found
* @throws AutomationException Error in automation library
*/
protected Invoke getInvokePattern() throws PatternNotFoundException, AutomationException {
if (isInvokePatternAvailable()) {
Invoke pattern = new Invoke();
PointerByReference unknown = this.getPattern(PatternID.Invoke.getValue());
if (unknown instanceof PatternProvider) { // Hook for mocking tests
return (Invoke)((PatternProvider) unknown).getPattern();
}
pattern.setPattern(unknown.getValue());
return pattern;
}
return null;
}
/**
* <p>
* Gets the text pattern for this control.
* </p>
* @return Returns the IUIAutomationTextPattern associated with this control, or null if not available
* @throws PatternNotFoundException Pattern is not found
* @throws AutomationException Error in automation library
*/
Text getTextPattern() throws PatternNotFoundException, AutomationException {
if (this.isTextPatternAvailable()) {
Text pattern = new Text();
PointerByReference unknown = this.getPattern(PatternID.Text.getValue());
if (unknown instanceof PatternProvider) { // Hook for mocking tests
return (Text)((PatternProvider) unknown).getPattern();
}
pattern.setPattern(unknown.getValue());
return pattern;
}
return null;
}
/**
=======
>>>>>>> |
<<<<<<<
import com.mycelium.wapi.wallet.erc20.ERC20Backing;
import com.mycelium.wapi.wallet.erc20.ERC20Module;
import com.mycelium.wapi.wallet.erc20.coins.ERC20Token;
=======
>>>>>>>
import com.mycelium.wapi.wallet.erc20.ERC20Backing;
import com.mycelium.wapi.wallet.erc20.ERC20Module;
import com.mycelium.wapi.wallet.erc20.coins.ERC20Token;
<<<<<<<
import com.mycelium.wapi.wallet.eth.Web3jWrapper;
import com.mycelium.wapi.wallet.fiat.coins.FiatType;
import com.mycelium.wapi.wallet.genericdb.AccountContextsBacking;
import com.mycelium.wapi.wallet.genericdb.AdaptersKt;
=======
import com.mycelium.wapi.wallet.fiat.coins.FiatType;
import com.mycelium.wapi.wallet.genericdb.AccountContextsBacking;
import com.mycelium.wapi.wallet.genericdb.AdaptersKt;
>>>>>>>
import com.mycelium.wapi.wallet.eth.Web3jWrapper;
import com.mycelium.wapi.wallet.fiat.coins.FiatType;
import com.mycelium.wapi.wallet.genericdb.AccountContextsBacking;
import com.mycelium.wapi.wallet.genericdb.AdaptersKt;
<<<<<<<
=======
import kotlin.jvm.Synchronized;
>>>>>>>
import kotlin.jvm.Synchronized; |
<<<<<<<
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.isA;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doReturn;
=======
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.isA;
>>>>>>>
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyObject;
import static org.mockito.Matchers.isA;
<<<<<<<
import mmarquee.automation.controls.AutomationApplication;
import org.junit.Before;
import org.junit.Ignore;
=======
import org.junit.Ignore;
>>>>>>>
import org.junit.Ignore;
<<<<<<<
import mmarquee.automation.utils.Utils;
import org.mockito.MockitoAnnotations;
import org.mockito.Spy;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
=======
>>>>>>>
import mmarquee.automation.utils.Utils;
import org.mockito.MockitoAnnotations;
import org.mockito.Spy;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
<<<<<<<
when(mocked_automation.createNotCondition(any(Pointer.class), any(PointerByReference.class))).thenReturn(-1);
=======
when(mocked_automation.createNotCondition(any(), any())).thenReturn(-1);
>>>>>>>
when(mocked_automation.createNotCondition(any(Pointer.class), any(PointerByReference.class))).thenReturn(-1);
<<<<<<<
@Ignore("Mocking fails - needs investigation")
=======
@Ignore("Fails after mockito upgrade")
>>>>>>>
@Ignore("Mocking fails - needs investigation")
<<<<<<<
@Ignore("Mocking seems to fail - needs investigation")
=======
@Ignore("Fails after mockito upgrade")
>>>>>>>
@Ignore("Mocking seems to fail - needs investigation") |
<<<<<<<
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doNothing;
=======
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
>>>>>>>
import static org.mockito.Mockito.doNothing;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
<<<<<<<
=======
when(testElem.getPattern(any())).thenReturn(pbr);
>>>>>>> |
<<<<<<<
import com.mycelium.wapi.wallet.bch.bip44.Bip44BCHAccount;
import com.mycelium.wapi.wallet.bch.bip44.Bip44BCHPubOnlyAccount;
import com.mycelium.wapi.wallet.bch.single.SingleAddressBCHAccount;
import com.mycelium.wapi.wallet.btc.AbstractBtcAccount;
import com.mycelium.wapi.wallet.btc.Bip44AccountBacking;
import com.mycelium.wapi.wallet.btc.InMemoryWalletManagerBacking;
import com.mycelium.wapi.wallet.btc.SynchronizeAbleWalletBtcAccount;
import com.mycelium.wapi.wallet.btc.WalletBtcAccount;
import com.mycelium.wapi.wallet.btc.WalletManagerBacking;
import com.mycelium.wapi.wallet.btc.bip44.*;
import com.mycelium.wapi.wallet.btc.bip44.HDAccountContext.AccountIndexesContext;
import com.mycelium.wapi.wallet.btc.single.PublicPrivateKeyStore;
import com.mycelium.wapi.wallet.btc.single.SingleAddressAccount;
import com.mycelium.wapi.wallet.btc.single.SingleAddressAccountContext;
import java.util.*;
=======
import com.mycelium.wapi.wallet.bip44.*;
import com.mycelium.wapi.wallet.bip44.HDAccountContext.AccountIndexesContext;
import com.mycelium.wapi.wallet.single.PublicPrivateKeyStore;
import com.mycelium.wapi.wallet.single.SingleAddressAccount;
import com.mycelium.wapi.wallet.single.SingleAddressAccountContext;
import com.mycelium.wapi.wallet.single.SingleAddressBCHAccount;
import java.util.*;
>>>>>>>
import com.mycelium.wapi.wallet.bch.bip44.Bip44BCHAccount;
import com.mycelium.wapi.wallet.bch.bip44.Bip44BCHPubOnlyAccount;
import com.mycelium.wapi.wallet.bch.single.SingleAddressBCHAccount;
import com.mycelium.wapi.wallet.btc.AbstractBtcAccount;
import com.mycelium.wapi.wallet.btc.Bip44AccountBacking;
import com.mycelium.wapi.wallet.btc.InMemoryWalletManagerBacking;
import com.mycelium.wapi.wallet.btc.SynchronizeAbleWalletBtcAccount;
import com.mycelium.wapi.wallet.btc.WalletBtcAccount;
import com.mycelium.wapi.wallet.btc.WalletManagerBacking;
import com.mycelium.wapi.wallet.btc.bip44.*;
import com.mycelium.wapi.wallet.btc.bip44.HDAccountContext.AccountIndexesContext;
import com.mycelium.wapi.wallet.btc.single.PublicPrivateKeyStore;
import com.mycelium.wapi.wallet.btc.single.SingleAddressAccount;
import com.mycelium.wapi.wallet.btc.single.SingleAddressAccountContext;
import java.util.*;
<<<<<<<
import static com.mycelium.wapi.wallet.btc.bip44.HDAccountContext.ACCOUNT_TYPE_FROM_MASTERSEED;
import static com.mycelium.wapi.wallet.btc.bip44.HDAccountContext.ACCOUNT_TYPE_UNRELATED_X_PRIV;
import static com.mycelium.wapi.wallet.btc.bip44.HDAccountContext.ACCOUNT_TYPE_UNRELATED_X_PUB;
import static com.mycelium.wapi.wallet.btc.bip44.HDAccountContext.ACCOUNT_TYPE_UNRELATED_X_PUB_EXTERNAL_SIG_KEEPKEY;
import static com.mycelium.wapi.wallet.btc.bip44.HDAccountContext.ACCOUNT_TYPE_UNRELATED_X_PUB_EXTERNAL_SIG_LEDGER;
import static com.mycelium.wapi.wallet.btc.bip44.HDAccountContext.ACCOUNT_TYPE_UNRELATED_X_PUB_EXTERNAL_SIG_TREZOR;
=======
import static com.mycelium.wapi.wallet.bip44.HDAccountContext.ACCOUNT_TYPE_FROM_MASTERSEED;
import static com.mycelium.wapi.wallet.bip44.HDAccountContext.ACCOUNT_TYPE_UNRELATED_X_PRIV;
import static com.mycelium.wapi.wallet.bip44.HDAccountContext.ACCOUNT_TYPE_UNRELATED_X_PUB;
import static com.mycelium.wapi.wallet.bip44.HDAccountContext.ACCOUNT_TYPE_UNRELATED_X_PUB_EXTERNAL_SIG_KEEPKEY;
import static com.mycelium.wapi.wallet.bip44.HDAccountContext.ACCOUNT_TYPE_UNRELATED_X_PUB_EXTERNAL_SIG_LEDGER;
import static com.mycelium.wapi.wallet.bip44.HDAccountContext.ACCOUNT_TYPE_UNRELATED_X_PUB_EXTERNAL_SIG_TREZOR;
>>>>>>>
import static com.mycelium.wapi.wallet.btc.bip44.HDAccountContext.ACCOUNT_TYPE_FROM_MASTERSEED;
import static com.mycelium.wapi.wallet.btc.bip44.HDAccountContext.ACCOUNT_TYPE_UNRELATED_X_PRIV;
import static com.mycelium.wapi.wallet.btc.bip44.HDAccountContext.ACCOUNT_TYPE_UNRELATED_X_PUB;
import static com.mycelium.wapi.wallet.btc.bip44.HDAccountContext.ACCOUNT_TYPE_UNRELATED_X_PUB_EXTERNAL_SIG_KEEPKEY;
import static com.mycelium.wapi.wallet.btc.bip44.HDAccountContext.ACCOUNT_TYPE_UNRELATED_X_PUB_EXTERNAL_SIG_LEDGER;
import static com.mycelium.wapi.wallet.btc.bip44.HDAccountContext.ACCOUNT_TYPE_UNRELATED_X_PUB_EXTERNAL_SIG_TREZOR;
<<<<<<<
Bip44Account account = new Bip44AccountExternalSignature(context, keyManagerMap, _network,
accountBacking, _wapi, externalSignatureProvider);
=======
HDAccount account = new HDAccountExternalSignature(context, keyManagerMap, _network,
accountBacking, _wapi, externalSignatureProvider);
>>>>>>>
HDAccount account = new HDAccountExternalSignature(context, keyManagerMap, _network,
accountBacking, _wapi, externalSignatureProvider);
<<<<<<<
account = new Bip44Account(context, keyManagerMap, _network, accountBacking, _wapi);
=======
account = new HDAccount(context, keyManagerMap, _network, accountBacking, _wapi);
>>>>>>>
account = new HDAccount(context, keyManagerMap, _network, accountBacking, _wapi);
<<<<<<<
account = new Bip44PubOnlyAccount(context, keyManagerMap, _network, accountBacking, _wapi);
=======
account = new HDPubOnlyAccount(context, keyManagerMap, _network, accountBacking, _wapi);
>>>>>>>
account = new HDPubOnlyAccount(context, keyManagerMap, _network, accountBacking, _wapi);
<<<<<<<
account = new Bip44Account(context, keyManagerMap, _network, accountBacking, _wapi);
=======
account = new HDAccount(context, keyManagerMap, _network, accountBacking, _wapi);
>>>>>>>
account = new HDAccount(context, keyManagerMap, _network, accountBacking, _wapi);
<<<<<<<
account = new Bip44AccountExternalSignature(
context,
keyManagerMap,
_network,
accountBacking,
_wapi,
_signatureProviders.get(ACCOUNT_TYPE_UNRELATED_X_PUB_EXTERNAL_SIG_TREZOR)
=======
account = new HDAccountExternalSignature(
context,
keyManagerMap,
_network,
accountBacking,
_wapi,
_signatureProviders.get(ACCOUNT_TYPE_UNRELATED_X_PUB_EXTERNAL_SIG_TREZOR)
>>>>>>>
account = new HDAccountExternalSignature(
context,
keyManagerMap,
_network,
accountBacking,
_wapi,
_signatureProviders.get(ACCOUNT_TYPE_UNRELATED_X_PUB_EXTERNAL_SIG_TREZOR)
<<<<<<<
account = new Bip44AccountExternalSignature(
context,
keyManagerMap,
_network,
accountBacking,
_wapi,
_signatureProviders.get(ACCOUNT_TYPE_UNRELATED_X_PUB_EXTERNAL_SIG_LEDGER)
=======
account = new HDAccountExternalSignature(
context,
keyManagerMap,
_network,
accountBacking,
_wapi,
_signatureProviders.get(ACCOUNT_TYPE_UNRELATED_X_PUB_EXTERNAL_SIG_LEDGER)
>>>>>>>
account = new HDAccountExternalSignature(
context,
keyManagerMap,
_network,
accountBacking,
_wapi,
_signatureProviders.get(ACCOUNT_TYPE_UNRELATED_X_PUB_EXTERNAL_SIG_LEDGER)
<<<<<<<
account = new Bip44AccountExternalSignature(
context,
keyManagerMap,
_network,
accountBacking,
_wapi,
_signatureProviders.get(ACCOUNT_TYPE_UNRELATED_X_PUB_EXTERNAL_SIG_KEEPKEY)
=======
account = new HDAccountExternalSignature(
context,
keyManagerMap,
_network,
accountBacking,
_wapi,
_signatureProviders.get(ACCOUNT_TYPE_UNRELATED_X_PUB_EXTERNAL_SIG_KEEPKEY)
>>>>>>>
account = new HDAccountExternalSignature(
context,
keyManagerMap,
_network,
accountBacking,
_wapi,
_signatureProviders.get(ACCOUNT_TYPE_UNRELATED_X_PUB_EXTERNAL_SIG_KEEPKEY)
<<<<<<<
for (WalletBtcAccount account : getAllAccounts()) {
if (account instanceof Bip44Account) {
//_transactionFetcher.getTransactions(((Bip44Account) account).getAccountIndex());
=======
for (WalletAccount account : getAllAccounts()) {
if (account instanceof HDAccount) {
//_transactionFetcher.getTransactions(((HDAccount) account).getAccountIndex());
>>>>>>>
for (WalletBtcAccount account : getAllAccounts()) {
if (account instanceof HDAccount) {
//_transactionFetcher.getTransactions(((HDAccount) account).getAccountIndex());
<<<<<<<
final HDAccountKeyManager keyManager = HDAccountKeyManager.createNew(root, _network, gapIndex, tempSecureKeyValueStore, cipher, BipDerivationType.BIP44); //TODO segwit fix
addresses.add(keyManager.getAddress(false, 0)); // get first external address for the account in the gap
=======
for (BipDerivationType derivationType : BipDerivationType.values()) {
final HDAccountKeyManager keyManager = HDAccountKeyManager.createNew(root, _network, gapIndex,
tempSecureKeyValueStore, cipher, derivationType);
addresses.add(keyManager.getAddress(false, 0)); // get first external address for the account in the gap
}
>>>>>>>
for (BipDerivationType derivationType : BipDerivationType.values()) {
final HDAccountKeyManager keyManager = HDAccountKeyManager.createNew(root, _network, gapIndex,
tempSecureKeyValueStore, cipher, derivationType);
addresses.add(keyManager.getAddress(false, 0)); // get first external address for the account in the gap
}
<<<<<<<
Bip44Account account = new Bip44Account(context, keyManagerMap, _network, accountBacking, _wapi);
=======
HDAccount account = new HDAccount(context, keyManagerMap, _network, accountBacking, _wapi);
>>>>>>>
HDAccount account = new HDAccount(context, keyManagerMap, _network, accountBacking, _wapi); |
<<<<<<<
}).when(rawPattern).getCurrentIsSelected(any(IntByReference.class));
=======
}).when(rawPattern).getCurrentIsSelected(any());
>>>>>>>
}).when(rawPattern).getCurrentIsSelected(any(IntByReference.class));
<<<<<<<
}).when(rawPattern).getCurrentIsSelected(any(IntByReference.class));
=======
}).when(rawPattern).getCurrentIsSelected(any());
>>>>>>>
}).when(rawPattern).getCurrentIsSelected(any(IntByReference.class));
}).when(rawPattern).getCurrentIsSelected(any());
<<<<<<<
when(rawPattern.getCurrentIsSelected(any(IntByReference.class))).thenReturn(1);
=======
when(rawPattern.getCurrentIsSelected(any())).thenReturn(1);
>>>>>>>
when(rawPattern.getCurrentIsSelected(any(IntByReference.class))).thenReturn(1);
when(rawPattern.getCurrentIsSelected(any())).thenReturn(1);
<<<<<<<
.makeUnknown(any(Pointer.class));
=======
.makeUnknown(any());
>>>>>>>
.makeUnknown(any(Pointer.class)); |
<<<<<<<
* @param pageIndex index of the page (zero-based)
*
* @return the created /Page object
*/
public PDFPage makePage(PDFResources resources,
int pageWidth, int pageHeight, int pageIndex) {
return makePage(resources, pageWidth, pageHeight, pageIndex, -1);
}
/**
* Make a /Page object. The page is assigned an object number immediately
* so references can already be made. The page must be added to the
* PDFDocument later using addObject().
*
* @param resources resources object to use
* @param pageWidth width of the page in points
* @param pageHeight height of the page in points
=======
* @param pageIndex index of the page (zero-based)
*
* @return the created /Page object
*/
public PDFPage makePage(PDFResources resources,
int pageWidth, int pageHeight, int pageIndex) {
Rectangle2D mediaBox = new Rectangle2D.Double(0, 0, pageWidth, pageHeight);
return makePage(resources, pageIndex, mediaBox, mediaBox, mediaBox, mediaBox);
}
/**
* Make a /Page object. The page is assigned an object number immediately
* so references can already be made. The page must be added to the
* PDFDocument later using addObject().
*
* @param resources resources object to use
* @param pageWidth width of the page in points
* @param pageHeight height of the page in points
>>>>>>>
* @param pageIndex index of the page (zero-based)
*
* @return the created /Page object
*/
public PDFPage makePage(PDFResources resources,
int pageWidth, int pageHeight, int pageIndex) {
Rectangle2D mediaBox = new Rectangle2D.Double(0, 0, pageWidth, pageHeight);
return makePage(resources, pageIndex, mediaBox, mediaBox, mediaBox, mediaBox, -1);
}
/**
* Make a /Page object. The page is assigned an object number immediately
* so references can already be made. The page must be added to the
* PDFDocument later using addObject().
*
* @param resources resources object to use
* @param pageWidth width of the page in points
* @param pageHeight height of the page in points |
<<<<<<<
font = FontLoader.loadFont(file.toURI(), "", true, EncodingMode.AUTO, false, false,
resolver);
=======
font = FontLoader.loadFont(file, "", true, EmbeddingMode.AUTO, EncodingMode.AUTO,
fontResolver);
>>>>>>>
font = FontLoader.loadFont(file.toURI(), "", true, EmbeddingMode.AUTO, EncodingMode.AUTO,
false, false, resolver); |
<<<<<<<
private byte[] output;
private int currentPos;
private int realSize;
=======
protected byte[] output;
protected int currentPos = 0;
private int realSize = 0;
>>>>>>>
protected byte[] output;
protected int currentPos;
private int realSize;
<<<<<<<
private CFFDataReader cffReader;
=======
protected CFFDataReader cffReader = null;
>>>>>>>
protected CFFDataReader cffReader; |
<<<<<<<
import java.awt.Rectangle;
=======
import java.awt.Dimension;
>>>>>>>
import java.awt.Dimension;
import java.awt.Rectangle;
<<<<<<<
import org.apache.fop.render.ImageHandler;
import org.apache.fop.render.RenderingContext;
import org.apache.fop.util.BitmapImageUtil;
=======
import org.apache.fop.util.bitmap.BitmapImageUtil;
>>>>>>>
import org.apache.fop.render.ImageHandler;
import org.apache.fop.render.RenderingContext;
import org.apache.fop.util.bitmap.BitmapImageUtil;
<<<<<<<
imageObjectInfo.setMimeType(MimeConstants.MIME_AFP_IOCA_FS45);
imageObjectInfo.setDataHeightRes(resolution);
imageObjectInfo.setDataWidthRes(resolution);
=======
int maxPixelSize = paintingState.getBitsPerPixel();
if (paintingState.isColorImages()) {
maxPixelSize *= 3; //RGB only at the moment
}
ImageRendered imageRendered = (ImageRendered) rendererImageInfo.img;
>>>>>>>
int maxPixelSize = paintingState.getBitsPerPixel();
if (paintingState.isColorImages()) {
maxPixelSize *= 3; //RGB only at the moment
}
<<<<<<<
//TODO To reduce AFP file size, investigate using a compression scheme.
//Currently, all image data is uncompressed.
int maxPixelSize = paintingState.getBitsPerPixel();
if (paintingState.isColorImages()) {
maxPixelSize *= 3; //RGB only at the moment
}
=======
>>>>>>>
//TODO To reduce AFP file size, investigate using a compression scheme.
//Currently, all image data is uncompressed. |
<<<<<<<
import org.apache.fop.fonts.truetype.TTFFile.PostScriptVersion;
=======
import org.apache.xmlgraphics.fonts.Glyphs;
>>>>>>>
import org.apache.xmlgraphics.fonts.Glyphs;
import org.apache.fop.fonts.truetype.TTFFile.PostScriptVersion; |
<<<<<<<
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
=======
>>>>>>>
<<<<<<<
public void drawBorderRect(Rectangle rect, BorderProps before, BorderProps after,
BorderProps start, BorderProps end, Color innerBackgroundColor) throws IFException {
if (before == null && after == null && start == null && end == null) {
=======
public void drawBorderRect(Rectangle rect, BorderProps top, BorderProps bottom,
BorderProps left, BorderProps right) throws IFException {
if (top == null && bottom == null && left == null && right == null) {
>>>>>>>
public void drawBorderRect(Rectangle rect, BorderProps top, BorderProps bottom,
BorderProps left, BorderProps right, Color innerBackgroundColor) throws IFException {
if (top == null && bottom == null && left == null && right == null) {
<<<<<<<
/** {@inheritDoc} */
public boolean isBackgroundRequired(BorderProps bpsBefore, BorderProps bpsAfter,
BorderProps bpsStart, BorderProps bpsEnd) {
return true;
}
=======
>>>>>>>
/** {@inheritDoc} */
public boolean isBackgroundRequired(BorderProps bpsTop, BorderProps bpsBottom,
BorderProps bpsLeft, BorderProps bpsRight) {
return true;
} |
<<<<<<<
import java.io.ByteArrayInputStream;
=======
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
import java.awt.geom.Rectangle2D.Double;
>>>>>>>
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
import java.awt.geom.Rectangle2D.Double;
import java.io.ByteArrayInputStream;
<<<<<<<
import org.apache.fop.pdf.PDFStructElem;
import org.apache.fop.pdf.PDFStructTreeRoot;
=======
import org.apache.fop.render.extensions.prepress.PageBoundaries;
import org.apache.fop.render.extensions.prepress.PageScale;
>>>>>>>
import org.apache.fop.pdf.PDFStructElem;
import org.apache.fop.pdf.PDFStructTreeRoot;
import org.apache.fop.render.extensions.prepress.PageBoundaries;
import org.apache.fop.render.extensions.prepress.PageScale;
<<<<<<<
this.pdfResources,
(int)Math.round(size.getWidth() / 1000),
(int)Math.round(size.getHeight() / 1000), index,
parentTreeKey); // used for accessibility
=======
this.pdfResources,
index,
toPointAndScale(mediaBox, scaleX, scaleY),
toPointAndScale(cropBox, scaleX, scaleY),
toPointAndScale(bleedBox, scaleX, scaleY),
toPointAndScale(trimBox, scaleX, scaleY));
>>>>>>>
this.pdfResources,
index,
toPointAndScale(mediaBox, scaleX, scaleY),
toPointAndScale(cropBox, scaleX, scaleY),
toPointAndScale(bleedBox, scaleX, scaleY),
toPointAndScale(trimBox, scaleX, scaleY),
parentTreeKey); |
<<<<<<<
import org.apache.fop.fonts.truetype.TTFFile.PostScriptVersion;
import org.apache.fop.util.HexEncoder;
=======
>>>>>>>
import org.apache.fop.fonts.truetype.TTFFile.PostScriptVersion;
import org.apache.fop.util.HexEncoder;
<<<<<<<
this(fontFileURI, null, true, EmbeddingMode.AUTO, EncodingMode.AUTO, true, resolver);
=======
this(fontFileURI, null, true, EncodingMode.AUTO, true, true, resolver);
>>>>>>>
this(fontFileURI, null, true, EmbeddingMode.AUTO, EncodingMode.AUTO, true, true, resolver);
<<<<<<<
boolean embedded, EmbeddingMode embeddingMode, EncodingMode encodingMode,
boolean useKerning, FontResolver resolver) {
super(fontFileURI, embedded, true, resolver);
=======
boolean embedded, EncodingMode encodingMode, boolean useKerning,
boolean useAdvanced, FontResolver resolver) {
super(fontFileURI, embedded, useKerning, useAdvanced, resolver);
>>>>>>>
boolean embedded, EmbeddingMode embeddingMode, EncodingMode encodingMode,
boolean useKerning, boolean useAdvanced, FontResolver resolver) {
super(fontFileURI, embedded, useKerning, useAdvanced, resolver); |
<<<<<<<
public String getBase64(String imagePath) {
try {
boolean isPNG = imagePath.contains(".png") ? true : false;
InputStream in = new URL(imagePath).openConnection().getInputStream();
Bitmap bm = BitmapFactory.decodeStream(in);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
Bitmap.CompressFormat compressFormat = isPNG ? Bitmap.CompressFormat.PNG : Bitmap.CompressFormat.JPEG;
bm.compress(compressFormat, 100, baos);
String base64prefix = String.format("data:image/%s;charset=utf-8;base64, ", isPNG ? "png" : "jpeg");
return base64prefix + Base64.encodeToString(baos.toByteArray(), Base64.DEFAULT);
} catch (Exception e) {
e.printStackTrace();
return null;
}
}
private void _shareToInstagram(@Nullable File backgroundFile, @Nullable File stickerFile, @Nullable String attributionLink, @Nullable String backgroundBottomColor, @Nullable String backgroundTopColor, Promise promise){
=======
private void _shareToInstagram(
@Nullable File backgroundFile,
@Nullable File stickerFile,
@Nullable String attributionLink,
@Nullable String backgroundBottomColor,
@Nullable String backgroundTopColor,
String media,
Promise promise
){
>>>>>>>
public String getBase64(String imagePath) {
try {
boolean isPNG = imagePath.contains(".png") ? true : false;
InputStream in = new URL(imagePath).openConnection().getInputStream();
Bitmap bm = BitmapFactory.decodeStream(in);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
Bitmap.CompressFormat compressFormat = isPNG ? Bitmap.CompressFormat.PNG : Bitmap.CompressFormat.JPEG;
bm.compress(compressFormat, 100, baos);
String base64prefix = String.format("data:image/%s;charset=utf-8;base64, ", isPNG ? "png" : "jpeg");
return base64prefix + Base64.encodeToString(baos.toByteArray(), Base64.DEFAULT);
} catch (Exception e) {
e.printStackTrace();
return null;
}
}
private void _shareToInstagram(
@Nullable File backgroundFile,
@Nullable File stickerFile,
@Nullable String attributionLink,
@Nullable String backgroundBottomColor,
@Nullable String backgroundTopColor,
String media,
Promise promise
){ |
<<<<<<<
private static boolean isType1(URI fontURI) {
return fontURI.toASCIIString().toLowerCase().endsWith(".pfb");
=======
/**
* Loads a custom font from a File. In the case of Type 1 fonts, the PFB file must be specified.
* @param fontFile the File representation of the font
* @param subFontName the sub-fontname of a font (for TrueType Collections, null otherwise)
* @param embedded indicates whether the font is embedded or referenced
* @param embeddingMode the embedding mode
* @param encodingMode the requested encoding mode
* @param resolver the font resolver to use when resolving URIs
* @return the newly loaded font
* @throws IOException In case of an I/O error
*/
public static CustomFont loadFont(File fontFile, String subFontName,
boolean embedded, EmbeddingMode embeddingMode, EncodingMode encodingMode,
FontResolver resolver) throws IOException {
return loadFont(fontFile.toURI().toURL(), subFontName,
embedded, embeddingMode, encodingMode, resolver);
}
/**
* Loads a custom font from an URL. In the case of Type 1 fonts, the PFB file must be specified.
* @param fontUrl the URL representation of the font
* @param subFontName the sub-fontname of a font (for TrueType Collections, null otherwise)
* @param embedded indicates whether the font is embedded or referenced
* @param embeddingMode the embedding mode of the font
* @param encodingMode the requested encoding mode
* @param resolver the font resolver to use when resolving URIs
* @return the newly loaded font
* @throws IOException In case of an I/O error
*/
public static CustomFont loadFont(URL fontUrl, String subFontName,
boolean embedded, EmbeddingMode embeddingMode, EncodingMode encodingMode,
FontResolver resolver) throws IOException {
return loadFont(fontUrl.toExternalForm(), subFontName,
embedded, embeddingMode, encodingMode, true, true,
resolver);
>>>>>>>
private static boolean isType1(URI fontURI) {
return fontURI.toASCIIString().toLowerCase().endsWith(".pfb");
<<<<<<<
public static CustomFont loadFont(URI fontFileURI, String subFontName,
boolean embedded, EncodingMode encodingMode, boolean useKerning,
boolean useAdvanced, InternalResourceResolver resourceResolver) throws IOException {
=======
public static CustomFont loadFont(String fontFileURI, String subFontName,
boolean embedded, EmbeddingMode embeddingMode, EncodingMode encodingMode,
boolean useKerning, boolean useAdvanced, FontResolver resolver) throws IOException {
fontFileURI = fontFileURI.trim();
>>>>>>>
public static CustomFont loadFont(URI fontFileURI, String subFontName,
boolean embedded, EmbeddingMode embeddingMode, EncodingMode encodingMode,
boolean useKerning, boolean useAdvanced, InternalResourceResolver resourceResolver) throws IOException {
<<<<<<<
loader = new Type1FontLoader(fontFileURI, embedded, useKerning, resourceResolver);
=======
if (embeddingMode == EmbeddingMode.SUBSET) {
throw new IllegalArgumentException(
"Subset embedding for Type 1 fonts is not supported");
}
loader = new Type1FontLoader(fontFileURI, embedded, useKerning, resolver);
>>>>>>>
if (embeddingMode == EmbeddingMode.SUBSET) {
throw new IllegalArgumentException(
"Subset embedding for Type 1 fonts is not supported");
}
loader = new Type1FontLoader(fontFileURI, embedded, useKerning, resourceResolver);
<<<<<<<
embedded, encodingMode, useKerning, useAdvanced, resourceResolver);
=======
embedded, embeddingMode, encodingMode, useKerning, useAdvanced, resolver);
>>>>>>>
embedded, embeddingMode, encodingMode, useKerning, useAdvanced, resourceResolver); |
<<<<<<<
private final int[] bestFootnotesLength = new int[4];
private final int[] bestFootnoteListIndex = new int[4];
private final int[] bestFootnoteElementIndex = new int[4];
private final Variant[] bestVariant = new Variant[4];
=======
private int[] bestInsertedFootnotesLength = new int[4];
private int[] bestTotalFootnotesLength = new int[4];
private int[] bestFootnoteListIndex = new int[4];
private int[] bestFootnoteElementIndex = new int[4];
>>>>>>>
private final int[] bestInsertedFootnotesLength = new int[4];
private final int[] bestTotalFootnotesLength = new int[4];
private final int[] bestFootnoteListIndex = new int[4];
private final int[] bestFootnoteElementIndex = new int[4];
private final Variant[] bestVariant = new Variant[4]; |
<<<<<<<
boolean bDiscard, int iSide, int mode,
Object oTrait, PercentBaseContext context) {
int iBP = bpProps.getBorderWidth(iSide, bDiscard);
int radiusStart = bpProps.getBorderRadiusStart(iSide, bDiscard, context);
int radiusEnd = bpProps.getBorderRadiusEnd(iSide, bDiscard, context);
if (iBP > 0 || radiusStart > 0 || radiusEnd > 0) {
BorderProps bps = new BorderProps(bpProps.getBorderStyle(iSide),
iBP, bpProps.getBorderColor(iSide),
mode);
bps.setRadiusStart(radiusStart);
bps.setRadiusEnd(radiusEnd);
area.addTrait(oTrait, bps);
=======
boolean discard, int side, int mode,
Integer trait) {
int borderWidth = bpProps.getBorderWidth(side, discard);
if (borderWidth > 0) {
area.addTrait(trait,
new BorderProps(bpProps.getBorderStyle(side),
borderWidth, bpProps.getBorderColor(side),
mode));
>>>>>>>
boolean bDiscard, int iSide, int mode,
Integer oTrait, PercentBaseContext context) {
int iBP = bpProps.getBorderWidth(iSide, bDiscard);
int radiusStart = bpProps.getBorderRadiusStart(iSide, bDiscard, context);
int radiusEnd = bpProps.getBorderRadiusEnd(iSide, bDiscard, context);
if (iBP > 0 || radiusStart > 0 || radiusEnd > 0) {
BorderProps bps = new BorderProps(bpProps.getBorderStyle(iSide),
iBP, bpProps.getBorderColor(iSide),
mode);
bps.setRadiusStart(radiusStart);
bps.setRadiusEnd(radiusEnd);
area.addTrait(oTrait, bps);
<<<<<<<
BorderProps bps = getBorderProps(bordProps, CommonBorderPaddingBackground.BEFORE, context);
=======
BorderProps bps = getBorderProps(borderProps, CommonBorderPaddingBackground.BEFORE);
>>>>>>>
BorderProps bps = getBorderProps(borderProps, CommonBorderPaddingBackground.BEFORE, context);
<<<<<<<
bps = getBorderProps(bordProps, CommonBorderPaddingBackground.AFTER, context);
=======
bps = getBorderProps(borderProps, CommonBorderPaddingBackground.AFTER);
>>>>>>>
bps = getBorderProps(borderProps, CommonBorderPaddingBackground.AFTER, context);
<<<<<<<
bps = getBorderProps(bordProps, CommonBorderPaddingBackground.START, context);
=======
bps = getBorderProps(borderProps, CommonBorderPaddingBackground.START);
>>>>>>>
bps = getBorderProps(borderProps, CommonBorderPaddingBackground.START, context);
<<<<<<<
bps = getBorderProps(bordProps, CommonBorderPaddingBackground.END, context);
=======
bps = getBorderProps(borderProps, CommonBorderPaddingBackground.END);
>>>>>>>
bps = getBorderProps(borderProps, CommonBorderPaddingBackground.END, context);
<<<<<<<
//TODO Enabling this causes graphic problems. Revisit!
/*
bps.setRadiusStart(borderInfo.getRadiusStart().getLengthValue());
bps.setRadiusEnd(borderInfo.getRadiusEnd().getLengthValue());
*/
return bps;
=======
>>>>>>> |
<<<<<<<
import org.apache.fop.fonts.BFEntry;
import org.apache.fop.fonts.FontUtil;
=======
>>>>>>>
<<<<<<<
private static final String[] MAC_GLYPH_ORDERING = {
/* 0x000 */
".notdef", ".null", "nonmarkingreturn", "space",
"exclam", "quotedbl", "numbersign", "dollar",
"percent", "ampersand", "quotesingle", "parenleft",
"parenright", "asterisk", "plus", "comma",
/* 0x010 */
"hyphen", "period", "slash", "zero",
"one", "two", "three", "four",
"five", "six", "seven", "eight",
"nine", "colon", "semicolon", "less",
/* 0x020 */
"equal", "greater", "question", "at",
"A", "B", "C", "D",
"E", "F", "G", "H",
"I", "J", "K", "L",
/* 0x030 */
"M", "N", "O", "P",
"Q", "R", "S", "T",
"U", "V", "W", "X",
"Y", "Z", "bracketleft", "backslash",
/* 0x040 */
"bracketright", "asciicircum", "underscore", "grave",
"a", "b", "c", "d",
"e", "f", "g", "h",
"i", "j", "k", "l",
/* 0x050 */
"m", "n", "o", "p",
"q", "r", "s", "t",
"u", "v", "w", "x",
"y", "z", "braceleft", "bar",
/* 0x060 */
"braceright", "asciitilde", "Adieresis", "Aring",
"Ccedilla", "Eacute", "Ntilde", "Odieresis",
"Udieresis", "aacute", "agrave", "acircumflex",
"adieresis", "atilde", "aring", "ccedilla",
/* 0x070 */
"eacute", "egrave", "ecircumflex", "edieresis",
"iacute", "igrave", "icircumflex", "idieresis",
"ntilde", "oacute", "ograve", "ocircumflex",
"odieresis", "otilde", "uacute", "ugrave",
/* 0x080 */
"ucircumflex", "udieresis", "dagger", "degree",
"cent", "sterling", "section", "bullet",
"paragraph", "germandbls", "registered", "copyright",
"trademark", "acute", "dieresis", "notequal",
/* 0x090 */
"AE", "Oslash", "infinity", "plusminus",
"lessequal", "greaterequal", "yen", "mu",
"partialdiff", "summation", "product", "pi",
"integral", "ordfeminine", "ordmasculine", "Omega",
/* 0x0A0 */
"ae", "oslash", "questiondown", "exclamdown",
"logicalnot", "radical", "florin", "approxequal",
"Delta", "guillemotleft", "guillemotright", "ellipsis",
"nonbreakingspace", "Agrave", "Atilde", "Otilde",
/* 0x0B0 */
"OE", "oe", "endash", "emdash",
"quotedblleft", "quotedblright", "quoteleft", "quoteright",
"divide", "lozenge", "ydieresis", "Ydieresis",
"fraction", "currency", "guilsinglleft", "guilsinglright",
/* 0x0C0 */
"fi", "fl", "daggerdbl", "periodcentered",
"quotesinglbase", "quotedblbase", "perthousand", "Acircumflex",
"Ecircumflex", "Aacute", "Edieresis", "Egrave",
"Iacute", "Icircumflex", "Idieresis", "Igrave",
/* 0x0D0 */
"Oacute", "Ocircumflex", "apple", "Ograve",
"Uacute", "Ucircumflex", "Ugrave", "dotlessi",
"circumflex", "tilde", "macron", "breve",
"dotaccent", "ring", "cedilla", "hungarumlaut",
/* 0x0E0 */
"ogonek", "caron", "Lslash", "lslash",
"Scaron", "scaron", "Zcaron", "zcaron",
"brokenbar", "Eth", "eth", "Yacute",
"yacute", "Thorn", "thorn", "minus",
/* 0x0F0 */
"multiply", "onesuperior", "twosuperior", "threesuperior",
"onehalf", "onequarter", "threequarters", "franc",
"Gbreve", "gbreve", "Idotaccent", "Scedilla",
"scedilla", "Cacute", "cacute", "Ccaron",
/* 0x100 */
"ccaron", "dcroat"
};
/** The FontFileReader used to read this truetype font */
protected FontFileReader fontFile;
/** Set to true to get even more debug output than with level DEBUG */
public static final boolean TRACE_ENABLED = false;
=======
>>>>>>>
private static final String[] MAC_GLYPH_ORDERING = {
/* 0x000 */
".notdef", ".null", "nonmarkingreturn", "space",
"exclam", "quotedbl", "numbersign", "dollar",
"percent", "ampersand", "quotesingle", "parenleft",
"parenright", "asterisk", "plus", "comma",
/* 0x010 */
"hyphen", "period", "slash", "zero",
"one", "two", "three", "four",
"five", "six", "seven", "eight",
"nine", "colon", "semicolon", "less",
/* 0x020 */
"equal", "greater", "question", "at",
"A", "B", "C", "D",
"E", "F", "G", "H",
"I", "J", "K", "L",
/* 0x030 */
"M", "N", "O", "P",
"Q", "R", "S", "T",
"U", "V", "W", "X",
"Y", "Z", "bracketleft", "backslash",
/* 0x040 */
"bracketright", "asciicircum", "underscore", "grave",
"a", "b", "c", "d",
"e", "f", "g", "h",
"i", "j", "k", "l",
/* 0x050 */
"m", "n", "o", "p",
"q", "r", "s", "t",
"u", "v", "w", "x",
"y", "z", "braceleft", "bar",
/* 0x060 */
"braceright", "asciitilde", "Adieresis", "Aring",
"Ccedilla", "Eacute", "Ntilde", "Odieresis",
"Udieresis", "aacute", "agrave", "acircumflex",
"adieresis", "atilde", "aring", "ccedilla",
/* 0x070 */
"eacute", "egrave", "ecircumflex", "edieresis",
"iacute", "igrave", "icircumflex", "idieresis",
"ntilde", "oacute", "ograve", "ocircumflex",
"odieresis", "otilde", "uacute", "ugrave",
/* 0x080 */
"ucircumflex", "udieresis", "dagger", "degree",
"cent", "sterling", "section", "bullet",
"paragraph", "germandbls", "registered", "copyright",
"trademark", "acute", "dieresis", "notequal",
/* 0x090 */
"AE", "Oslash", "infinity", "plusminus",
"lessequal", "greaterequal", "yen", "mu",
"partialdiff", "summation", "product", "pi",
"integral", "ordfeminine", "ordmasculine", "Omega",
/* 0x0A0 */
"ae", "oslash", "questiondown", "exclamdown",
"logicalnot", "radical", "florin", "approxequal",
"Delta", "guillemotleft", "guillemotright", "ellipsis",
"nonbreakingspace", "Agrave", "Atilde", "Otilde",
/* 0x0B0 */
"OE", "oe", "endash", "emdash",
"quotedblleft", "quotedblright", "quoteleft", "quoteright",
"divide", "lozenge", "ydieresis", "Ydieresis",
"fraction", "currency", "guilsinglleft", "guilsinglright",
/* 0x0C0 */
"fi", "fl", "daggerdbl", "periodcentered",
"quotesinglbase", "quotedblbase", "perthousand", "Acircumflex",
"Ecircumflex", "Aacute", "Edieresis", "Egrave",
"Iacute", "Icircumflex", "Idieresis", "Igrave",
/* 0x0D0 */
"Oacute", "Ocircumflex", "apple", "Ograve",
"Uacute", "Ucircumflex", "Ugrave", "dotlessi",
"circumflex", "tilde", "macron", "breve",
"dotaccent", "ring", "cedilla", "hungarumlaut",
/* 0x0E0 */
"ogonek", "caron", "Lslash", "lslash",
"Scaron", "scaron", "Zcaron", "zcaron",
"brokenbar", "Eth", "eth", "Yacute",
"yacute", "Thorn", "thorn", "minus",
/* 0x0F0 */
"multiply", "onesuperior", "twosuperior", "threesuperior",
"onehalf", "onequarter", "threequarters", "franc",
"Gbreve", "gbreve", "Idotaccent", "Scedilla",
"scedilla", "Cacute", "cacute", "Ccaron",
/* 0x100 */
"ccaron", "dcroat"
};
/** The FontFileReader used to read this truetype font */
protected FontFileReader fontFile;
/** Set to true to get even more debug output than with level DEBUG */
public static final boolean TRACE_ENABLED = false;
<<<<<<<
private List<BFEntry> cmaps;
private List<UnicodeMapping> unicodeMapping;
=======
private List cmaps;
private Set unicodeMappings;
>>>>>>>
private List<BFEntry> cmaps;
private Set<UnicodeMapping> unicodeMappings;
<<<<<<<
boolean seekTab(FontFileReader in, TTFTableName tableName,
=======
public boolean seekTab(FontFileReader in, String name,
>>>>>>>
public boolean seekTab(FontFileReader in, TTFTableName tableName,
<<<<<<<
TTFDirTabEntry dt = dirTabs.get(tableName);
=======
TTFDirTabEntry dt = getDirectoryEntry ( name );
>>>>>>>
TTFDirTabEntry dt = dirTabs.get(tableName);
<<<<<<<
unicodeMapping = new ArrayList<UnicodeMapping>();
=======
unicodeMappings = new java.util.TreeSet();
>>>>>>>
unicodeMappings = new java.util.TreeSet();
<<<<<<<
readKerning();
=======
if ( useKerning ) {
readKerning(in);
}
// Read advanced typographic tables.
if ( useAdvanced ) {
try {
OTFAdvancedTypographicTableReader atr
= new OTFAdvancedTypographicTableReader ( this, in );
atr.readAll();
this.advancedTableReader = atr;
} catch ( AdvancedTypographicTableFormatException e ) {
log.warn (
"Encountered format constraint violation in advanced (typographic) table (AT) "
+ "in font '" + getFullName() + "', ignoring AT data: "
+ e.getMessage()
);
}
}
>>>>>>>
if ( useKerning ) {
readKerning();
}
// Read advanced typographic tables.
if ( useAdvanced ) {
try {
OTFAdvancedTypographicTableReader atr
= new OTFAdvancedTypographicTableReader ( this, in );
atr.readAll();
this.advancedTableReader = atr;
} catch ( AdvancedTypographicTableFormatException e ) {
log.warn (
"Encountered format constraint violation in advanced (typographic) table (AT) "
+ "in font '" + getFullName() + "', ignoring AT data: "
+ e.getMessage()
);
}
}
<<<<<<<
Iterator<UnicodeMapping> e = unicodeMapping.listIterator();
UnicodeMapping um = e.next();
=======
Iterator e = unicodeMappings.iterator();
UnicodeMapping um = (UnicodeMapping)e.next();
>>>>>>>
Iterator<UnicodeMapping> e = unicodeMappings.iterator();
UnicodeMapping um = e.next();
<<<<<<<
TTFDirTabEntry os2Entry = dirTabs.get(TTFTableName.OS2);
=======
TTFDirTabEntry os2Entry = getDirectoryEntry ( "OS/2" );
>>>>>>>
TTFDirTabEntry os2Entry = dirTabs.get(TTFTableName.OS2);
<<<<<<<
private void readGlyf() throws IOException {
TTFDirTabEntry dirTab = dirTabs.get(TTFTableName.GLYF);
=======
private void readGlyf(FontFileReader in) throws IOException {
TTFDirTabEntry dirTab = getDirectoryEntry ( "glyf" );
>>>>>>>
private void readGlyf() throws IOException {
TTFDirTabEntry dirTab = dirTabs.get(TTFTableName.GLYF);
<<<<<<<
long n = (dirTabs.get(TTFTableName.GLYF)).getOffset();
=======
long n = dirTab.getOffset();
>>>>>>>
long n = (dirTabs.get(TTFTableName.GLYF)).getOffset();
<<<<<<<
private boolean readPCLT() throws IOException {
TTFDirTabEntry dirTab = dirTabs.get(TTFTableName.PCLT);
=======
private boolean readPCLT(FontFileReader in) throws IOException {
TTFDirTabEntry dirTab = getDirectoryEntry ( "PCLT" );
>>>>>>>
private boolean readPCLT() throws IOException {
TTFDirTabEntry dirTab = dirTabs.get(TTFTableName.PCLT);
<<<<<<<
kerningTab = new HashMap<Integer, Map<Integer, Integer>>();
ansiKerningTab = new HashMap<Integer, Map<Integer, Integer>>();
TTFDirTabEntry dirTab = dirTabs.get(TTFTableName.KERN);
=======
kerningTab = new java.util.HashMap();
ansiKerningTab = new java.util.HashMap();
TTFDirTabEntry dirTab = getDirectoryEntry ( "kern" );
>>>>>>>
kerningTab = new HashMap<Integer, Map<Integer, Integer>>();
ansiKerningTab = new HashMap<Integer, Map<Integer, Integer>>();
TTFDirTabEntry dirTab = dirTabs.get(TTFTableName.KERN);
<<<<<<<
private Integer glyphToUnicode(int glyphIndex) throws IOException {
return glyphToUnicodeMap.get(new Integer(glyphIndex));
=======
private Integer glyphToUnicode(int glyphIndex) {
return (Integer) glyphToUnicodeMap.get(new Integer(glyphIndex));
>>>>>>>
private Integer glyphToUnicode(int glyphIndex) {
return glyphToUnicodeMap.get(new Integer(glyphIndex)); |
<<<<<<<
import java.awt.Rectangle;
=======
import java.awt.image.ColorModel;
>>>>>>>
import java.awt.Rectangle;
import java.awt.image.ColorModel;
<<<<<<<
import org.apache.xmlgraphics.image.loader.Image;
=======
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
>>>>>>>
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xmlgraphics.image.loader.Image;
<<<<<<<
import org.apache.fop.afp.AFPDataObjectInfo;
import org.apache.fop.afp.AFPImageObjectInfo;
import org.apache.fop.afp.AFPObjectAreaInfo;
import org.apache.fop.afp.AFPPaintingState;
import org.apache.fop.render.ImageHandler;
import org.apache.fop.render.RenderingContext;
=======
import org.apache.fop.afp.AFPDataObjectInfo;
import org.apache.fop.afp.AFPImageObjectInfo;
import org.apache.fop.afp.AFPObjectAreaInfo;
import org.apache.fop.afp.AFPPaintingState;
import org.apache.fop.util.BitmapImageUtil;
>>>>>>>
import org.apache.fop.afp.AFPDataObjectInfo;
import org.apache.fop.afp.AFPImageObjectInfo;
import org.apache.fop.afp.AFPObjectAreaInfo;
import org.apache.fop.afp.AFPPaintingState;
import org.apache.fop.render.ImageHandler;
import org.apache.fop.render.RenderingContext;
import org.apache.fop.util.BitmapImageUtil;
<<<<<<<
//TODO This needs to be improved: Buffering whole images in memory is bad.
//Images with fewer bits per pixel than the required output format are unnecessarily
//increased in size (extreme case: 1-bit images are blown up to 24 bits if color is
//enabled). For grayscale output, encoding is even a two-step process which
//needs to be streamlined to a single step. The resulting bitmap is then still buffered
//in memory. To reduce AFP file size, investigate using a compression scheme.
//Currently, all image data is uncompressed.
=======
int maxPixelSize = paintingState.getBitsPerPixel();
if (paintingState.isColorImages()) {
maxPixelSize *= 3; //RGB only at the moment
}
ColorModel cm = renderedImage.getColorModel();
if (log.isTraceEnabled()) {
log.trace("ColorModel: " + cm);
}
int pixelSize = cm.getPixelSize();
if (cm.hasAlpha()) {
pixelSize -= 8;
}
//TODO Add support for CMYK images
byte[] imageData = null;
>>>>>>>
//TODO To reduce AFP file size, investigate using a compression scheme.
//Currently, all image data is uncompressed.
int maxPixelSize = paintingState.getBitsPerPixel();
if (paintingState.isColorImages()) {
maxPixelSize *= 3; //RGB only at the moment
}
ColorModel cm = renderedImage.getColorModel();
if (log.isTraceEnabled()) {
log.trace("ColorModel: " + cm);
}
int pixelSize = cm.getPixelSize();
if (cm.hasAlpha()) {
pixelSize -= 8;
}
//TODO Add support for CMYK images
byte[] imageData = null; |
<<<<<<<
import org.apache.xmlgraphics.java2d.color.ColorUtil;
public class IFState {
=======
/** a state class for intermediate format data */
public final class IFState {
>>>>>>>
import org.apache.xmlgraphics.java2d.color.ColorUtil;
/** a state class for intermediate format data */
public final class IFState { |
<<<<<<<
/** Mapping of resourceInfo to AbstractCachedObject */
private final Map/*<AFPResourceInfo, AbstractCachedObject>*/ includeObjectCache
= new java.util.HashMap()/*<AFPResourceInfo,String>*/;
=======
/** a mapping of resourceInfo --> include name */
private final Map<AFPResourceInfo, String> includeNameMap
= new java.util.HashMap<AFPResourceInfo, String>();
/** a mapping of resourceInfo --> page segment name */
private Map<AFPResourceInfo, String> pageSegmentMap
= new java.util.HashMap<AFPResourceInfo, String>();
>>>>>>>
/** Mapping of resourceInfo to AbstractCachedObject */
private final Map<AFPResourceInfo, AbstractCachedObject> includeObjectCache
= new java.util.HashMap<AFPResourceInfo, AbstractCachedObject>();
<<<<<<<
AbstractCachedObject cachedObject = (AbstractCachedObject)
includeObjectCache.get(resourceInfo);
if (cachedObject == null ) {
=======
String objectName = includeNameMap.get(resourceInfo);
if (objectName == null) {
>>>>>>>
AbstractCachedObject cachedObject = (AbstractCachedObject)
includeObjectCache.get(resourceInfo);
if (cachedObject == null) { |
<<<<<<<
=======
/**
* A map from Unicode indices to glyph indices. No assumption
* about ordering is made below. If lookup is changed to a binary
* search (from the current linear search), then addPrivateUseMapping()
* needs to be changed to perform ordered inserts.
*/
private BFEntry[] bfentries = null;
/* advanced typographic support */
private GlyphDefinitionTable gdef;
private GlyphSubstitutionTable gsub;
private GlyphPositioningTable gpos;
/* dynamic private use (character) mappings */
private int numMapped;
private int numUnmapped;
private int nextPrivateUse = 0xE000;
private int firstPrivate;
private int lastPrivate;
private int firstUnmapped;
private int lastUnmapped;
>>>>>>>
/* advanced typographic support */
private GlyphDefinitionTable gdef;
private GlyphSubstitutionTable gsub;
private GlyphPositioningTable gpos;
/* dynamic private use (character) mappings */
private int numMapped;
private int numUnmapped;
private int nextPrivateUse = 0xE000;
private int firstPrivate;
private int lastPrivate;
private int firstUnmapped;
private int lastUnmapped;
<<<<<<<
private int findGlyphIndex(char c) {
int idx = c;
=======
// [TBD] - needs optimization, i.e., change from linear search to binary search
private int findGlyphIndex(int c) {
int idx = c;
>>>>>>>
// [TBD] - needs optimization, i.e., change from linear search to binary search
private int findGlyphIndex(int c) {
int idx = c;
<<<<<<<
for (int i = 0; (i < cmap.length) && retIdx == 0; i++) {
if (cmap[i].getUnicodeStart() <= idx
&& cmap[i].getUnicodeEnd() >= idx) {
=======
for (int i = 0; (i < bfentries.length) && retIdx == 0; i++) {
if (bfentries[i].getUnicodeStart() <= idx
&& bfentries[i].getUnicodeEnd() >= idx) {
>>>>>>>
for (int i = 0; (i < cmap.length) && retIdx == 0; i++) {
if (cmap[i].getUnicodeStart() <= idx
&& cmap[i].getUnicodeEnd() >= idx) { |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.