conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
SccpConnection newConnection(int localSsn, ProtocolClass protocolClass) throws MaxConnectionCountReached;
FastMap<LocalReference, SccpConnection> getConnections();
=======
/**
* @return SCCP stack
*/
SccpStack getSccpStack();
/**
* Update Signaling Point congestion status
* @return
*/
void updateSPCongestion(Integer ssn, Integer congestionLevel);
>>>>>>>
SccpConnection newConnection(int localSsn, ProtocolClass protocolClass) throws MaxConnectionCountReached;
FastMap<LocalReference, SccpConnection> getConnections();
/**
* @return SCCP stack
*/
SccpStack getSccpStack();
/**
* Update Signaling Point congestion status
* @return
*/
void updateSPCongestion(Integer ssn, Integer congestionLevel); |
<<<<<<<
public Long addCheckImeiRequest_Huawei(IMEI imei, RequestedEquipmentInfo requestedEquipmentInfo, MAPExtensionContainer extensionContainer, IMSI imsi)
throws MAPException;
public Long addCheckImeiRequest_Huawei(long customInvokeTimeout, IMEI imei, RequestedEquipmentInfo requestedEquipmentInfo, MAPExtensionContainer extensionContainer, IMSI imsi)
throws MAPException;
=======
>>>>>>>
public Long addCheckImeiRequest_Huawei(IMEI imei, RequestedEquipmentInfo requestedEquipmentInfo, MAPExtensionContainer extensionContainer, IMSI imsi)
throws MAPException;
public Long addCheckImeiRequest_Huawei(long customInvokeTimeout, IMEI imei, RequestedEquipmentInfo requestedEquipmentInfo,
MAPExtensionContainer extensionContainer, IMSI imsi) throws MAPException; |
<<<<<<<
=======
import java.io.IOException;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.concurrent.ConcurrentHashMap;
>>>>>>>
import java.io.IOException;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.concurrent.ConcurrentHashMap; |
<<<<<<<
ExchangeRate rate1 = getExchangeRateInternal(base, MoneyCurrency.of(BASE_CURRENCY_CODE),
timestamp);
ExchangeRate rate2 = getExchangeRateInternal(MoneyCurrency.of(BASE_CURRENCY_CODE), term,
timestamp);
if (rate1 != null || rate2 != null) { // TODO why OR, this could cause NPE?
=======
ExchangeRate rate1 = null;
if (timestamp != null) {
rate1 = getExchangeRate(base,
MoneyCurrency.of(BASE_CURRENCY_CODE), timestamp);
}
else {
rate1 = getExchangeRate(base,
MoneyCurrency.of(BASE_CURRENCY_CODE));
}
ExchangeRate rate2 = null;
if (timestamp != null) {
rate2 = getExchangeRate(MoneyCurrency.of(BASE_CURRENCY_CODE),
term,
timestamp);
}
else {
rate2 = getExchangeRate(MoneyCurrency.of(BASE_CURRENCY_CODE),
term);
}
if (rate1 != null || rate2 != null) {
>>>>>>>
ExchangeRate rate1 = getExchangeRateInternal(base,
MoneyCurrency.of(BASE_CURRENCY_CODE), timestamp);
ExchangeRate rate2 = getExchangeRateInternal(MoneyCurrency.of(BASE_CURRENCY_CODE),
term,
timestamp);
if (rate1 != null || rate2 != null) { |
<<<<<<<
if (provFactory != null) {
prov = provFactory.createExchangeRateProvider(type);
=======
if(provFactory!=null){
prov = provFactory.createExchangeRateProvider(type);
}
if(prov==null){
throw new IllegalArgumentException(
"No ExchangeRateProvider for the required type registered: "
+ type);
>>>>>>>
if(provFactory!=null){
prov = provFactory.createExchangeRateProvider(type);
<<<<<<<
if (provFactory != null) {
prov = provFactory.createCurrencyConverter(type);
=======
if(provFactory!=null){
prov = provFactory.createCurrencyConverter(type);
}
if(prov==null){
throw new IllegalArgumentException(
"No CurrencyConverters for the required type registered: "
+ type);
>>>>>>>
if(provFactory!=null){
prov = provFactory.createCurrencyConverter(type); |
<<<<<<<
* The scoreboard the player is currently subscribed to.
*/
private GlowScoreboard scoreboard;
/**
=======
* The player's current title, if any
*/
private Title currentTitle = new Title();
/**
* The player's current title options
*/
private TitleOptions titleOptions = new TitleOptions();
/**
>>>>>>>
* The scoreboard the player is currently subscribed to.
*/
private GlowScoreboard scoreboard;
/**
* The player's current title, if any
*/
private Title currentTitle = new Title();
/**
* The player's current title options
*/
private TitleOptions titleOptions = new TitleOptions();
/**
<<<<<<<
public void enchanted(int clicked) {
this.level -= clicked + 1;
if (level < 0) {
this.level = 0;
this.experience = 0;
this.totalExperience = 0;
}
setLevel(level);
setXpSeed(new Random().nextInt()); //TODO use entity's random instance?
}
=======
////////////////////////////////////////////////////////////////////////////
// Titles
@Override
public Title getTitle() {
return currentTitle.clone();
}
@Override
public TitleOptions getTitleOptions() {
return titleOptions.clone();
}
@Override
public void setTitle(Title title) {
setTitle(title, false);
}
@Override
public void setTitle(Title title, boolean forceUpdate) {
Validate.notNull(title, "Title cannot be null");
String oldHeading = currentTitle.getHeading();
currentTitle = title;
if (forceUpdate || !StringUtils.equals(oldHeading, currentTitle.getHeading())) {
session.sendAll(TitleMessage.fromTitle(currentTitle));
}
}
@Override
public void setTitleOptions(TitleOptions options) {
if (options == null) {
options = new TitleOptions();
}
titleOptions = options;
session.send(TitleMessage.fromOptions(titleOptions));
}
@Override
public void clearTitle() {
currentTitle = new Title();
session.send(new TitleMessage(TitleMessage.Action.CLEAR));
}
@Override
public void resetTitle() {
currentTitle = new Title(currentTitle.getHeading());
titleOptions = new TitleOptions();
session.send(new TitleMessage(TitleMessage.Action.RESET));
}
>>>>>>>
public void enchanted(int clicked) {
this.level -= clicked + 1;
if (level < 0) {
this.level = 0;
this.experience = 0;
this.totalExperience = 0;
}
setLevel(level);
setXpSeed(new Random().nextInt()); //TODO use entity's random instance?
}
////////////////////////////////////////////////////////////////////////////
// Titles
@Override
public Title getTitle() {
return currentTitle.clone();
}
@Override
public TitleOptions getTitleOptions() {
return titleOptions.clone();
}
@Override
public void setTitle(Title title) {
setTitle(title, false);
}
@Override
public void setTitle(Title title, boolean forceUpdate) {
Validate.notNull(title, "Title cannot be null");
String oldHeading = currentTitle.getHeading();
currentTitle = title;
if (forceUpdate || !StringUtils.equals(oldHeading, currentTitle.getHeading())) {
session.sendAll(TitleMessage.fromTitle(currentTitle));
}
}
@Override
public void setTitleOptions(TitleOptions options) {
if (options == null) {
options = new TitleOptions();
}
titleOptions = options;
session.send(TitleMessage.fromOptions(titleOptions));
}
@Override
public void clearTitle() {
currentTitle = new Title();
session.send(new TitleMessage(TitleMessage.Action.CLEAR));
}
@Override
public void resetTitle() {
currentTitle = new Title(currentTitle.getHeading());
titleOptions = new TitleOptions();
session.send(new TitleMessage(TitleMessage.Action.RESET));
} |
<<<<<<<
/**
* Teleport the player.
*
* @param location The destination to teleport to.
* @return Whether the teleport was a success.
*/
=======
>>>>>>>
/**
* Teleport the player.
*
* @param location The destination to teleport to.
* @return Whether the teleport was a success.
*/ |
<<<<<<<
import net.glowstone.generator.NetherGenerator;
import net.glowstone.generator.OverworldGenerator;
import net.glowstone.inventory.CraftingManager;
=======
import net.glowstone.generator.SurfaceGenerator;
import net.glowstone.generator.UndergroundGenerator;
>>>>>>>
import net.glowstone.generator.NetherGenerator;
import net.glowstone.generator.OverworldGenerator; |
<<<<<<<
setBoundingBox(0.25, 0.25);
pickupDelay = 40;
}
private boolean getPickedUp(GlowPlayer player) {
// todo: fire PlayerPickupItemEvent in a way that allows for 'remaining' calculations
HashMap<Integer, ItemStack> map = player.getInventory().addItem(getItemStack());
player.updateInventory(); // workaround for player editing slot & it immediately being filled again
if (!map.isEmpty()) {
setItemStack(map.values().iterator().next());
return false;
} else {
CollectItemMessage message = new CollectItemMessage(getEntityId(), player.getEntityId());
world.playSound(location, Sound.ITEM_PICKUP, 0.3f, (float) (1 + Math.random()));
for (GlowPlayer other : world.getRawPlayers()) {
if (other.canSeeEntity(this)) {
other.getSession().send(message);
}
}
remove();
return true;
}
}
public void setBias(GlowPlayer player) {
biasPlayer = player;
=======
setBoundingBox(0.25, 0.25);
pickupDelay = 20;
>>>>>>>
setBoundingBox(0.25, 0.25);
pickupDelay = 20;
}
private boolean getPickedUp(GlowPlayer player) {
// todo: fire PlayerPickupItemEvent in a way that allows for 'remaining' calculations
HashMap<Integer, ItemStack> map = player.getInventory().addItem(getItemStack());
player.updateInventory(); // workaround for player editing slot & it immediately being filled again
if (!map.isEmpty()) {
setItemStack(map.values().iterator().next());
return false;
} else {
CollectItemMessage message = new CollectItemMessage(getEntityId(), player.getEntityId());
world.playSound(location, Sound.ITEM_PICKUP, 0.3f, (float) (1 + Math.random()));
for (GlowPlayer other : world.getRawPlayers()) {
if (other.canSeeEntity(this)) {
other.getSession().send(message);
}
}
remove();
return true;
}
}
public void setBias(GlowPlayer player) {
biasPlayer = player; |
<<<<<<<
if (againstType.canAbsorb(against, face, holding)) {
target = against;
} else if (!target.isEmpty()) {
// air can always be overridden
BlockType targetType = ItemTable.instance().getBlock(target.getTypeId());
if (targetType != null && !targetType.canOverride(target, face, holding)) {
return;
=======
if (againstType != null) {
if (againstType.canAbsorb(against, face, holding)) {
target = against;
} else if (!target.isEmpty()) {
// air can always be overridden
BlockType targetType = ItemTable.instance().getBlock(target.getTypeId());
if (targetType != null && !targetType.canOverride(target, face, holding)) {
return;
}
>>>>>>>
if (againstType.canAbsorb(against, face, holding)) {
target = against;
} else if (!target.isEmpty()) {
// air can always be overridden
BlockType targetType = ItemTable.instance().getBlock(target.getTypeId());
if (targetType != null && !targetType.canOverride(target, face, holding)) {
return;
if (againstType != null) {
if (againstType.canAbsorb(against, face, holding)) {
target = against;
} else if (!target.isEmpty()) {
// air can always be overridden
BlockType targetType = ItemTable.instance().getBlock(target.getTypeId());
if (targetType != null && !targetType.canOverride(target, face, holding)) {
return;
} |
<<<<<<<
final ODataInvokeResult result = getClient().getInvokeRequestFactory().getInvokeRequest(
target, edmOperation, parameterValues).execute().getBody();
=======
final ODataInvokeResult result = client.getInvokeRequestFactory().getInvokeRequest(
edmOperation instanceof EdmFunction ? HttpMethod.GET : HttpMethod.POST,
target,
getResultReference(edmOperation.getReturnType()),
parameterValues).
execute().getBody();
>>>>>>>
final ODataInvokeResult result = getClient().getInvokeRequestFactory().getInvokeRequest(
edmOperation instanceof EdmFunction ? HttpMethod.GET : HttpMethod.POST,
target,
getResultReference(edmOperation.getReturnType()),
parameterValues).
execute().getBody();
<<<<<<<
return CoreUtils.getValueFromProperty(
getClient(), (CommonODataProperty) result, method.getGenericReturnType(), null);
=======
final CommonODataProperty property = (CommonODataProperty) result;
return property == null || property.hasNullValue()
? null
: CoreUtils.getObjectFromODataValue(client, property.getValue(), method.getGenericReturnType(), null);
>>>>>>>
final CommonODataProperty property = (CommonODataProperty) result;
return property == null || property.hasNullValue()
? null
: CoreUtils.getObjectFromODataValue(
getClient(), property.getValue(), method.getGenericReturnType(), null); |
<<<<<<<
void writeContextURL(final ContextURL contextURL, JsonGenerator json) throws IOException {
=======
private void writeContextURL(final ContextURL contextURL, final JsonGenerator json) throws IOException {
>>>>>>>
void writeContextURL(final ContextURL contextURL, final JsonGenerator json) throws IOException {
<<<<<<<
void writeMetadataETag(final ServiceMetadata metadata, JsonGenerator json) throws IOException {
=======
private void writeMetadataETag(final ServiceMetadata metadata, final JsonGenerator json) throws IOException {
>>>>>>>
void writeMetadataETag(final ServiceMetadata metadata, final JsonGenerator json) throws IOException {
<<<<<<<
void writeCount(final EntityCollection entityCollection, JsonGenerator json) throws IOException {
=======
private void writeCount(final EntityCollection entityCollection, final JsonGenerator json) throws IOException {
>>>>>>>
void writeCount(final EntityCollection entityCollection, final JsonGenerator json) throws IOException {
<<<<<<<
void writeNextLink(final EntityCollection entitySet, JsonGenerator json) throws IOException {
=======
private void writeNextLink(final EntityCollection entitySet, final JsonGenerator json) throws IOException {
>>>>>>>
void writeNextLink(final EntityCollection entitySet, final JsonGenerator json) throws IOException { |
<<<<<<<
boolean isForwardCursor = true;
=======
summary.setHasPriorResults(results.hasPriorResults());
summary.setHasMoreResults(results.hasMoreResults());
>>>>>>>
summary.setHasPriorResults(results.hasPriorResults());
summary.setHasMoreResults(results.hasMoreResults());
boolean isForwardCursor = true; |
<<<<<<<
final CommonURIBuilder<?> uriBuilder = getClient().getURIBuilder(getClient().getServiceRoot());
final StringBuilder entitySetSegment = new StringBuilder();
if (!containerHandler.isDefaultEntityContainer()) {
entitySetSegment.append(containerHandler.getEntityContainerName()).append('.');
}
entitySetSegment.append(entitySetName);
uriBuilder.appendEntitySetSegment(entitySetSegment.toString());
this.uri = uriBuilder.build();
=======
this.uri = uri;
>>>>>>>
this.uri = uri;
<<<<<<<
final EntityTypeInvocationHandler handler =
EntityTypeInvocationHandler.getInstance(entity, entitySetName, reference, containerHandler);
getContext().entityContext().attachNew(handler);
=======
final EntityInvocationHandler handler =
EntityInvocationHandler.getInstance(null, entity, uri, reference, containerHandler);
EntityContainerFactory.getContext().entityContext().attachNew(handler);
>>>>>>>
final EntityInvocationHandler handler =
EntityInvocationHandler.getInstance(null, entity, uri, reference, containerHandler);
getContext().entityContext().attachNew(handler);
<<<<<<<
EntityTypeInvocationHandler handler = getContext().entityContext().getEntity(uuid);
=======
EntityInvocationHandler handler = EntityContainerFactory.getContext().entityContext().getEntity(uuid);
>>>>>>>
EntityInvocationHandler handler = getContext().entityContext().getEntity(uuid);
<<<<<<<
final EntityTypeInvocationHandler handlerInTheContext = getContext().entityContext().getEntity(handler.getUUID());
=======
final EntityInvocationHandler handlerInTheContext =
EntityContainerFactory.getContext().entityContext().getEntity(handler.getUUID());
>>>>>>>
final EntityInvocationHandler handlerInTheContext = getContext().entityContext().getEntity(handler.getUUID());
<<<<<<<
private boolean isDeleted(final EntityTypeInvocationHandler handler) {
return getContext().entityContext().getStatus(handler) == AttachedEntityStatus.DELETED;
=======
private boolean isDeleted(final EntityInvocationHandler handler) {
return EntityContainerFactory.getContext().entityContext().getStatus(handler) == AttachedEntityStatus.DELETED;
>>>>>>>
private boolean isDeleted(final EntityInvocationHandler handler) {
return getContext().entityContext().getStatus(handler) == AttachedEntityStatus.DELETED; |
<<<<<<<
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.util.LinkedList;
=======
>>>>>>>
<<<<<<<
import org.apache.olingo.commons.api.ODataRuntimeException;
import org.apache.olingo.commons.api.data.ContextURL;
import org.apache.olingo.commons.api.data.ContextURL.Suffix;
import org.apache.olingo.commons.api.data.Entity;
import org.apache.olingo.commons.api.data.EntitySet;
import org.apache.olingo.commons.api.data.Property;
import org.apache.olingo.commons.api.edm.EdmComplexType;
=======
>>>>>>>
<<<<<<<
import org.apache.olingo.server.api.batch.BatchException;
import org.apache.olingo.server.api.batch.BatchOperation;
import org.apache.olingo.server.api.batch.BatchRequestPart;
import org.apache.olingo.server.api.batch.ODataResponsePart;
import org.apache.olingo.server.api.processor.BatchProcessor;
import org.apache.olingo.server.api.processor.EntityProcessor;
import org.apache.olingo.server.api.processor.EntitySetProcessor;
import org.apache.olingo.server.api.processor.PropertyProcessor;
import org.apache.olingo.server.api.serializer.ODataSerializer;
import org.apache.olingo.server.api.serializer.ODataSerializerOptions;
import org.apache.olingo.server.api.serializer.SerializerException;
import org.apache.olingo.server.api.uri.UriInfo;
=======
import org.apache.olingo.server.api.processor.Processor;
>>>>>>>
import org.apache.olingo.server.api.processor.Processor;
<<<<<<<
private EdmEntitySet getEdmEntitySet(final UriInfoResource uriInfo) throws ODataApplicationException {
final List<UriResource> resourcePaths = uriInfo.getUriResourceParts();
// first must be entity set
if (!(resourcePaths.get(0) instanceof UriResourceEntitySet)) {
throw new ODataApplicationException("Invalid resource type.",
HttpStatusCode.NOT_IMPLEMENTED.getStatusCode(), Locale.ROOT);
}
List<UriResource> subResPaths = resourcePaths.subList(1, resourcePaths.size());
for (UriResource subResPath : subResPaths) {
UriResourceKind kind = subResPath.getKind();
if (kind != UriResourceKind.primitiveProperty
&& kind != UriResourceKind.complexProperty
&& kind != UriResourceKind.count
&& kind != UriResourceKind.value) {
throw new ODataApplicationException("Invalid resource type.",
HttpStatusCode.NOT_IMPLEMENTED.getStatusCode(), Locale.ROOT);
}
}
final UriResourceEntitySet uriResource = (UriResourceEntitySet) resourcePaths.get(0);
if (uriResource.getTypeFilterOnCollection() != null || uriResource.getTypeFilterOnEntry() != null) {
throw new ODataApplicationException("Type filters are not supported.",
HttpStatusCode.NOT_IMPLEMENTED.getStatusCode(), Locale.ROOT);
}
return uriResource.getEntitySet();
}
private ContextURL getContextUrl(final ODataSerializer serializer,
final EdmEntitySet entitySet, final boolean isSingleEntity,
final ExpandOption expand, final SelectOption select,
final List<UriParameter> keys, final String propertyPath) throws SerializerException {
return ContextURL.with().entitySet(entitySet)
.selectList(serializer.buildContextURLSelectList(entitySet, expand, select))
.suffix(isSingleEntity && propertyPath == null ? Suffix.ENTITY : null)
.keyPath(serializer.buildContextURLKeyPredicate(keys))
.navOrPropertyPath(propertyPath)
.build();
}
@Override
public void readProperty(final ODataRequest request, ODataResponse response, final UriInfo uriInfo,
final ContentType contentType) throws ODataApplicationException, SerializerException {
validateOptions(uriInfo.asUriInfoResource());
final EdmEntitySet edmEntitySet = getEdmEntitySet(uriInfo.asUriInfoResource());
final List<UriResource> resourceParts = uriInfo.getUriResourceParts();
final UriResourceEntitySet resourceEntitySet = (UriResourceEntitySet) resourceParts.get(0);
final Entity entity = readEntityInternal(uriInfo.asUriInfoResource(), edmEntitySet);
if (entity == null) {
throw new ODataApplicationException("Nothing found.", HttpStatusCode.NOT_FOUND.getStatusCode(), Locale.ROOT);
} else {
final List<String> path = getPropertyPath(resourceParts);
EdmProperty edmProperty = edmEntitySet.getEntityType().getStructuralProperty(path.get(0));
Property property = entity.getProperty(path.get(0));
for (final String name : path.subList(1, path.size())) {
if (property != null && (property.isLinkedComplex() || property.isComplex())) {
edmProperty = ((EdmComplexType) edmProperty.getType()).getStructuralProperty(name);
final List<Property> complex = property.isLinkedComplex() ?
property.asLinkedComplex().getValue() :
property.asComplex();
property = null;
for (final Property innerProperty : complex) {
if (innerProperty.getName().equals(name)) {
property = innerProperty;
break;
}
}
}
}
if (property == null) {
throw new ODataApplicationException("Nothing found.", HttpStatusCode.NOT_FOUND.getStatusCode(), Locale.ROOT);
} else {
if (property.getValue() == null) {
response.setStatusCode(HttpStatusCode.NO_CONTENT.getStatusCode());
} else {
final ODataFormat format = ODataFormat.fromContentType(contentType);
ODataSerializer serializer = odata.createSerializer(format);
response.setContent(serializer.entityProperty(edmProperty, property,
ODataSerializerOptions.with().contextURL(format == ODataFormat.JSON_NO_METADATA ? null :
getContextUrl(serializer, edmEntitySet, true, null, null,
resourceEntitySet.getKeyPredicates(), buildPropertyPath(path)))
.build()));
response.setStatusCode(HttpStatusCode.OK.getStatusCode());
response.setHeader(HttpHeader.CONTENT_TYPE, contentType.toContentTypeString());
}
}
}
}
private List<String> getPropertyPath(final List<UriResource> path) {
List<String> result = new LinkedList<String>();
int index = path.size();
while (path.get(--index) instanceof UriResourceProperty) {
result.add(0, ((UriResourceProperty) path.get(index)).getProperty().getName());
}
return result;
}
private String buildPropertyPath(final List<String> path) {
StringBuilder result = new StringBuilder();
for (final String segment : path) {
result.append(result.length() == 0 ? "" : '/').append(segment);
}
return result.toString();
}
@Override
public void readPropertyValue(final ODataRequest request, ODataResponse response, final UriInfo uriInfo,
final ContentType contentType) throws ODataApplicationException, SerializerException {
validateOptions(uriInfo.asUriInfoResource());
final EdmEntitySet edmEntitySet = getEdmEntitySet(uriInfo.asUriInfoResource());
final Entity entity = readEntityInternal(uriInfo.asUriInfoResource(), edmEntitySet);
if (entity == null) {
throw new ODataApplicationException("Nothing found.", HttpStatusCode.NOT_FOUND.getStatusCode(), Locale.ROOT);
} else {
final UriResourceProperty uriProperty =
(UriResourceProperty) uriInfo.getUriResourceParts().get(uriInfo.getUriResourceParts().size() - 2);
final EdmProperty edmProperty = uriProperty.getProperty();
final Property property = entity.getProperty(edmProperty.getName());
if (property == null || property.getValue() == null) {
response.setStatusCode(HttpStatusCode.NO_CONTENT.getStatusCode());
} else {
final EdmPrimitiveType type = (EdmPrimitiveType) edmProperty.getType();
if (type == EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Binary)) {
response.setContent(new ByteArrayInputStream((byte[]) property.getValue()));
} else {
try {
final String value = type.valueToString(property.getValue(),
edmProperty.isNullable(), edmProperty.getMaxLength(),
edmProperty.getPrecision(), edmProperty.getScale(), edmProperty.isUnicode());
response.setContent(new ByteArrayInputStream(value.getBytes("UTF-8")));
} catch (final EdmPrimitiveTypeException e) {
throw new ODataApplicationException("Error in value formatting.",
HttpStatusCode.INTERNAL_SERVER_ERROR.getStatusCode(), Locale.ROOT, e);
} catch (final UnsupportedEncodingException e) {
throw new ODataApplicationException("Encoding exception.",
HttpStatusCode.INTERNAL_SERVER_ERROR.getStatusCode(), Locale.ROOT, e);
}
}
response.setHeader(HttpHeader.CONTENT_TYPE, contentType.toContentTypeString());
response.setStatusCode(HttpStatusCode.OK.getStatusCode());
}
}
}
=======
>>>>>>> |
<<<<<<<
import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.commons.api.serialization.ODataDeserializerException;
=======
import org.apache.olingo.commons.api.format.ODataFormat;
>>>>>>>
import org.apache.olingo.commons.api.format.ContentType; |
<<<<<<<
=======
import org.apache.olingo.commons.core.edm.EdmTypeInfo;
>>>>>>>
import org.apache.olingo.commons.core.edm.EdmTypeInfo; |
<<<<<<<
import org.apache.olingo.server.api.uri.queryoption.FilterOption;
import org.apache.olingo.server.api.uri.queryoption.OrderByOption;
import org.apache.olingo.server.api.uri.queryoption.expression.Binary;
=======
import org.apache.olingo.server.api.uri.UriResource;
>>>>>>>
import org.apache.olingo.server.api.uri.UriResource;
import org.apache.olingo.server.api.uri.queryoption.FilterOption;
import org.apache.olingo.server.api.uri.queryoption.OrderByOption;
import org.apache.olingo.server.api.uri.queryoption.expression.Binary;
<<<<<<<
import org.apache.olingo.server.api.uri.queryoption.expression.TypeLiteral;
=======
import org.apache.olingo.server.core.uri.UriInfoImpl;
import org.apache.olingo.server.core.uri.UriResourceFunctionImpl;
>>>>>>>
import org.apache.olingo.server.api.uri.queryoption.expression.TypeLiteral;
import org.apache.olingo.server.core.uri.UriResourceFunctionImpl; |
<<<<<<<
import org.apache.olingo.fit.AbstractBaseTestITCase;
=======
import org.apache.olingo.commons.api.http.HttpStatusCode;
>>>>>>>
import org.apache.olingo.fit.AbstractBaseTestITCase;
import org.apache.olingo.commons.api.http.HttpStatusCode;
<<<<<<<
@Override protected CommonODataClient getClient() {
return null;
}
=======
@Test
public void readEntitySet() {
final ODataEntitySetRequest<ODataEntitySet> request = odata.getRetrieveRequestFactory()
.getEntitySetRequest(URI.create(SERVICE_URI + "/ESMixPrimCollComp"));
assertNotNull(request);
final ODataRetrieveResponse<ODataEntitySet> response = request.execute();
assertEquals(HttpStatusCode.OK.getStatusCode(), response.getStatusCode());
assertThat(response.getContentType(), containsString(ContentType.APPLICATION_JSON.toContentTypeString()));
final ODataEntitySet entitySet = response.getBody();
assertNotNull(entitySet);
assertNull(entitySet.getCount());
assertNull(entitySet.getNext());
assertEquals(Collections.<ODataAnnotation> emptyList(), entitySet.getAnnotations());
assertNull(entitySet.getDeltaLink());
final List<ODataEntity> entities = entitySet.getEntities();
assertNotNull(entities);
assertEquals(3, entities.size());
final ODataEntity entity = entities.get(2);
assertNotNull(entity);
final ODataProperty property = entity.getProperty("PropertyInt16");
assertNotNull(property);
assertNotNull(property.getPrimitiveValue());
assertEquals(0, property.getPrimitiveValue().toValue());
}
>>>>>>>
@Test
public void readEntitySet() {
final ODataEntitySetRequest<ODataEntitySet> request = odata.getRetrieveRequestFactory()
.getEntitySetRequest(URI.create(SERVICE_URI + "/ESMixPrimCollComp"));
assertNotNull(request);
final ODataRetrieveResponse<ODataEntitySet> response = request.execute();
assertEquals(HttpStatusCode.OK.getStatusCode(), response.getStatusCode());
assertThat(response.getContentType(), containsString(ContentType.APPLICATION_JSON.toContentTypeString()));
final ODataEntitySet entitySet = response.getBody();
assertNotNull(entitySet);
assertNull(entitySet.getCount());
assertNull(entitySet.getNext());
assertEquals(Collections.<ODataAnnotation> emptyList(), entitySet.getAnnotations());
assertNull(entitySet.getDeltaLink());
final List<ODataEntity> entities = entitySet.getEntities();
assertNotNull(entities);
assertEquals(3, entities.size());
final ODataEntity entity = entities.get(2);
assertNotNull(entity);
final ODataProperty property = entity.getProperty("PropertyInt16");
assertNotNull(property);
assertNotNull(property.getPrimitiveValue());
assertEquals(0, property.getPrimitiveValue().toValue());
}
@Override protected CommonODataClient getClient() {
return null;
} |
<<<<<<<
response.setContent(serializeEntity(entity, edmEntitySet, edmEntityType, responseFormat, expand, null)
.getContent());
response.setStatusCode(HttpStatusCode.CREATED.getStatusCode());
response.setHeader(HttpHeader.CONTENT_TYPE, responseFormat.toContentTypeString());
=======
final Return returnPreference = odata.createPreferences(request.getHeaders(HttpHeader.PREFER)).getReturn();
if (returnPreference == null || returnPreference == Return.REPRESENTATION) {
final ODataFormat format = ODataFormat.fromContentType(responseFormat);
response.setContent(serializeEntity(entity, edmEntitySet, edmEntityType, format, expand, null)
.getContent());
response.setHeader(HttpHeader.CONTENT_TYPE, responseFormat.toContentTypeString());
response.setStatusCode(HttpStatusCode.CREATED.getStatusCode());
} else {
response.setStatusCode(HttpStatusCode.NO_CONTENT.getStatusCode());
}
if (returnPreference != null) {
response.setHeader(HttpHeader.PREFERENCE_APPLIED,
PreferencesApplied.with().returnRepresentation(returnPreference).build().toValueString());
}
>>>>>>>
final Return returnPreference = odata.createPreferences(request.getHeaders(HttpHeader.PREFER)).getReturn();
if (returnPreference == null || returnPreference == Return.REPRESENTATION) {
response.setContent(serializeEntity(entity, edmEntitySet, edmEntityType, responseFormat, expand, null)
.getContent());
response.setHeader(HttpHeader.CONTENT_TYPE, responseFormat.toContentTypeString());
response.setStatusCode(HttpStatusCode.CREATED.getStatusCode());
} else {
response.setStatusCode(HttpStatusCode.NO_CONTENT.getStatusCode());
}
if (returnPreference != null) {
response.setHeader(HttpHeader.PREFERENCE_APPLIED,
PreferencesApplied.with().returnRepresentation(returnPreference).build().toValueString());
}
<<<<<<<
response.setStatusCode(HttpStatusCode.OK.getStatusCode());
response.setContent(serializeEntity(entity, edmEntitySet, edmEntityType, responseFormat, null, null)
.getContent());
response.setHeader(HttpHeader.CONTENT_TYPE, responseFormat.toContentTypeString());
=======
final Return returnPreference = odata.createPreferences(request.getHeaders(HttpHeader.PREFER)).getReturn();
if (returnPreference == null || returnPreference == Return.REPRESENTATION) {
response.setStatusCode(HttpStatusCode.OK.getStatusCode());
final ODataFormat format = ODataFormat.fromContentType(responseFormat);
response.setContent(serializeEntity(entity, edmEntitySet, edmEntityType, format, null, null)
.getContent());
response.setHeader(HttpHeader.CONTENT_TYPE, responseFormat.toContentTypeString());
} else {
response.setStatusCode(HttpStatusCode.NO_CONTENT.getStatusCode());
}
if (returnPreference != null) {
response.setHeader(HttpHeader.PREFERENCE_APPLIED,
PreferencesApplied.with().returnRepresentation(returnPreference).build().toValueString());
}
>>>>>>>
final Return returnPreference = odata.createPreferences(request.getHeaders(HttpHeader.PREFER)).getReturn();
if (returnPreference == null || returnPreference == Return.REPRESENTATION) {
response.setStatusCode(HttpStatusCode.OK.getStatusCode());
response.setContent(serializeEntity(entity, edmEntitySet, edmEntityType, responseFormat, null, null)
.getContent());
response.setHeader(HttpHeader.CONTENT_TYPE, responseFormat.toContentTypeString());
} else {
response.setStatusCode(HttpStatusCode.NO_CONTENT.getStatusCode());
}
if (returnPreference != null) {
response.setHeader(HttpHeader.PREFERENCE_APPLIED,
PreferencesApplied.with().returnRepresentation(returnPreference).build().toValueString());
}
<<<<<<<
response.setContent(serializeEntity(entity, edmEntitySet, edmEntityType, responseFormat, null, null)
.getContent());
response.setStatusCode(HttpStatusCode.OK.getStatusCode());
response.setHeader(HttpHeader.CONTENT_TYPE, responseFormat.toContentTypeString());
=======
final Return returnPreference = odata.createPreferences(request.getHeaders(HttpHeader.PREFER)).getReturn();
if (returnPreference == null || returnPreference == Return.REPRESENTATION) {
final ODataFormat format = ODataFormat.fromContentType(responseFormat);
response.setContent(serializeEntity(entity, edmEntitySet, edmEntityType, format, null, null)
.getContent());
response.setStatusCode(HttpStatusCode.OK.getStatusCode());
response.setHeader(HttpHeader.CONTENT_TYPE, responseFormat.toContentTypeString());
} else {
response.setStatusCode(HttpStatusCode.NO_CONTENT.getStatusCode());
}
if (returnPreference != null) {
response.setHeader(HttpHeader.PREFERENCE_APPLIED,
PreferencesApplied.with().returnRepresentation(returnPreference).build().toValueString());
}
>>>>>>>
final Return returnPreference = odata.createPreferences(request.getHeaders(HttpHeader.PREFER)).getReturn();
if (returnPreference == null || returnPreference == Return.REPRESENTATION) {
response.setContent(serializeEntity(entity, edmEntitySet, edmEntityType, responseFormat, null, null)
.getContent());
response.setStatusCode(HttpStatusCode.OK.getStatusCode());
response.setHeader(HttpHeader.CONTENT_TYPE, responseFormat.toContentTypeString());
} else {
response.setStatusCode(HttpStatusCode.NO_CONTENT.getStatusCode());
}
if (returnPreference != null) {
response.setHeader(HttpHeader.PREFERENCE_APPLIED,
PreferencesApplied.with().returnRepresentation(returnPreference).build().toValueString());
} |
<<<<<<<
import java.net.URI;
import java.util.HashMap;
import java.util.Map;
=======
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
>>>>>>>
import java.net.URI;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
<<<<<<<
import org.apache.olingo.client.api.communication.request.ODataStreamedRequest;
=======
import org.apache.olingo.commons.api.ODataRuntimeException;
>>>>>>>
import org.apache.olingo.commons.api.ODataRuntimeException;
<<<<<<<
protected void doFlush(final PersistenceChanges changes, final TransactionItems items) {
final Map<Integer, URI> responses = new HashMap<Integer, URI>();
int virtualContentID = 0;
for (Map.Entry<ODataBatchableRequest, EntityInvocationHandler> entry : changes.getChanges().entrySet()) {
virtualContentID++;
=======
protected List<ODataRuntimeException> doFlush(final PersistenceChanges changes, final TransactionItems items) {
final List<ODataRuntimeException> result = new ArrayList<ODataRuntimeException>();
for (final Iterator<Map.Entry<ODataBatchableRequest, EntityInvocationHandler>> itor =
changes.getChanges().entrySet().iterator(); itor.hasNext();) {
final Map.Entry<ODataBatchableRequest, EntityInvocationHandler> entry = itor.next();
>>>>>>>
protected List<ODataRuntimeException> doFlush(final PersistenceChanges changes, final TransactionItems items) {
final List<ODataRuntimeException> result = new ArrayList<ODataRuntimeException>();
final Map<Integer, URI> responses = new HashMap<Integer, URI>();
int virtualContentID = 0;
for (Map.Entry<ODataBatchableRequest, EntityInvocationHandler> entry : changes.getChanges().entrySet()) {
virtualContentID++; |
<<<<<<<
ComplexTypeInvocationHandler.getInstance(
client, property.getName(), getter.getReturnType(), typeHandler));
=======
ComplexInvocationHandler.getInstance(
client, property.getName(), getter.getReturnType(), null));
>>>>>>>
ComplexInvocationHandler.getInstance(
client, property.getName(), getter.getReturnType(), typeHandler));
<<<<<<<
ComplexTypeInvocationHandler.getInstance(
client, property.getName(), collItemClass, typeHandler));
=======
ComplexInvocationHandler.getInstance(
client, property.getName(), collItemClass, null));
>>>>>>>
ComplexInvocationHandler.getInstance(
client, property.getName(), collItemClass, typeHandler)); |
<<<<<<<
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.http.HttpHeader;
=======
>>>>>>>
import org.apache.olingo.commons.api.http.HttpHeader; |
<<<<<<<
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.http.HttpHeader;
=======
import org.apache.olingo.commons.api.format.ContentType;
>>>>>>>
import org.apache.olingo.commons.api.http.HttpHeader;
import org.apache.olingo.commons.api.format.ContentType; |
<<<<<<<
serializeEntityCollection(entitySetSerialization, edmEntitySet, edmEntityType, requestedContentType,
expand, select, countOption, id);
=======
serializeEntityCollection(request, entitySetSerialization, edmEntitySet, edmEntityType, requestedContentType,
expand, select, countOption);
>>>>>>>
serializeEntityCollection(request, entitySetSerialization, edmEntitySet, edmEntityType, requestedContentType,
expand, select, countOption, id);
<<<<<<<
serviceMetadata,
edmEntityType,
entityCollection,
EntityCollectionSerializerOptions.with()
.contextURL(isODataMetadataNone(requestedFormat) ? null :
getContextUrl(edmEntitySet, edmEntityType, false, expand, select))
.count(countOption)
.expand(expand).select(select)
.setId(id)
.build());
=======
serviceMetadata,
edmEntityType,
entityCollection,
EntityCollectionSerializerOptions.with()
.contextURL(isODataMetadataNone(requestedFormat) ? null :
getContextUrl(request.getRawODataPath(), edmEntitySet, edmEntityType, false, expand,
select))
.count(countOption)
.expand(expand).select(select)
.build());
>>>>>>>
serviceMetadata,
edmEntityType,
entityCollection,
EntityCollectionSerializerOptions.with()
.contextURL(isODataMetadataNone(requestedFormat) ? null :
getContextUrl(request.getRawODataPath(), edmEntitySet, edmEntityType, false, expand, select))
.count(countOption)
.expand(expand).select(select)
.setId(id)
.build()); |
<<<<<<<
=======
import org.apache.olingo.client.api.serialization.ODataBinder;
import org.apache.olingo.client.api.serialization.ODataSerializerException;
import org.apache.olingo.client.core.uri.URIUtils;
import org.apache.olingo.commons.api.Constants;
import org.apache.olingo.commons.api.data.Annotatable;
import org.apache.olingo.commons.api.data.Annotation;
import org.apache.olingo.commons.api.data.ComplexValue;
import org.apache.olingo.commons.api.data.ContextURL;
import org.apache.olingo.commons.api.data.DeletedEntity;
import org.apache.olingo.commons.api.data.Delta;
import org.apache.olingo.commons.api.data.DeltaLink;
import org.apache.olingo.commons.api.data.Entity;
import org.apache.olingo.commons.api.data.EntityCollection;
import org.apache.olingo.commons.api.data.Link;
import org.apache.olingo.commons.api.data.Linked;
import org.apache.olingo.commons.api.data.Operation;
import org.apache.olingo.commons.api.data.Property;
import org.apache.olingo.commons.api.data.ResWrap;
import org.apache.olingo.commons.api.data.Valuable;
import org.apache.olingo.commons.api.data.ValueType;
>>>>>>>
import org.apache.olingo.client.api.serialization.ODataBinder;
import org.apache.olingo.client.api.serialization.ODataSerializerException;
import org.apache.olingo.client.core.uri.URIUtils;
import org.apache.olingo.commons.api.Constants;
import org.apache.olingo.commons.api.data.Annotatable;
import org.apache.olingo.commons.api.data.Annotation;
import org.apache.olingo.commons.api.data.ComplexValue;
import org.apache.olingo.commons.api.data.ContextURL;
import org.apache.olingo.commons.api.data.DeletedEntity;
import org.apache.olingo.commons.api.data.Delta;
import org.apache.olingo.commons.api.data.DeltaLink;
import org.apache.olingo.commons.api.data.Entity;
import org.apache.olingo.commons.api.data.EntityCollection;
import org.apache.olingo.commons.api.data.Link;
import org.apache.olingo.commons.api.data.Linked;
import org.apache.olingo.commons.api.data.Operation;
import org.apache.olingo.commons.api.data.Property;
import org.apache.olingo.commons.api.data.ResWrap;
import org.apache.olingo.commons.api.data.Valuable;
import org.apache.olingo.commons.api.data.ValueType;
<<<<<<<
import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.commons.api.serialization.ODataSerializerException;
=======
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.client.core.domain.ClientAnnotationImpl;
import org.apache.olingo.client.core.domain.ClientDeletedEntityImpl;
import org.apache.olingo.client.core.domain.ClientDeltaLinkImpl;
import org.apache.olingo.client.core.domain.ClientPropertyImpl;
import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory;
>>>>>>>
import org.apache.olingo.commons.api.format.ContentType;
<<<<<<<
import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory;
import org.apache.olingo.commons.core.serialization.ContextURLParser;
=======
>>>>>>>
import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; |
<<<<<<<
import org.apache.olingo.client.core.domain.ClientObjectFactoryImpl;
=======
import org.apache.olingo.client.core.serialization.AtomSerializer;
>>>>>>>
import org.apache.olingo.client.core.domain.ClientObjectFactoryImpl;
import org.apache.olingo.client.core.serialization.AtomSerializer;
<<<<<<<
import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.commons.api.serialization.ODataSerializer;
import org.apache.olingo.commons.core.serialization.AtomSerializer;
import org.apache.olingo.commons.core.serialization.JsonSerializer;
=======
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.client.core.domain.ClientObjectFactoryImpl;
>>>>>>>
import org.apache.olingo.commons.api.format.ContentType; |
<<<<<<<
=======
/**
* The tableId this entry describes.
*/
@Element(required = true)
>>>>>>>
/**
* The tableId this entry describes.
*/
<<<<<<<
@JsonProperty(required = false)
=======
/**
* The ETag of the most recently modified data row
*/
@Element(required = false)
>>>>>>>
/**
* The ETag of the most recently modified data row
*/
@JsonProperty(required = false)
<<<<<<<
@JsonProperty(required = false)
=======
/**
* The ETag of the TableDefinition
*/
@Element(required = false)
>>>>>>>
/**
* The ETag of the TableDefinition
*/
@JsonProperty(required = false) |
<<<<<<<
=======
/**
* The tableId containing this elementKey
*/
@Attribute(required = true)
private String tableId;
>>>>>>>
/**
* The tableId containing this elementKey
*/
<<<<<<<
@JsonProperty(required = false)
=======
/**
* JSON serialization of an array of strings. Each value in the
* array identifies an elementKey of a nested field within this
* elementKey. If there are one or more nested fields, then the
* value stored in this elementKey is a JSON serialization of
* either an array or an object. Otherwise, it is either an
* integer, number or string field.
*
* If the elementType is 'array', the serialization is an
* array and the nested field is retrieved via a subscript.
*
* Otherwise, the serialization is an object and the nested
* field is retrieved via the elementName of that field.
*/
@Attribute(required = false)
>>>>>>>
/**
* JSON serialization of an array of strings. Each value in the
* array identifies an elementKey of a nested field within this
* elementKey. If there are one or more nested fields, then the
* value stored in this elementKey is a JSON serialization of
* either an array or an object. Otherwise, it is either an
* integer, number or string field.
*
* If the elementType is 'array', the serialization is an
* array and the nested field is retrieved via a subscript.
*
* Otherwise, the serialization is an object and the nested
* field is retrieved via the elementName of that field.
*/
@JsonProperty(required = false)
<<<<<<<
=======
/**
* If true, then this elementKey is a column in the backing
* database table. If false, then either the elementKey is a
* component of an enclosing object that is a column in the
* backing database table, or, each of its child element keys
* or their descendants are columns in the backing database
* table.
*/
@Attribute(required = true)
private int isUnitOfRetention;
>>>>>>>
/**
* If true, then this elementKey is a column in the backing
* database table. If false, then either the elementKey is a
* component of an enclosing object that is a column in the
* backing database table, or, each of its child element keys
* or their descendants are columns in the backing database
* table.
*/ |
<<<<<<<
@Override
public boolean isDeletable() throws IOException {
return deletable;
}
@Override
public void setDeletable(boolean deletable) throws IOException {
this.deletable = deletable;
}
=======
@Override
public void removeCount(String countID) throws IOException {
// TODO Auto-generated method stub
}
@Override
public void setCount(String countID, long count) throws IOException {
// TODO Auto-generated method stub
}
@Override
public Long getCount(String countID) throws IOException {
// TODO Auto-generated method stub
return null;
}
@Override
public Set<String> getCountKeys() throws IOException {
// TODO Auto-generated method stub
return null;
}
>>>>>>>
@Override
public boolean isDeletable() throws IOException {
return deletable;
}
@Override
public void setDeletable(boolean deletable) throws IOException {
this.deletable = deletable;
}
public void removeCount(String countID) throws IOException {
// TODO Auto-generated method stub
}
@Override
public void setCount(String countID, long count) throws IOException {
// TODO Auto-generated method stub
}
@Override
public Long getCount(String countID) throws IOException {
// TODO Auto-generated method stub
return null;
}
@Override
public Set<String> getCountKeys() throws IOException {
// TODO Auto-generated method stub
return null;
} |
<<<<<<<
import java.util.concurrent.atomic.AtomicLong;
=======
>>>>>>>
import java.util.concurrent.atomic.AtomicLong;
<<<<<<<
private final AtomicLong requests;
private final AtomicLong hits;
public PartReaderAndCounters (HostDomainPartition part, Reader reader) {
=======
private final CounterCache requests;
private final CounterCache hits;
public PartReaderAndCounters(HostDomainPartition part, Reader reader) {
>>>>>>>
private final AtomicLong requests;
private final AtomicLong hits;
public PartReaderAndCounters(HostDomainPartition part, Reader reader) {
<<<<<<<
public AtomicLong getRequests() {
=======
public CounterCache getRequests() {
>>>>>>>
public AtomicLong getRequests() {
<<<<<<<
public AtomicLong getHits() {
=======
public CounterCache getHits() {
>>>>>>>
public AtomicLong getHits() {
<<<<<<<
private void updateCounter(AtomicLong counter, String counterName) throws IOException {
long count = counter.get();
=======
private void updateCounter(CounterCache counter) throws IOException {
long count = counter.getCount().get();
String counterName = counter.getName();
>>>>>>>
private void updateCounter(AtomicLong counter, String counterName) throws IOException {
long count = counter.get(); |
<<<<<<<
import com.rapleaf.hank.exception.DataNotFoundException;
import com.rapleaf.hank.ui.controller.Action;
import com.rapleaf.hank.ui.controller.Controller;
=======
>>>>>>>
import com.rapleaf.hank.ui.controller.Action;
import com.rapleaf.hank.ui.controller.Controller; |
<<<<<<<
public boolean isDeletable() throws IOException;
public void setDeletable(boolean deletable) throws IOException;
=======
public void removeCount(String countID) throws IOException;
public void setCount(String countID, long count) throws IOException;
public Long getCount(String countID) throws IOException;
public Set<String> getCountKeys() throws IOException;
>>>>>>>
public boolean isDeletable() throws IOException;
public void setDeletable(boolean deletable) throws IOException;
public void removeCount(String countID) throws IOException;
public void setCount(String countID, long count) throws IOException;
public Long getCount(String countID) throws IOException;
public Set<String> getCountKeys() throws IOException; |
<<<<<<<
=======
private boolean deletable;
>>>>>>>
<<<<<<<
private boolean deletable;
=======
>>>>>>>
private boolean deletable; |
<<<<<<<
if (LinphonePreferences.instance() != null)
proxyConfig.setContactUriParameters(LinphonePreferences.instance().getPushNotificationRegistrationID());
if (accountCreator.getPhoneNumber() != null && accountCreator.getPhoneNumber().length() > 0)
proxyConfig.setDialPrefix(org.linphone.core.Utils.getPrefixFromE164(accountCreator.getPhoneNumber()));
=======
if (accountCreator.getPhoneNumber() != null && accountCreator.getPhoneNumber().length() > 0)
proxyConfig.setDialPrefix(accountCreator.getPrefix(accountCreator.getPhoneNumber()));
>>>>>>>
if (accountCreator.getPhoneNumber() != null && accountCreator.getPhoneNumber().length() > 0)
proxyConfig.setDialPrefix(org.linphone.core.Utils.getPrefixFromE164(accountCreator.getPhoneNumber()));
<<<<<<<
if (ContactsManager.getInstance() != null)
ContactsManager.getInstance().fetchContactsAsync();
=======
if (LinphonePreferences.instance() != null)
LinphonePreferences.instance().setPushNotificationEnabled(true);
if (ContactsManager.getInstance() != null)
ContactsManager.getInstance().fetchContactsAsync();
>>>>>>>
if (LinphonePreferences.instance() != null)
LinphonePreferences.instance().setPushNotificationEnabled(true);
if (ContactsManager.getInstance() != null)
ContactsManager.getInstance().fetchContactsAsync();
<<<<<<<
.setUserid(userid)
=======
.setUserId(userid)
.setDisplayName(displayname)
>>>>>>>
.setUserid(userid)
.setDisplayName(displayname) |
<<<<<<<
layoutManager = new LinearLayoutManager(mContext);
contactsList.setLayoutManager(layoutManager);
//Divider between items
DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(contactsList.getContext(),
layoutManager.getOrientation());
dividerItemDecoration.setDrawable(getActivity().getResources().getDrawable(R.drawable.divider));
contactsList.addItemDecoration(dividerItemDecoration);
ContactsManager.getInstance().fetchContactsAsync();
=======
contactsFetchInProgress = (ProgressBar) view.findViewById(R.id.contactsFetchInProgress);
contactsFetchInProgress.setVisibility(View.VISIBLE);
>>>>>>>
layoutManager = new LinearLayoutManager(mContext);
contactsList.setLayoutManager(layoutManager);
//Divider between items
DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(contactsList.getContext(),
layoutManager.getOrientation());
dividerItemDecoration.setDrawable(getActivity().getResources().getDrawable(R.drawable.divider));
contactsList.addItemDecoration(dividerItemDecoration);
contactsFetchInProgress = (ProgressBar) view.findViewById(R.id.contactsFetchInProgress);
contactsFetchInProgress.setVisibility(View.VISIBLE); |
<<<<<<<
import android.app.AlertDialog;
import android.content.DialogInterface;
=======
import android.content.Intent;
>>>>>>>
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent; |
<<<<<<<
import static org.mockito.ArgumentMatchers.anyLong;
=======
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
>>>>>>>
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.anyString;
<<<<<<<
when(detectorService.getLastUpdatedDetectors(anyLong())).thenReturn(detectors);
=======
when(detectorService.findByUuid(anyString())).thenReturn(detector);
when(detectorService.getLastUpdatedDetectors(anyInt())).thenReturn(detectors);
>>>>>>>
when(detectorService.findByUuid(anyString())).thenReturn(detector);
when(detectorService.getLastUpdatedDetectors(anyLong())).thenReturn(detectors); |
<<<<<<<
//LinphoneChatMessage Listener
=======
class SearchContactsListAdapter extends BaseAdapter {
private class ViewHolder {
public TextView name;
public TextView address;
public ViewHolder(View view) {
name = (TextView) view.findViewById(R.id.contact_name);
address = (TextView) view.findViewById(R.id.contact_address);
}
}
private List<ContactAddress> contacts;
private LayoutInflater mInflater;
SearchContactsListAdapter(List<ContactAddress> contactsList) {
mInflater = inflater;
if (contactsList == null) {
contacts = getContactsList();
} else {
contacts = contactsList;
}
}
public List<ContactAddress> getContactsList() {
List<ContactAddress> list = new ArrayList<ContactAddress>();
if(ContactsManager.getInstance().hasContacts()) {
for (LinphoneContact con : ContactsManager.getInstance().getContacts()) {
for (LinphoneNumberOrAddress noa : con.getNumbersOrAddresses()) {
String value = noa.getValue();
// Fix for sip:username compatibility issue
if (value.startsWith("sip:") && !value.contains("@")) {
value = value.substring(4);
value = LinphoneUtils.getFullAddressFromUsername(value);
}
list.add(new ContactAddress(con, value));
}
}
}
return list;
}
public int getCount() {
return contacts.size();
}
public ContactAddress getItem(int position) {
if (contacts == null || position >= contacts.size()) {
contacts = getContactsList();
return contacts.get(position);
} else {
return contacts.get(position);
}
}
public long getItemId(int position) {
return position;
}
public View getView(int position, View convertView, ViewGroup parent) {
View view = null;
ContactAddress contact;
ViewHolder holder = null;
do {
contact = getItem(position);
} while (contact == null);
if (convertView != null) {
view = convertView;
holder = (ViewHolder) view.getTag();
} else {
view = mInflater.inflate(R.layout.search_contact_cell, parent, false);
holder = new ViewHolder(view);
view.setTag(holder);
}
final String a = contact.address;
LinphoneContact c = contact.contact;
holder.name.setText(c.getFullName());
holder.address.setText(a);
view.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View view) {
exitNewConversationMode(a);
}
});
return view;
}
}
//ChatMessage Listener
>>>>>>>
//ChatMessage Listener |
<<<<<<<
=======
>>>>>>> |
<<<<<<<
false, true, false, null, null, null, null, null, null, null,
PluginImpl.DEFAULT_SERVER_NAME, null, false, null));
=======
false, true, false, null, null, null, null, null, null, null, null, false, false, null));
>>>>>>>
false, true, false, null, null, null, null, null, null, null,
PluginImpl.DEFAULT_SERVER_NAME, null, false, false, null));
<<<<<<<
false, null, null, null, null, null, null, null, PluginImpl.DEFAULT_SERVER_NAME, list, true, filepath);
=======
false, null, null, null, null, null, null, null, list, true, false, filepath);
>>>>>>>
false, null, null, null, null, null, null, null, PluginImpl.DEFAULT_SERVER_NAME,
list, true, false, filepath);
<<<<<<<
false, true, false, null, null, null, null, null, null, null,
PluginImpl.DEFAULT_SERVER_NAME, list, false, null));
=======
false, true, false, null, null, null, null, null, null, null, list, false, false, null));
>>>>>>>
false, true, false, null, null, null, null, null, null, null,
PluginImpl.DEFAULT_SERVER_NAME, list, false, false, null)); |
<<<<<<<
import com.sonyericsson.hudson.plugins.gerrit.gerritevents.dto.attr.Provider;
=======
import com.sonyericsson.hudson.plugins.gerrit.gerritevents.dto.events.ChangeBasedEvent;
>>>>>>>
import com.sonyericsson.hudson.plugins.gerrit.gerritevents.dto.attr.Provider;
import com.sonyericsson.hudson.plugins.gerrit.gerritevents.dto.events.ChangeBasedEvent;
<<<<<<<
import com.sonyericsson.hudson.plugins.gerrit.trigger.GerritServer;
=======
import com.sonyericsson.hudson.plugins.gerrit.gerritevents.workers.cmd.AbstractSendCommandJob;
>>>>>>>
import com.sonyericsson.hudson.plugins.gerrit.trigger.GerritServer;
import com.sonyericsson.hudson.plugins.gerrit.gerritevents.workers.cmd.AbstractSendCommandJob;
<<<<<<<
String serverName = getServerName(memoryImprint);
BuildCompletedCommandJob job = new BuildCompletedCommandJob(getConfig(serverName),
memoryImprint, listener);
=======
AbstractSendCommandJob job;
if(getConfig().isUseRestApi()) {
job = new BuildCompletedRestCommandJob(getConfig(), memoryImprint, listener);
} else {
job = new BuildCompletedCommandJob(getConfig(),
memoryImprint, listener);
}
>>>>>>>
String serverName = getServerName(memoryImprint);
AbstractSendCommandJob job;
if (getConfig(serverName).isUseRestApi()) {
job = new BuildCompletedRestCommandJob(getConfig(serverName), memoryImprint, listener);
} else {
job = new BuildCompletedCommandJob(getConfig(serverName),
memoryImprint, listener);
}
<<<<<<<
String serverName = GerritTrigger.getTrigger(build.getProject()).getServerName();
BuildStartedCommandJob job = new BuildStartedCommandJob(getConfig(serverName),
=======
AbstractSendCommandJob job;
if(getConfig().isUseRestApi()) {
job = new BuildStartedRestCommandJob(getConfig(), build, listener, (ChangeBasedEvent) event, stats);
} else {
job = new BuildStartedCommandJob(getConfig(),
>>>>>>>
String serverName = GerritTrigger.getTrigger(build.getProject()).getServerName();
AbstractSendCommandJob job;
if (getConfig(serverName).isUseRestApi() && event instanceof ChangeBasedEvent) {
job = new BuildStartedRestCommandJob(getConfig(serverName), build, listener,
(ChangeBasedEvent)event, stats);
} else {
job = new BuildStartedCommandJob(getConfig(serverName), |
<<<<<<<
if (event.getChange() != null) {
logger.info("Project {} Build Scheduled: {} By event: {}",
new Object[]{project.getName(), (build != null),
event.getChange().getNumber() + "/" + event.getPatchSet().getNumber(), });
} else if (event.getRefUpdate() != null) {
logger.info("Project {} Build Scheduled: {} By event: {}",
new Object[]{project.getName(), (build != null),
event.getRefUpdate().getRefName() + " " + event.getRefUpdate().getNewRev(), });
}
=======
logger.info("Project {} Build Scheduled: {} By event: {}",
new Object[]{project.getName(), (build != null),
event.getChange().getNumber() + "/" + event.getPatchSet().getNumber(), });
>>>>>>>
if (event.getChange() != null) {
logger.info("Project {} Build Scheduled: {} By event: {}",
new Object[]{project.getName(), (build != null),
event.getChange().getNumber() + "/" + event.getPatchSet().getNumber(), });
} else if (event.getRefUpdate() != null) {
logger.info("Project {} Build Scheduled: {} By event: {}",
new Object[]{project.getName(), (build != null),
event.getRefUpdate().getRefName() + " " + event.getRefUpdate().getNewRev(), });
}
<<<<<<<
/**
* Sets triggering on ref-updated events.
* Default is false.
*
* @param triggerOnRefUpdatedEvent true if should trigger on ref-updated.
*/
public void setTriggerOnRefUpdatedEvent(boolean triggerOnRefUpdatedEvent) {
this.triggerOnRefUpdatedEvent = triggerOnRefUpdatedEvent;
}
=======
>>>>>>>
/**
* Sets triggering on ref-updated events.
* Default is false.
*
* @param triggerOnRefUpdatedEvent true if should trigger on ref-updated.
*/
public void setTriggerOnRefUpdatedEvent(boolean triggerOnRefUpdatedEvent) {
this.triggerOnRefUpdatedEvent = triggerOnRefUpdatedEvent;
} |
<<<<<<<
* @param customUrl Custom URL to sen to gerrit instead of build URL
* @param serverName The selected server
=======
* @param customUrl Custom URL to send to Gerrit instead of build URL
>>>>>>>
* @param customUrl Custom URL to sen to Gerrit instead of build URL
* @param serverName The selected server
<<<<<<<
=======
/**
* Convenience method for the jelly file, accessing the instance proved to be hard.
* @return true if file triggering is enabled in the Gerrit version.
*/
public boolean isFileTriggerEnabled() {
return GerritVersionChecker.isCorrectVersion(GerritVersionChecker.Feature.fileTrigger);
}
>>>>>>> |
<<<<<<<
server = new SshdServerMock();
sshd = SshdServerMock.startServer(server);
server.returnCommandFor("gerrit ls-projects", SshdServerMock.EofCommandMock.class);
server.returnCommandFor(GERRIT_STREAM_EVENTS, SshdServerMock.CommandMock.class);
server.returnCommandFor("gerrit review.*", SshdServerMock.EofCommandMock.class);
server.returnCommandFor("gerrit approve.*", SshdServerMock.EofCommandMock.class);
server.returnCommandFor("gerrit version", SshdServerMock.EofCommandMock.class);
=======
serverMock = new SshdServerMock();
sshd = SshdServerMock.startServer(serverMock);
serverMock.returnCommandFor("gerrit ls-projects", SshdServerMock.EofCommandMock.class);
serverMock.returnCommandFor(GERRIT_STREAM_EVENTS, SshdServerMock.CommandMock.class);
serverMock.returnCommandFor("gerrit review.*", SshdServerMock.EofCommandMock.class);
serverMock.returnCommandFor("gerrit version", SshdServerMock.EofCommandMock.class);
>>>>>>>
serverMock = new SshdServerMock();
sshd = SshdServerMock.startServer(serverMock);
serverMock.returnCommandFor("gerrit ls-projects", SshdServerMock.EofCommandMock.class);
serverMock.returnCommandFor(GERRIT_STREAM_EVENTS, SshdServerMock.CommandMock.class);
serverMock.returnCommandFor("gerrit review.*", SshdServerMock.EofCommandMock.class);
serverMock.returnCommandFor("gerrit approve.*", SshdServerMock.EofCommandMock.class);
serverMock.returnCommandFor("gerrit version", SshdServerMock.EofCommandMock.class);
<<<<<<<
FreeStyleProject project = DuplicatesUtil.createGerritDynamicTriggeredJob(j, "projectX");
server.waitForCommand(GERRIT_STREAM_EVENTS, 2000);
=======
FreeStyleProject project = DuplicatesUtil.createGerritDynamicTriggeredJob(this, "projectX");
serverMock.waitForCommand(GERRIT_STREAM_EVENTS, 2000);
>>>>>>>
FreeStyleProject project = DuplicatesUtil.createGerritDynamicTriggeredJob(j, "projectX");
serverMock.waitForCommand(GERRIT_STREAM_EVENTS, 2000);
<<<<<<<
FreeStyleProject project = DuplicatesUtil.createGerritTriggeredJob(j, "projectX");
project.getBuildersList().add(new SleepBuilder(5000));
server.waitForCommand(GERRIT_STREAM_EVENTS, 2000);
boolean started = false;
=======
FreeStyleProject project = DuplicatesUtil.createGerritTriggeredJob(this, "projectX");
serverMock.waitForCommand(GERRIT_STREAM_EVENTS, 2000);
>>>>>>>
FreeStyleProject project = DuplicatesUtil.createGerritTriggeredJob(j, "projectX");
project.getBuildersList().add(new SleepBuilder(5000));
serverMock.waitForCommand(GERRIT_STREAM_EVENTS, 2000);
boolean started = false;
<<<<<<<
FreeStyleProject project = DuplicatesUtil.createGerritTriggeredJob(j, "projectX");
project.getBuildersList().add(new SleepBuilder(5000));
server.waitForCommand(GERRIT_STREAM_EVENTS, 2000);
boolean started = false;
=======
FreeStyleProject project = DuplicatesUtil.createGerritTriggeredJob(this, "projectX");
serverMock.waitForCommand(GERRIT_STREAM_EVENTS, 2000);
>>>>>>>
FreeStyleProject project = DuplicatesUtil.createGerritTriggeredJob(j, "projectX");
project.getBuildersList().add(new SleepBuilder(5000));
serverMock.waitForCommand(GERRIT_STREAM_EVENTS, 2000);
boolean started = false; |
<<<<<<<
import static com.sonyericsson.hudson.plugins.gerrit.trigger.utils.Logic.shouldSkip;
import com.sonymobile.tools.gerrit.gerritevents.dto.events.GerritTriggeredEvent;
=======
import com.sonymobile.tools.gerrit.gerritevents.dto.events.GerritTriggeredEvent;
import hudson.model.Result;
>>>>>>>
import com.sonymobile.tools.gerrit.gerritevents.dto.events.GerritTriggeredEvent;
<<<<<<<
import hudson.model.Result;
=======
>>>>>>>
import hudson.model.Result;
import jenkins.model.Jenkins;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.annotation.CheckForNull;
<<<<<<<
import javax.annotation.CheckForNull;
import jenkins.model.Jenkins;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
=======
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static com.sonyericsson.hudson.plugins.gerrit.trigger.utils.Logic.shouldSkip;
>>>>>>>
import static com.sonyericsson.hudson.plugins.gerrit.trigger.utils.Logic.shouldSkip; |
<<<<<<<
GerritTrigger trigger = new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0, true, true, "", "", "", "", null, null);
=======
GerritTrigger trigger = new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0, true, true, true, false, false, false,
"", "", "", "", "", "", null);
>>>>>>>
GerritTrigger trigger = new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0, true, true, true, false, false, false,
"", "", "", "", "", "", null, null);
<<<<<<<
GerritTrigger trigger = new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0, true, true, "", "", "", "", null, null);
=======
GerritTrigger trigger = new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0, true, true, true, false, false, false,
"", "", "", "", "", "", null);
>>>>>>>
GerritTrigger trigger = new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0, true, true, true, false, false, false,
"", "", "", "", "", "", null, null);
<<<<<<<
GerritTrigger trigger = new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0, true, true, "", "", "", "", null, null);
=======
GerritTrigger trigger = new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0, true, true, true, false, false, false,
"", "", "", "", "", "", null);
>>>>>>>
GerritTrigger trigger = new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0, true, true, true, false, false, false,
"", "", "", "", "", "", null, null);
<<<<<<<
GerritTrigger trigger = new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0, true, true, "", "", "", "", null, null);
=======
GerritTrigger trigger = new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0, true, true, true, false, false, false,
"", "", "", "", "", "", null);
>>>>>>>
GerritTrigger trigger = new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0, true, true, true, false, false, false,
"", "", "", "", "", "", null, null);
<<<<<<<
GerritTrigger trigger = new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0, true, true, "", "", "", "", null, null);
=======
GerritTrigger trigger = new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0, true, true, true, false, false, false,
"", "", "", "", "", "", null);
>>>>>>>
GerritTrigger trigger = new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0, true, true, true, false, false, false,
"", "", "", "", "", "", null, null);
<<<<<<<
GerritTrigger trigger = new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0, true, false, "", "", "", "", null, null);
=======
GerritTrigger trigger = new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0, true, false, true, false, false, false,
"", "", "", "", "", "", null);
>>>>>>>
GerritTrigger trigger = new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0, true, false, true, false, false, false,
"", "", "", "", "", "", null, null);
<<<<<<<
GerritTrigger trigger = new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0, true, false, "", "", "", "", null, null);
=======
GerritTrigger trigger = new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0, true, false, true, false, false, false,
"", "", "", "", "", "", null);
>>>>>>>
GerritTrigger trigger = new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0, true, false, true, false, false, false,
"", "", "", "", "", "", null, null);
<<<<<<<
GerritTrigger trigger = new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0, true, false, "", "", "", "", null, null);
=======
GerritTrigger trigger = new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0, true, false, true, false, false, false,
"", "", "", "", "", "", null);
>>>>>>>
GerritTrigger trigger = new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0, true, false, true, false, false, false,
"", "", "", "", "", "", null, null);
<<<<<<<
GerritTrigger trigger = new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0, true, false, "", "", "", "", null, null);
=======
GerritTrigger trigger = new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0, true, false, true, false, false, false,
"", "", "", "", "", "", null);
>>>>>>>
GerritTrigger trigger = new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0, true, false, true, false, false, false,
"", "", "", "", "", "", null, null);
<<<<<<<
GerritTrigger trigger = new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0, true, false, "", "", "", "", null, null);
=======
GerritTrigger trigger = new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0,
true, false, true, false, false, false, "", "", "", "", "", "", null);
>>>>>>>
GerritTrigger trigger = new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0,
true, false, true, false, false, false, "", "", "", "", "", "", null, null);
<<<<<<<
0, 0, 0, 0, 0, 0, 0, 0, false, false, "", "", "", "", null, null);
=======
0, 0, 0, 0, 0, 0, 0, 0, false, false, true, false, false, false, "", "", "", "", "", "", null);
>>>>>>>
0, 0, 0, 0, 0, 0, 0, 0, false, false, true, false, false, false, "", "", "", "", "", "", null, null);
<<<<<<<
0, 0, 0, 0, 0, 0, 0, 0, true, true, "", "", "", "", null, null);
=======
0, 0, 0, 0, 0, 0, 0, 0, true, true, true, false, false, false, "", "", "", "", "", "", null);
>>>>>>>
0, 0, 0, 0, 0, 0, 0, 0, true, true, true, false, false, false, "", "", "", "", "", "", null, null);
<<<<<<<
0, 0, 0, 0, 0, 0, 0, 0, false, false, "", "", "", "", null, null);
=======
0, 0, 0, 0, 0, 0, 0, 0, false, false, true, false, false, false, "", "", "", "", "", "", null);
>>>>>>>
0, 0, 0, 0, 0, 0, 0, 0, false, false, true, false, false, false, "", "", "", "", "", "", null, null);
<<<<<<<
0, 0, 0, 0, 0, 0, 0, 0, false, false, "", "", "", "", null, null);
=======
0, 0, 0, 0, 0, 0, 0, 0, false, false, true, false, false, false, "", "", "", "", "", "", null);
>>>>>>>
0, 0, 0, 0, 0, 0, 0, 0, false, false, true, false, false, false, "", "", "", "", "", "", null, null);
<<<<<<<
0, 0, 0, 0, 0, 0, 0, 0, false, false, "", "", "", "", null, null);
=======
0, 0, 0, 0, 0, 0, 0, 0, false, false, true, false, false, false, "", "", "", "", "", "", null);
>>>>>>>
0, 0, 0, 0, 0, 0, 0, 0, false, false, true, false, false, false, "", "", "", "", "", "", null, null);
<<<<<<<
0, 0, 0, 0, 0, 0, 0, 0, false, false, "", "", "", "", null, null);
=======
0, 0, 0, 0, 0, 0, 0, 0, false, false, true, false, false, false, "", "", "", "", "", "", null);
>>>>>>>
0, 0, 0, 0, 0, 0, 0, 0, false, false, true, false, false, false, "", "", "", "", "", "", null, null);
<<<<<<<
0, 0, 0, 0, 0, 0, 0, 0, false, false, "", "", "", "", null, null);
=======
0, 0, 0, 0, 0, 0, 0, 0, false, false, true, false, false, false, "", "", "", "", "", "", null);
>>>>>>>
0, 0, 0, 0, 0, 0, 0, 0, false, false, true, false, false, false, "", "", "", "", "", "", null, null);
<<<<<<<
0, 0, 0, 0, 0, 0, 0, 0, false, false, "", "", "", "", null, null);
=======
0, 0, 0, 0, 0, 0, 0, 0, false, false, true, false, false, false, "", "", "", "", "", "", null);
>>>>>>>
0, 0, 0, 0, 0, 0, 0, 0, false, false, true, false, false, false, "", "", "", "", "", "", null, null);
<<<<<<<
0, 0, 0, 0, 0, 0, 0, 0, true, true, "", "", "", "", null, null);
=======
0, 0, 0, 0, 0, 0, 0, 0, true, true, true, false, false, false, "", "", "", "", "", "", null);
>>>>>>>
0, 0, 0, 0, 0, 0, 0, 0, true, true, true, false, false, false, "", "", "", "", "", "", null, null);
<<<<<<<
0, 0, 0, 0, 0, 0, 0, 0, true, true, "", "", "", "", null, null);
=======
0, 0, 0, 0, 0, 0, 0, 0, true, true, true, false, false, false, "", "", "", "", "", "", null);
>>>>>>>
0, 0, 0, 0, 0, 0, 0, 0, true, true, true, false, false, false, "", "", "", "", "", "", null, null);
<<<<<<<
new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0, true, true, "", "", "", "", null, null);
=======
new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0, true, true, true, false, false, false,
"", "", "", "", "", "", null);
>>>>>>>
new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0, true, true, true, false, false, false,
"", "", "", "", "", "", null, null);
<<<<<<<
new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0, true, false, "", "", "", "", null, null);
=======
new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0, true, false, true, false, false, false,
"", "", "", "", "", "", null);
>>>>>>>
new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0, true, false, true, false, false, false,
"", "", "", "", "", "", null, null); |
<<<<<<<
String serverName = PluginImpl.DEFAULT_SERVER_NAME;
if (project != null) {
serverName = GerritTrigger.getTrigger(project).getServerName();
} else if (event.getProvider() != null) {
serverName = event.getProvider().getName();
}
String url = PluginImpl.getInstance().getServer(serverName).getConfig().getGerritFrontEndUrlFor(event);
=======
String commitMessage = event.getChange().getCommitMessage();
if (commitMessage != null) {
GERRIT_CHANGE_COMMIT_MESSAGE.setOrCreateStringParameterValue(
parameters, commitMessage, escapeQuotes);
}
String url = PluginImpl.getInstance().getConfig().getGerritFrontEndUrlFor(event);
>>>>>>>
String serverName = PluginImpl.DEFAULT_SERVER_NAME;
if (project != null) {
serverName = GerritTrigger.getTrigger(project).getServerName();
} else if (event.getProvider() != null) {
serverName = event.getProvider().getName();
}
String url = PluginImpl.getInstance().getServer(serverName).getConfig().getGerritFrontEndUrlFor(event);
String commitMessage = event.getChange().getCommitMessage();
if (commitMessage != null) {
GERRIT_CHANGE_COMMIT_MESSAGE.setOrCreateStringParameterValue(
parameters, commitMessage, escapeQuotes);
} |
<<<<<<<
footerLogo.setMinimumSize(new Dimension(42,42));
=======
footerLogo.setBounds(20, 20, 50, 40);
>>>>>>>
footerLogo.setMinimumSize(new Dimension(42,42));
<<<<<<<
footerCreeper.setMinimumSize(new Dimension(132, 42));
=======
footerCreeper.setBounds(78, 20, 132, 42);
>>>>>>>
footerCreeper.setMinimumSize(new Dimension(132, 42));
<<<<<<<
footerTUG.setMinimumSize(new Dimension(132, 42));
=======
footerTUG.setBounds(212, 25, 100, 28);
>>>>>>>
footerTUG.setMinimumSize(new Dimension(132, 42));
<<<<<<<
donate.setText(I18N.getLocaleString("DONATE_BUTTON"));
donate.setMinimumSize(new Dimension(80,30));
donate.setEnabled(false);
donate.setToolTipText("Coming Soon...");
donate.addActionListener(new ActionListener() {
@Override
public void actionPerformed (ActionEvent e) {
}
});
users.setMinimumSize(new Dimension(150,30));
users.setMaximumSize(new Dimension(150,30));
=======
users.setBounds(550, 20, 150, 30);
>>>>>>>
users.setMinimumSize(new Dimension(150,30));
users.setMaximumSize(new Dimension(150,30));
<<<<<<<
// Panel for the items in the bottom left
JPanel logoPanel = new JPanel();
logoPanel.setBackground(LauncherStyle.getCurrentStyle().footerColor);
logoPanel.add(footerLogo);
logoPanel.add(footerCreeper);
logoPanel.add(footerTUG);
// Panel for the items in the bottom right
JPanel buttonFooterPanel = new JPanel();
buttonFooterPanel.setLayout(new FlowLayout(FlowLayout.RIGHT, 10, 10));
buttonFooterPanel.setBackground(LauncherStyle.getCurrentStyle().footerColor);
buttonFooterPanel.add(donate);
buttonFooterPanel.add(edit);
buttonFooterPanel.add(users);
buttonFooterPanel.add(launch);
// Buttons for texture pack pane
buttonFooterPanel.add(tpInstallLocation);
buttonFooterPanel.add(tpInstall);
// Buttons for custom map pane
buttonFooterPanel.add(mapInstallLocation);
buttonFooterPanel.add(mapInstall);
// Button if server map
buttonFooterPanel.add(serverMap);
footer.add(logoPanel, BorderLayout.LINE_START);
footer.add(buttonFooterPanel, BorderLayout.LINE_END);
=======
footer.add(edit);
footer.add(users);
footer.add(footerLogo);
footer.add(footerCreeper);
footer.add(footerTUG);
footer.add(launch);
footer.add(serverbutton);
footer.add(mapInstall);
footer.add(mapInstallLocation);
footer.add(serverMap);
footer.add(tpInstall);
footer.add(tpInstallLocation);
>>>>>>>
// Panel for the items in the bottom left
JPanel logoPanel = new JPanel();
logoPanel.setBackground(LauncherStyle.getCurrentStyle().footerColor);
logoPanel.add(footerLogo);
logoPanel.add(footerCreeper);
logoPanel.add(footerTUG);
// Panel for the items in the bottom right
JPanel buttonFooterPanel = new JPanel();
buttonFooterPanel.setLayout(new FlowLayout(FlowLayout.RIGHT, 10, 10));
buttonFooterPanel.setBackground(LauncherStyle.getCurrentStyle().footerColor);
buttonFooterPanel.add(edit);
buttonFooterPanel.add(users);
buttonFooterPanel.add(launch);
// Buttons for texture pack pane
buttonFooterPanel.add(tpInstallLocation);
buttonFooterPanel.add(tpInstall);
// Buttons for custom map pane
buttonFooterPanel.add(mapInstallLocation);
buttonFooterPanel.add(mapInstall);
// Button if server map
buttonFooterPanel.add(serverMap);
footer.add(logoPanel, BorderLayout.LINE_START);
footer.add(buttonFooterPanel, BorderLayout.LINE_END); |
<<<<<<<
public class ThirdPartyPane extends AbstractModPackPane implements ILauncherPane {
=======
public class ThirdPartyPane extends AbstractModPackPane implements ILauncherPane {
>>>>>>>
public class ThirdPartyPane extends AbstractModPackPane implements ILauncherPane {
<<<<<<<
public ThirdPartyPane() {
=======
public ThirdPartyPane () {
>>>>>>>
public ThirdPartyPane() {
<<<<<<<
=======
setBorder(new EmptyBorder(5, 5, 5, 5));
setLayout(null);
packPanels = Lists.newArrayList();
packs = new JPanel();
packs.setLayout(null);
packs.setOpaque(false);
// stub for a real wait message
final JPanel p = new JPanel();
p.setBounds(0, 0, 420, 55);
p.setLayout(null);
filter = new JButton(I18N.getLocaleString("FILTER_SETTINGS"));
filter.setBounds(5, 5, 105, 25);
filter.addActionListener(new ActionListener() {
@Override
public void actionPerformed (ActionEvent e) {
if (loaded) {
// TODO: problem here. How to move into abstract?
ModPackFilterDialog filterDia = new ModPackFilterDialog(instance);
filterDia.setVisible(true);
}
}
});
add(filter);
String filterTextColor = LauncherStyle.getColorAsString(LauncherStyle.getCurrentStyle().filterTextColor);
String filterInnerTextColor = LauncherStyle.getColorAsString(LauncherStyle.getCurrentStyle().filterInnerTextColor);
String typeLblText = "<html><body>";
typeLblText += "<strong><font color=rgb\"(" + filterTextColor + ")\">Filter: </strong></font>";
typeLblText += "<font color=rgb\"(" + filterInnerTextColor + ")\">" + origin + "</font>";
typeLblText += "<font color=rgb\"(" + filterTextColor + ")\"> / </font>";
typeLblText += "<font color=rgb\"(" + filterInnerTextColor + ")\">" + mcVersion + "</font>";
typeLblText += "</body></html>";
typeLbl = new JLabel(typeLblText);
typeLbl.setBounds(115, 5, 175, 25);
typeLbl.setHorizontalAlignment(SwingConstants.CENTER);
add(typeLbl);
editModPack = new JButton(I18N.getLocaleString("MODS_EDIT_PACK"));
editModPack.setBounds(300, 5, 110, 25);
editModPack.addActionListener(new ActionListener() {
@Override
public void actionPerformed (ActionEvent e) {
if (packPanels.size() > 0) {
//TODO: fix by rename?
if (getSelectedThirdPartyModIndex() >= 0) {
EditModPackDialog empd = new EditModPackDialog(LaunchFrame.getInstance(), ModPack.getSelectedPack(false));
empd.setVisible(true);
}
}
}
});
add(editModPack);
JTextArea filler = new JTextArea(I18N.getLocaleString("MODS_WAIT_WHILE_LOADING"));
filler.setBorder(null);
filler.setEditable(false);
filler.setForeground(LauncherStyle.getCurrentStyle().tabPaneForeground);
filler.setBounds(58, 6, 378, 42);
filler.setBackground(LauncherStyle.getCurrentStyle().tabPaneBackground);
// p.add(loadingImage);
p.add(filler);
packs.add(p);
packsScroll = new JScrollPane();
packsScroll.setBounds(-3, 30, 420, 283);
packsScroll.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
packsScroll.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
packsScroll.setWheelScrollingEnabled(true);
packsScroll.setOpaque(false);
packsScroll.setViewportView(packs);
packsScroll.getVerticalScrollBar().setUnitIncrement(19);
add(packsScroll);
packInfo = new JEditorPane();
packInfo.setEditable(false);
packInfo.setContentType("text/html");
packInfo.addHyperlinkListener(new HyperlinkListener() {
@Override
public void hyperlinkUpdate (HyperlinkEvent event) {
if (event.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
OSUtils.browse(event.getURL().toString());
}
}
});
// TODO: Fix darker background for text area? Or is it better blending in?
packInfo.setBackground(UIManager.getColor("control").darker().darker());
add(packInfo);
infoScroll = new JScrollPane();
infoScroll.setBounds(410, 25, 430, 290);
infoScroll.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
infoScroll.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
infoScroll.setWheelScrollingEnabled(true);
infoScroll.setViewportView(packInfo);
infoScroll.setOpaque(false);
add(infoScroll);
server = new JButton(I18N.getLocaleString("DOWNLOAD_SERVER"));
server.setBounds(420, 5, 130, 25);
//TODO: check
server.addActionListener(new ActionListener() {
@Override
public void actionPerformed (ActionEvent event) {
String url;
ModPack pack = ModPack.getSelectedPack(false);
if (LaunchFrame.currentPane == LaunchFrame.Panes.THIRDPARTY && !pack.getServerUrl().isEmpty()) {
if (packPanels.size() > 0 && getSelectedThirdPartyModIndex() >= 0) {
if (!pack.getServerUrl().equals("") && pack.getServerUrl() != null) {
String version = (Settings.getSettings().getPackVer().equalsIgnoreCase("recommended version") || Settings.getSettings().getPackVer().equalsIgnoreCase("newest version"))
? pack.getVersion().replace(".", "_")
: Settings.getSettings().getPackVer().replace(".", "_");
if (pack.isPrivatePack()) {
url = DownloadUtils.getCreeperhostLink("privatepacks/" + pack.getDir() + "/" + version + "/" + pack.getServerUrl());
} else {
url = DownloadUtils.getCreeperhostLink("modpacks/" + pack.getDir() + "/" + version + "/" + pack.getServerUrl());
}
if (DownloadUtils.fileExistsURL(url)) {
OSUtils.browse(url);
} else {
ErrorUtils.tossError("Server file for selected version was not found on the server");
}
TrackerUtils.sendPageView(pack.getName() + " Server Download", "Server Download / " + pack.getName() + " / " + version);
}
}
}
}
});
add(server);
version = new JComboBox(new String[] { });
version.setBounds(560, 5, 130, 25);
version.addActionListener(al);
version.setToolTipText(I18N.getLocaleString("MODPACK_VERSIONS"));
add(version);
privatePack = new JButton(I18N.getLocaleString("PACK_CODES"));
privatePack.setBounds(700, 5, 120, 25);
privatePack.addActionListener(new ActionListener() {
@Override
public void actionPerformed (ActionEvent e) {
PrivatePackDialog ap = new PrivatePackDialog();
ap.setVisible(true);
}
});
add(privatePack);
>>>>>>>
<<<<<<<
boolean filterForTab(ModPack pack) {
=======
public int getSelectedThirdPartyModIndex () {
return modPacksAdded ? getIndex() : -1;
}
boolean filterForTab (ModPack pack) {
>>>>>>>
boolean filterForTab(ModPack pack) { |
<<<<<<<
import com.google.common.collect.Maps;
=======
>>>>>>>
<<<<<<<
typeLbl = new JLabel(typeLblText);
typeLbl.setBounds(115, 5, 295, 25);
typeLbl.setHorizontalAlignment(SwingConstants.CENTER);
buttonsPanel.add(typeLbl);
=======
>>>>>>>
typeLbl = new JLabel(typeLblText);
typeLbl.setBounds(115, 5, 295, 25);
typeLbl.setHorizontalAlignment(SwingConstants.CENTER);
buttonsPanel.add(typeLbl); |
<<<<<<<
JPanel intOne = new JPanel(new MigLayout("wrap 2"));
=======
if(names == null){
this.names = new ArrayList<String>(ColorScheme.rangeColorSchemeNames());
this.names.addAll(ColorScheme.discreteColorSchemeNames());
} else {
this.names = new ArrayList<String>(names);
}
JPanel intOne = new JPanel();
GridBagLayout gbl = new GridBagLayout();
intOne.setLayout(gbl);
>>>>>>>
JPanel intOne = new JPanel(new MigLayout("wrap 2"));
if(names == null){
this.names = new ArrayList<String>(ColorScheme.rangeColorSchemeNames());
this.names.addAll(ColorScheme.discreteColorSchemeNames());
} else {
this.names = new ArrayList<String>(names);
} |
<<<<<<<
=======
import org.gdms.data.AlreadyClosedException;
import org.gdms.data.DataSource;
import org.gdms.data.DataSourceCreationException;
import org.gdms.data.NoSuchTableException;
import org.gdms.data.stream.URIUtility;
import org.gdms.driver.DriverException;
import org.gdms.source.Source;
import org.gdms.source.SourceEvent;
import org.gdms.source.SourceListener;
import org.gdms.source.SourceManager;
import org.gdms.source.SourceRemovalEvent;
import org.orbisgis.core.DataManager;
>>>>>>>
<<<<<<<
import org.orbisgis.sputilities.SFSUtilities;
=======
>>>>>>>
import org.orbisgis.sputilities.SFSUtilities;
<<<<<<<
=======
if (dataUrl != null) {
OnlineResourceType resType = dataUrl.getOnlineResource();
try {
URI layerURI = new URI(resType.getHref());
// The resource is given as relative to MapContext location
if(!layerURI.isAbsolute() && getLocation()!=null) {
try {
// Resolve the relative resource ex: new Uri("myFile.shp")
layerURI = getLocation().resolve(layerURI);
} catch (IllegalArgumentException ex) {
LOGGER.warn(I18N.tr("Error while trying to find an absolute path for an external resource"), ex);
}
}
//Get table name
ILayer leafLayer;
try {
leafLayer = createLayer(registerLayerResource(layerURI));
} catch (Exception ex) {
throw new LayerException(I18N.tr("Unable to load the data source uri {0}.", resType.getHref()), ex);
}
leafLayer.setDescription(new Description(lt));
leafLayer.setVisible(!lt.isHidden());
//Parse styles
if(lt.isSetStyleList()) {
for(StyleType st : lt.getStyleList().getStyle()) {
if(st.isSetSLD()) {
if(st.getSLD().isSetAbstractStyle()) {
leafLayer.addStyle(new Style((JAXBElement<net.opengis.se._2_0.core.StyleType>)st.getSLD().getAbstractStyle(), leafLayer));
}
}
}
}
parentLayer.addLayer(leafLayer);
} catch (URISyntaxException ex) {
throw new LayerException(I18N.tr("Unable to parse the href URI {0}.", resType.getHref()), ex);
} catch (InvalidStyle ex) {
throw new LayerException(I18N.tr("Unable to load the description of the layer {0}", lt.getTitle().toString()), ex);
}
}
/*
>>>>>>> |
<<<<<<<
import org.orbisgis.wpsclient.WpsClient;
=======
import org.orbisgis.wpsclient.api.InternalWpsClient;
>>>>>>>
import org.orbisgis.wpsclient.api.InternalWpsClient;
import org.orbisgis.wpsclient.WpsClient;
<<<<<<<
if(hasSelectedRows && !tableSorter.isFiltered()) {
JMenuItem addRowFilter = new JMenuItem(I18N.tr("Filter selected rows"),
=======
if(hasSelectedRows) {
JMenuItem addRowFilter = new JMenuItem(I18N.tr("filter selected rows"),
>>>>>>>
if(hasSelectedRows && !tableSorter.isFiltered()) {
JMenuItem addRowFilter = new JMenuItem(I18N.tr("Filter selected rows"), |
<<<<<<<
* Efficient wrapper for strings.
=======
* Wrapper for strings.
>>>>>>>
* Efficient wrapper for strings.
<<<<<<<
class DefaultStringValue extends AbstractValue implements Serializable, StringValue, CharSequence {
=======
final class DefaultStringValue extends AbstractValue implements Serializable, StringValue {
>>>>>>>
final class DefaultStringValue extends AbstractValue implements Serializable, StringValue, CharSequence { |
<<<<<<<
=======
import com.google.android.gms.location.FusedLocationProviderClient;
import com.google.android.gms.location.LocationServices;
>>>>>>>
<<<<<<<
setReceiverBehaviorBottomSheetCallBack();
setDonorBehaviorBottomSheetCallBack();
receiverBehaviour.setState(BottomSheetBehavior.STATE_HIDDEN);
donorBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
SupportMapFragment mapFragment =
(SupportMapFragment) getSupportFragmentManager().findFragmentById(R.id.fragement_maps);
mapFragment.getMapAsync(this);
}
private void setDonorBehaviorBottomSheetCallBack() {
donorBehavior.setBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() {
=======
fusedLocationProviderClient = LocationServices.getFusedLocationProviderClient(this);
receiverBehaviour.setBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() {
>>>>>>>
setReceiverBehaviorBottomSheetCallBack();
setDonorBehaviorBottomSheetCallBack();
receiverBehaviour.setState(BottomSheetBehavior.STATE_HIDDEN);
donorBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
SupportMapFragment mapFragment =
(SupportMapFragment) getSupportFragmentManager().findFragmentById(R.id.fragement_maps);
mapFragment.getMapAsync(this);
}
private void setDonorBehaviorBottomSheetCallBack() {
donorBehavior.setBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() { |
<<<<<<<
import java.io.*;
import java.util.Arrays;
=======
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.file.Path;
import java.nio.file.Paths;
>>>>>>>
import java.io.*;
import java.util.Arrays;
import java.nio.file.Path;
import java.nio.file.Paths; |
<<<<<<<
* @param fontSize
=======
* @param fontSize The new font's size
>>>>>>>
* @param fontSize The new font's size
<<<<<<<
* @param fontStyle
=======
* @param fontStyle The new font's style
>>>>>>>
* @param fontStyle The new font's style
<<<<<<<
* @param fontWeight
=======
* @param fontWeight The new font's weight
>>>>>>>
* @param fontWeight The new font's weight
<<<<<<<
public void draw(Graphics2D g2, String text, Map<String, Object> map,
boolean selected, MapTransform mt, AffineTransform at, RenderContext perm) throws ParameterException, IOException {
=======
public void draw(Graphics2D g2, String text, Map<String, Value> map,
boolean selected, MapTransform mt, AffineTransform at, RenderContext perm,
Label.VerticalAlignment va) throws ParameterException, IOException {
>>>>>>>
public void draw(Graphics2D g2, String text, Map<String, Object> map,
boolean selected, MapTransform mt, AffineTransform at, RenderContext perm,
Label.VerticalAlignment va) throws ParameterException, IOException { |
<<<<<<<
import org.orbisgis.wpsclient.WpsClientImpl;
import org.orbisgis.wpsservice.model.DescriptionType;
=======
import net.opengis.wps._2_0.DescriptionType;
import org.orbisgis.wpsclient.WpsClientImpl;
>>>>>>>
import org.orbisgis.wpsclient.WpsClientImpl;
import net.opengis.wps._2_0.DescriptionType; |
<<<<<<<
import org.orbisgis.tableeditorapi.TableEditableElement;
import org.orbisgis.wpsclient.WpsClient;
=======
import org.orbisgis.tablegui.api.TableEditableElement;
import org.orbisgis.wpsclient.api.InternalWpsClient;
>>>>>>>
import org.orbisgis.tableeditorapi.TableEditableElement;
import org.orbisgis.wpsclient.WpsClient;
import org.orbisgis.tablegui.api.TableEditableElement;
import org.orbisgis.wpsclient.api.InternalWpsClient; |
<<<<<<<
protected boolean isOpen;
=======
protected int numCompVectors;
>>>>>>>
protected boolean isOpen;
protected int numCompVectors;
<<<<<<<
this.isOpen = true;
=======
this.numCompVectors = numCompVectors;
>>>>>>>
this.isOpen = true;
this.numCompVectors = numCompVectors; |
<<<<<<<
=======
* Query streaming value for parameter as {@link ScrollableResults}
*
* @param request
* {@link AbstractObservationRequest}
* @param series
* Datasource series id
* @param temporalFilterCriterion
* Temporal filter {@link Criterion}
* @param session
* Hibernate Session
* @return Resulting {@link ScrollableResults}
* @throws HibernateException
* If an error occurs when querying the {@link AbstractValue}s
* @throws OwsExceptionReport
* If an error occurs when querying the {@link AbstractValue}s
*/
public ScrollableResults getStreamingSeriesValuesFor(AbstractObservationRequest request, long series,
Criterion temporalFilterCriterion, Session session) throws OwsExceptionReport {
return getScrollableSeriesValueCriteriaFor(request, series, temporalFilterCriterion, session, new StringBuilder()).scroll(
ScrollMode.FORWARD_ONLY);
}
public ScrollableResults getStreamingSeriesValuesFor(AbstractObservationRequest request, Set<Long> series,
Criterion temporalFilterCriterion, Session session) throws HibernateException, OwsExceptionReport {
return getScrollableSeriesValueCriteriaFor(request, series, temporalFilterCriterion, session, new StringBuilder()).scroll(
ScrollMode.FORWARD_ONLY);
}
/**
* Query streaming value for parameter as {@link ScrollableResults}
*
* @param request
* {@link AbstractObservationRequest}
* @param series
* Datasource series id
* @param session
* Hibernate Session
* @return Resulting {@link ScrollableResults}
* @throws OwsExceptionReport
* If an error occurs when querying the {@link AbstractValue}s
*/
public ScrollableResults getStreamingSeriesValuesFor(AbstractObservationRequest request, long series, Session session)
throws OwsExceptionReport {
return getScrollableSeriesValueCriteriaFor(request, series, null, session, new StringBuilder()).scroll(ScrollMode.FORWARD_ONLY);
}
public ScrollableResults getStreamingSeriesValuesFor(AbstractObservationRequest request, Set<Long> series,
Session session) throws HibernateException, OwsExceptionReport {
return getScrollableSeriesValueCriteriaFor(request, series, null, session, new StringBuilder()).scroll(ScrollMode.FORWARD_ONLY);
}
/**
>>>>>>>
<<<<<<<
Criteria c = getSeriesValueCriteriaFor(request, series, temporalFilterCriterion, session);
addChunkValuesToCriteria(c, chunkSize, currentRow, request);
return (List<DataEntity<?>>) c.list();
=======
StringBuilder logArgs = new StringBuilder();
Criteria c = getSeriesValueCriteriaFor(request, series, temporalFilterCriterion, session, logArgs);
addChunkValuesToCriteria(c, chunkSize, currentRow, request, logArgs);
LOGGER.debug("QUERY getStreamingSeriesValuesFor({}): {}", logArgs.toString(), HibernateHelper.getSqlString(c));
return (List<AbstractValuedLegacyObservation<?>>) c.list();
>>>>>>>
StringBuilder logArgs = new StringBuilder();
Criteria c = getSeriesValueCriteriaFor(request, series, temporalFilterCriterion, session, logArgs);
addChunkValuesToCriteria(c, chunkSize, currentRow, request, logArgs);
LOGGER.debug("QUERY getStreamingSeriesValuesFor({}): {}", logArgs.toString(), HibernateHelper.getSqlString(c));
return (List<DataEntity<?>>) c.list();
<<<<<<<
List<DataEntity<?>> list = new LinkedList<>();
=======
StringBuilder logArgs = new StringBuilder();
List<AbstractValuedLegacyObservation<?>> list = new LinkedList<>();
>>>>>>>
StringBuilder logArgs = new StringBuilder();
List<DataEntity<?>> list = new LinkedList<>();
<<<<<<<
Criteria c = getSeriesValueCriteriaFor(request, series, temporalFilterCriterion, session);
addChunkValuesToCriteria(c, chunkSize, currentRow, request);
return (List<DataEntity<?>>) c.list();
=======
StringBuilder logArgs = new StringBuilder();
Criteria c = getSeriesValueCriteriaFor(request, series, temporalFilterCriterion, session, logArgs);
addChunkValuesToCriteria(c, chunkSize, currentRow, request, logArgs);
LOGGER.debug("QUERY getStreamingSeriesValuesFor({}): {}", logArgs.toString(), HibernateHelper.getSqlString(c));
return (List<AbstractValuedLegacyObservation<?>>) c.list();
>>>>>>>
StringBuilder logArgs = new StringBuilder();
Criteria c = getSeriesValueCriteriaFor(request, series, temporalFilterCriterion, session, logArgs);
addChunkValuesToCriteria(c, chunkSize, currentRow, request, logArgs);
LOGGER.debug("QUERY getStreamingSeriesValuesFor({}): {}", logArgs.toString(), HibernateHelper.getSqlString(c));
return (List<DataEntity<?>>) c.list();
<<<<<<<
Criteria c = getSeriesValueCriteriaFor(request, series, null, session);
addChunkValuesToCriteria(c, chunkSize, currentRow, request);
return (List<DataEntity<?>>) c.list();
=======
StringBuilder logArgs = new StringBuilder();
Criteria c = getSeriesValueCriteriaFor(request, series, null, session, logArgs);
addChunkValuesToCriteria(c, chunkSize, currentRow, request, logArgs);
LOGGER.debug("QUERY getStreamingSeriesValuesFor({}): {}", logArgs.toString(), HibernateHelper.getSqlString(c));
return (List<AbstractValuedLegacyObservation<?>>) c.list();
>>>>>>>
StringBuilder logArgs = new StringBuilder();
Criteria c = getSeriesValueCriteriaFor(request, series, null, session, logArgs);
addChunkValuesToCriteria(c, chunkSize, currentRow, request, logArgs);
LOGGER.debug("QUERY getStreamingSeriesValuesFor({}): {}", logArgs.toString(), HibernateHelper.getSqlString(c));
return (List<DataEntity<?>>) c.list();
<<<<<<<
List<DataEntity<?>> list = new LinkedList<>();
=======
StringBuilder logArgs = new StringBuilder();
List<AbstractValuedSeriesObservation<?>> list = new LinkedList<>();
>>>>>>>
StringBuilder logArgs = new StringBuilder();
List<DataEntity<?>> list = new LinkedList<>();
<<<<<<<
Criteria c = getSeriesValueCriteriaFor(request, series, null, session);
addChunkValuesToCriteria(c, chunkSize, currentRow, request);
return (List<DataEntity<?>>) c.list();
=======
StringBuilder logArgs = new StringBuilder();
Criteria c = getSeriesValueCriteriaFor(request, series, null, session, logArgs);
addChunkValuesToCriteria(c, chunkSize, currentRow, request, logArgs);
LOGGER.debug("QUERY getStreamingSeriesValuesFor({}): {}", logArgs.toString(), HibernateHelper.getSqlString(c));
return (List<AbstractValuedSeriesObservation<?>>) c.list();
>>>>>>>
StringBuilder logArgs = new StringBuilder();
Criteria c = getSeriesValueCriteriaFor(request, series, null, session, logArgs);
addChunkValuesToCriteria(c, chunkSize, currentRow, request, logArgs);
LOGGER.debug("QUERY getStreamingSeriesValuesFor({}): {}", logArgs.toString(), HibernateHelper.getSqlString(c));
return (List<DataEntity<?>>) c.list();
<<<<<<<
Criterion temporalFilterCriterion, Session session) throws OwsExceptionReport {
final Criteria c = getDefaultSeriesValueCriteriaFor(request, temporalFilterCriterion, session);
c.add(Restrictions.eq("s." + DatasetEntity.PROPERTY_ID, series));
=======
Criterion temporalFilterCriterion, Session session, StringBuilder logArgs) throws OwsExceptionReport {
final Criteria c = getDefaultSeriesValueCriteriaFor(request, temporalFilterCriterion, session, logArgs);
c.add(Restrictions.eq("s." + Series.ID, series));
>>>>>>>
Criterion temporalFilterCriterion, Session session, StringBuilder logArgs) throws OwsExceptionReport {
final Criteria c = getDefaultSeriesValueCriteriaFor(request, temporalFilterCriterion, session, logArgs);
c.add(Restrictions.eq("s." + DatasetEntity.PROPERTY_ID, series));
<<<<<<<
Criterion temporalFilterCriterion, Session session) throws OwsExceptionReport {
final Criteria c = getDefaultObservationCriteria(session).createAlias(DataEntity.PROPERTY_DATASET, "s");
=======
Criterion temporalFilterCriterion, Session session, StringBuilder logArgs) throws OwsExceptionReport {
final Criteria c = getDefaultObservationCriteria(session).createAlias(AbstractValuedSeriesObservation.SERIES, "s");
>>>>>>>
Criterion temporalFilterCriterion, Session session, StringBuilder logArgs) throws OwsExceptionReport {
final Criteria c = getDefaultObservationCriteria(session).createAlias(DataEntity.PROPERTY_DATASET, "s");
<<<<<<<
String logArgs = "request, dataset";
=======
logArgs.append("request, series");
>>>>>>>
logArgs.append("request, series");
<<<<<<<
checkAndAddSpatialFilteringProfileCriterion(c, getObsReq, session);
=======
checkAndAddSpatialFilteringProfileCriterion(c, getObsReq, session, logArgs);
if (CollectionHelper.isNotEmpty(getObsReq.getOfferings())) {
c.createCriteria(AbstractValuedSeriesObservation.OFFERINGS).add(Restrictions.in(Offering.IDENTIFIER, getObsReq.getOfferings()));
logArgs.append(", offerings");
}
>>>>>>>
checkAndAddSpatialFilteringProfileCriterion(c, getObsReq, session, logArgs);
<<<<<<<
Criteria c = getSeriesValueCriteriaFor(request, series, null, session);
UnitEntity unit = (UnitEntity) c.setMaxResults(1).setProjection(Projections.property(DatasetEntity.PROPERTY_UNIT)).uniqueResult();
if (unit != null && unit.isSetIdentifier()) {
=======
StringBuilder logArgs = new StringBuilder();
Criteria c = getSeriesValueCriteriaFor(request, series, null, session, logArgs);
Unit unit = (Unit) c.setMaxResults(1).setProjection(Projections.property(AbstractValuedSeriesObservation.UNIT)).uniqueResult();
if (unit != null && unit.isSetUnit()) {
>>>>>>>
StringBuilder logArgs = new StringBuilder();
Criteria c = getSeriesValueCriteriaFor(request, series, null, session, logArgs);
UnitEntity unit = (UnitEntity) c.setMaxResults(1).setProjection(Projections.property(DatasetEntity.PROPERTY_UNIT)).uniqueResult();
if (unit != null && unit.isSetIdentifier()) {
<<<<<<<
Criteria c = getSeriesValueCriteriaFor(request, series, null, session);
UnitEntity unit = (UnitEntity) c.setMaxResults(1).setProjection(Projections.property(DatasetEntity.PROPERTY_UNIT)).uniqueResult();
if (unit != null && unit.isSetIdentifier()) {
=======
StringBuilder logArgs = new StringBuilder();
Criteria c = getSeriesValueCriteriaFor(request, series, null, session,logArgs);
Unit unit = (Unit) c.setMaxResults(1).setProjection(Projections.property(AbstractValuedSeriesObservation.UNIT)).uniqueResult();
if (unit != null && unit.isSetUnit()) {
>>>>>>>
StringBuilder logArgs = new StringBuilder();
Criteria c = getSeriesValueCriteriaFor(request, series, null, session,logArgs);
UnitEntity unit = (UnitEntity) c.setMaxResults(1).setProjection(Projections.property(DatasetEntity.PROPERTY_UNIT)).uniqueResult();
if (unit != null && unit.isSetIdentifier()) { |
<<<<<<<
import org.orbisgis.sif.edition.*;
import org.osgi.framework.FrameworkUtil;
=======
import org.orbisgis.sif.edition.EditorDockable;
>>>>>>>
import org.orbisgis.sif.edition.*;
import org.osgi.framework.FrameworkUtil;
import org.orbisgis.sif.edition.EditorDockable;
<<<<<<<
private EditorManager editorManager;
=======
/** Factory for the creation of the ProcessEditor (UI of a process instance) */
>>>>>>>
<<<<<<<
private static final String TOOLBOX_REFERENCE = "orbistoolbox";
private static final String WPS_SCRIPT_FOLDER = "scripts";
private static boolean areScriptsCopied = false;
=======
/** OrbigGIS DockingManager. */
private DockingManager dockingManager;
/** OrbisGIS DataManager. */
private static DataManager dataManager;
/** OrbisGIS DriverFunctionContainer. */
private static DriverFunctionContainer driverFunctionContainer;
>>>>>>>
/** OrbigGIS DockingManager. */
private DockingManager dockingManager;
/** OrbisGIS DataManager. */
private static DataManager dataManager;
/** OrbisGIS DriverFunctionContainer. */
private static DriverFunctionContainer driverFunctionContainer;
<<<<<<<
mapIdPee = new HashMap<>();
if(!areScriptsCopied) {
setScriptFolder();
}
}
/**
* Sets all the default OrbisGIS WPS script into the script folder of the .OrbisGIS folder.
*/
private void setScriptFolder(){
//Sets the WPS script folder
File wpsScriptFolder = new File(coreWorkspace.getApplicationFolder(), WPS_SCRIPT_FOLDER);
if(!wpsScriptFolder.exists()){
if(!wpsScriptFolder.mkdir()){
LoggerFactory.getLogger(ToolBox.class).warn("Unable to find or create a script folder.\n" +
"No basic script will be available.");
}
}
if(wpsScriptFolder.exists() && wpsScriptFolder.isDirectory()){
try {
//Retrieve all the scripts url
String folderPath = ToolBox.class.getResource("scripts").getFile();
Enumeration<URL> enumUrl = FrameworkUtil.getBundle(ToolBox.class).findEntries(folderPath, "*", false);
//For each url
while(enumUrl.hasMoreElements()){
URL scriptUrl = enumUrl.nextElement();
String scriptPath = scriptUrl.getFile();
//Test if it's a groovy file
if(scriptPath.endsWith("."+GROOVY_EXTENSION)){
//If the script is already in the .OrbisGIS folder, remove it.
for(File existingFile : wpsScriptFolder.listFiles()){
if(existingFile.getName().endsWith(scriptPath) && existingFile.delete()){
LoggerFactory.getLogger(ToolBox.class).
warn("Replacing script "+existingFile.getName()+" by the default one");
}
}
//Copy the script into the .OrbisGIS folder.
OutputStream out = new FileOutputStream(
new File(wpsScriptFolder.getAbsolutePath(),
new File(scriptPath).getName()));
InputStream in = scriptUrl.openStream();
IOUtils.copy(in, out);
out.close();
in.close();
}
}
} catch (IOException e) {
LoggerFactory.getLogger(ToolBox.class).warn("Unable to copy the scripts. \n" +
"No basic script will be available. \n" +
"Error : "+e.getMessage());
}
}
areScriptsCopied = true;
addLocalSource(wpsScriptFolder);
=======
openEditorList = new ArrayList<>();
lee = new LogEditableElement();
le = null;
>>>>>>>
openEditorList = new ArrayList<>();
lee = new LogEditableElement();
le = null;
if(!areScriptsCopied) {
setScriptFolder();
}
}
/**
* Sets all the default OrbisGIS WPS script into the script folder of the .OrbisGIS folder.
*/
private void setScriptFolder(){
//Sets the WPS script folder
File wpsScriptFolder = new File(coreWorkspace.getApplicationFolder(), WPS_SCRIPT_FOLDER);
if(!wpsScriptFolder.exists()){
if(!wpsScriptFolder.mkdir()){
LoggerFactory.getLogger(ToolBox.class).warn("Unable to find or create a script folder.\n" +
"No basic script will be available.");
}
}
if(wpsScriptFolder.exists() && wpsScriptFolder.isDirectory()){
try {
//Retrieve all the scripts url
String folderPath = ToolBox.class.getResource("scripts").getFile();
Enumeration<URL> enumUrl = FrameworkUtil.getBundle(ToolBox.class).findEntries(folderPath, "*", false);
//For each url
while(enumUrl.hasMoreElements()){
URL scriptUrl = enumUrl.nextElement();
String scriptPath = scriptUrl.getFile();
//Test if it's a groovy file
if(scriptPath.endsWith("."+GROOVY_EXTENSION)){
//If the script is already in the .OrbisGIS folder, remove it.
for(File existingFile : wpsScriptFolder.listFiles()){
if(existingFile.getName().endsWith(scriptPath) && existingFile.delete()){
LoggerFactory.getLogger(ToolBox.class).
warn("Replacing script "+existingFile.getName()+" by the default one");
}
}
//Copy the script into the .OrbisGIS folder.
OutputStream out = new FileOutputStream(
new File(wpsScriptFolder.getAbsolutePath(),
new File(scriptPath).getName()));
InputStream in = scriptUrl.openStream();
IOUtils.copy(in, out);
out.close();
in.close();
}
}
} catch (IOException e) {
LoggerFactory.getLogger(ToolBox.class).warn("Unable to copy the scripts. \n" +
"No basic script will be available. \n" +
"Error : "+e.getMessage());
}
}
areScriptsCopied = true;
addLocalSource(wpsScriptFolder);
<<<<<<<
editorManager.removeEditorFactory(this);
=======
//Removes all the EditorDockable that were added
for(EditorDockable ed : openEditorList){
dockingManager.removeDockingPanel(ed.getDockingParameters().getName());
}
openEditorList = new ArrayList<>();
>>>>>>>
//Removes all the EditorDockable that were added
for(EditorDockable ed : openEditorList){
dockingManager.removeDockingPanel(ed.getDockingParameters().getName());
}
openEditorList = new ArrayList<>(); |
<<<<<<<
if (isActive) {
int enemyCount = numberOfRobots - 1;
=======
if (isActive && !robotPeer.isSentryRobot()) {
int enemyCount = robots - 1;
>>>>>>>
if (isActive && !robotPeer.isSentryRobot()) {
int enemyCount = numberOfRobots - 1; |
<<<<<<<
import com.googlecode.cqengine.index.Index;
=======
import com.googlecode.cqengine.attribute.SimpleNullableAttribute;
>>>>>>>
import com.googlecode.cqengine.attribute.SimpleNullableAttribute;
<<<<<<<
return DBQueries.countDistinct(query, tableName, connection); // eliminates duplicates
=======
boolean attributeHasAtMostOneValue = (attribute instanceof SimpleAttribute || attribute instanceof SimpleNullableAttribute);
boolean queryIsADisjointInQuery = query instanceof In && ((In) query).isDisjoint();
try {
if (queryIsADisjointInQuery || attributeHasAtMostOneValue) {
return DBQueries.count(query, tableName, connection); // No need to eliminates duplicates
}else{
return DBQueries.countDistinct(query, tableName, connection); // eliminates duplicates
}
} finally {
DBUtils.closeQuietly(connection);
}
>>>>>>>
return DBQueries.countDistinct(query, tableName, connection); // eliminates duplicates
boolean attributeHasAtMostOneValue = (attribute instanceof SimpleAttribute || attribute instanceof SimpleNullableAttribute);
boolean queryIsADisjointInQuery = query instanceof In && ((In) query).isDisjoint();
if (queryIsADisjointInQuery || attributeHasAtMostOneValue) {
return DBQueries.count(query, tableName, connection); // No need to eliminates duplicates
}else{
return DBQueries.countDistinct(query, tableName, connection); // eliminates duplicates
} |
<<<<<<<
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
=======
import com.googlecode.concurrenttrees.common.LazyIterator;
>>>>>>>
import com.googlecode.concurrenttrees.common.LazyIterator;
<<<<<<<
import com.googlecode.cqengine.index.Index;
=======
import com.googlecode.cqengine.index.hash.HashIndex;
>>>>>>>
import com.googlecode.cqengine.index.hash.HashIndex;
<<<<<<<
import com.googlecode.cqengine.index.hash.HashIndex;
import com.googlecode.cqengine.persistence.support.ObjectStore;
import com.googlecode.cqengine.persistence.support.ObjectStoreConnectionReusingSet;
=======
>>>>>>>
import com.googlecode.cqengine.index.hash.HashIndex;
import com.googlecode.cqengine.persistence.support.ObjectStore;
import com.googlecode.cqengine.persistence.support.ObjectStoreConnectionReusingSet;
<<<<<<<
@Override
public Index<O> getEffectiveIndex() {
return this;
}
@Override
public ResultSet<O> retrieve(final Query<O> query, final QueryOptions queryOptions) {
Class<?> queryClass = query.getClass();
if (queryClass.equals(Equal.class))
=======
@Override
public ResultSet<O> retrieve(final Query<O> query, final QueryOptions queryOptions) {
Class<?> queryClass = query.getClass();
if (queryClass.equals(Equal.class))
>>>>>>>
@Override
public Index<O> getEffectiveIndex() {
return this;
}
@Override
public ResultSet<O> retrieve(final Query<O> query, final QueryOptions queryOptions) {
Class<?> queryClass = query.getClass();
if (queryClass.equals(Equal.class)) |
<<<<<<<
@Get(uri = "/{type}/{name}{?features,lang,build,test,javaVersion}", produces = MediaType.APPLICATION_JSON)
=======
/**
* Previews the contents of a generated application..
* @param type The application type The application type
* @param name The name of the application The name of the application
* @param features The features The chosen features
* @param build The build type (optional, defaults to Gradle)
* @param test The test framework (optional, defaults to JUnit)
* @param lang The language (optional, defaults to Java)
* @return A preview of the application contents.
*/
@Get(uri = "/{type}/{name}{?features,lang,build,test}", produces = MediaType.APPLICATION_JSON)
>>>>>>>
/**
* Previews the contents of a generated application..
* @param type The application type The application type
* @param name The name of the application The name of the application
* @param features The features The chosen features
* @param build The build type (optional, defaults to Gradle)
* @param test The test framework (optional, defaults to JUnit)
* @param lang The language (optional, defaults to Java)
* @return A preview of the application contents.
*/
@Get(uri = "/{type}/{name}{?features,lang,build,test,javaVersion}", produces = MediaType.APPLICATION_JSON)
<<<<<<<
new Options(lang, test, build == null ? BuildTool.gradle : build, javaVersion == null ? 11 : javaVersion),
=======
new Options(lang, test, build == null ? BuildTool.GRADLE : build),
>>>>>>>
new Options(lang, test, build == null ? BuildTool.GRADLE : build, javaVersion == null ? 11 : javaVersion), |
<<<<<<<
=======
import riskyken.armourersWorkshop.client.gui.GuiEntityEquipment;
>>>>>>>
<<<<<<<
import riskyken.armourersWorkshop.client.gui.GuiMannequin;
import riskyken.armourersWorkshop.client.gui.GuiMiniArmourer;
import riskyken.armourersWorkshop.client.gui.GuiMiniArmourerBuilding;
import riskyken.armourersWorkshop.client.gui.GuiSkinWardrobe;
=======
import riskyken.armourersWorkshop.client.gui.GuiSkinWardrobe;
>>>>>>>
import riskyken.armourersWorkshop.client.gui.GuiSkinWardrobe;
<<<<<<<
import riskyken.armourersWorkshop.common.capability.IWardrobeCapability;
=======
import riskyken.armourersWorkshop.client.gui.globallibrary.GuiGlobalLibrary;
import riskyken.armourersWorkshop.client.gui.mannequin.GuiMannequin;
import riskyken.armourersWorkshop.client.gui.miniarmourer.GuiMiniArmourer;
import riskyken.armourersWorkshop.client.gui.miniarmourer.GuiMiniArmourerBuilding;
>>>>>>>
import riskyken.armourersWorkshop.client.gui.globallibrary.GuiGlobalLibrary;
import riskyken.armourersWorkshop.client.gui.mannequin.GuiMannequin;
import riskyken.armourersWorkshop.client.gui.miniarmourer.GuiMiniArmourer;
import riskyken.armourersWorkshop.client.gui.miniarmourer.GuiMiniArmourerBuilding;
import riskyken.armourersWorkshop.common.capability.IWardrobeCapability;
<<<<<<<
=======
import riskyken.armourersWorkshop.common.inventory.ContainerEntityEquipment;
import riskyken.armourersWorkshop.common.inventory.ContainerGlobalSkinLibrary;
>>>>>>>
import riskyken.armourersWorkshop.common.inventory.ContainerGlobalSkinLibrary;
<<<<<<<
=======
import riskyken.armourersWorkshop.common.skin.ExPropsPlayerEquipmentData;
import riskyken.armourersWorkshop.common.skin.entity.ExPropsEntityEquipmentData;
>>>>>>> |
<<<<<<<
import riskyken.armourersWorkshop.common.capability.IWardrobeCapability;
import riskyken.armourersWorkshop.common.config.ConfigHandler;
=======
import riskyken.armourersWorkshop.common.config.ConfigHandlerClient;
>>>>>>>
import riskyken.armourersWorkshop.common.capability.IWardrobeCapability;
import riskyken.armourersWorkshop.common.config.ConfigHandlerClient;
<<<<<<<
public void onRenderSpecialsPost(RenderPlayerEvent.Post event) {
if (ClientProxy.useAttachedModelRender()) {
=======
public void onRenderSpecialsPost(RenderPlayerEvent.Specials.Post event) {
if (ClientProxy.getSkinRenderType() != SkinRenderType.RENDER_EVENT) {
>>>>>>>
public void onRenderSpecialsPost(RenderPlayerEvent.Post event) {
if (ClientProxy.getSkinRenderType() != SkinRenderType.RENDER_EVENT) {
<<<<<<<
GlStateManager.pushMatrix();
GlStateManager.enableCull();
GlStateManager.enableBlendProfile(Profile.TRANSPARENT_MODEL);
GL11.glTranslated(0, 22 * 0.0625F, 0);
GL11.glScalef(1F, -1F, -1F);
GL11.glRotatef((player.renderYawOffset - player.prevRenderYawOffset) * event.getPartialRenderTick() + player.renderYawOffset, 0, 1, 0);
=======
GL11.glPushMatrix();
GL11.glEnable(GL11.GL_CULL_FACE);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GL11.glEnable(GL11.GL_BLEND);
>>>>>>>
GlStateManager.pushMatrix();
GlStateManager.enableCull();
GlStateManager.enableBlendProfile(Profile.TRANSPARENT_MODEL);
GL11.glTranslated(0, 22 * 0.0625F, 0);
GL11.glScalef(1F, -1F, -1F);
GL11.glRotatef((player.renderYawOffset - player.prevRenderYawOffset) * event.getPartialRenderTick() + player.renderYawOffset, 0, 1, 0);
<<<<<<<
customHead.render(player, render.getMainModel(), data, false, dye, extraColours, false, distance);
=======
customHead.render(player, render.modelBipedMain, data, false, dye, extraColours, false, distance, true);
>>>>>>>
customHead.render(player, render.getMainModel(), data, false, dye, extraColours, false, distance, true);
<<<<<<<
customChest.render(player, render.getMainModel(), data, false, dye, extraColours, false, distance);
=======
customChest.render(player, render.modelBipedMain, data, false, dye, extraColours, false, distance, true);
>>>>>>>
customChest.render(player, render.getMainModel(), data, false, dye, extraColours, false, distance, true);
<<<<<<<
customLegs.render(player, render.getMainModel(), data, false, dye, extraColours, false, distance);
=======
customLegs.render(player, render.modelBipedMain, data, false, dye, extraColours, false, distance, true);
>>>>>>>
customLegs.render(player, render.getMainModel(), data, false, dye, extraColours, false, distance, true);
<<<<<<<
customSkirt.render(player, render.getMainModel(), data, false, dye, extraColours, false, distance);
=======
customSkirt.render(player, render.modelBipedMain, data, false, dye, extraColours, false, distance, true);
>>>>>>>
customSkirt.render(player, render.getMainModel(), data, false, dye, extraColours, false, distance, true); |
<<<<<<<
import riskyken.armourersWorkshop.common.skin.SkinDataCache;
=======
import riskyken.armourersWorkshop.common.skin.ExPropsPlayerEquipmentData;
import riskyken.armourersWorkshop.common.skin.cache.CommonSkinCache;
>>>>>>>
import riskyken.armourersWorkshop.common.skin.cache.CommonSkinCache; |
<<<<<<<
String authorName = player.getName();
//authorName = "";
String customName = name;
=======
>>>>>>>
<<<<<<<
armourItemData = ArmourerWorldHelper.saveSkinFromWorld(worldObj, player, skinType, authorName, customName,
tags, paintData, pos.add(0, HEIGHT_OFFSET, 0), direction);
=======
armourItemData = ArmourerWorldHelper.saveSkinFromWorld(worldObj, skinProps, skinType,
paintData, xCoord, yCoord + HEIGHT_OFFSET, zCoord, direction);
>>>>>>>
armourItemData = ArmourerWorldHelper.saveSkinFromWorld(worldObj, skinProps, skinType,
paintData, pos.add(0, HEIGHT_OFFSET, 0), direction);
<<<<<<<
syncWithClients();
=======
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
loadedArmourItem = true;
>>>>>>>
syncWithClients();
loadedArmourItem = true; |
<<<<<<<
EntityPlayerSP player = Minecraft.getMinecraft().thePlayer;
if (player.getDistance(x, y, z) > ConfigHandler.maxSkinRenderDistance) {
=======
EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer;
if (player.getDistance(x, y, z) > ConfigHandlerClient.maxSkinRenderDistance) {
>>>>>>>
EntityPlayerSP player = Minecraft.getMinecraft().thePlayer;
if (player.getDistance(x, y, z) > ConfigHandlerClient.maxSkinRenderDistance) { |
<<<<<<<
import net.minecraft.block.state.IBlockState;
=======
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.EntityLivingBase;
>>>>>>>
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase;
<<<<<<<
super(LibBlockNames.SKINNABLE, Material.IRON, SoundType.METAL, false);
setLightOpacity(0);
=======
this(LibBlockNames.SKINNABLE);
}
public BlockSkinnable(String name) {
super(name, Material.iron, soundTypeMetal, false);
>>>>>>>
this(LibBlockNames.SKINNABLE);
}
public BlockSkinnable(String name) {
super(name, Material.IRON, SoundType.METAL, false);
setLightOpacity(0);
<<<<<<<
public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) {
TileEntity te = world.getTileEntity(pos);
=======
public boolean isLadder(IBlockAccess world, int x, int y, int z, EntityLivingBase entity) {
TileEntity te = world.getTileEntity(x, y, z);
if (te != null && te instanceof TileEntitySkinnable) {
SkinPointer skinPointer = ((TileEntitySkinnable)te).getSkinPointer();
if (skinPointer != null) {
Skin skin = SkinUtils.getSkinDetectSide(skinPointer, true, true);
if (skin != null) {
return skin.getProperties().getPropertyBoolean(Skin.KEY_BLOCK_LADDER, false);
}
} else {
ModLogger.log(Level.WARN, String.format("Block skin at x:%d y:%d z:%d had no skin data.", x, y, z));
}
}
return false;
}
@Override
public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) {
TileEntity te = world.getTileEntity(x, y, z);
>>>>>>>
public boolean isLadder(IBlockState state, IBlockAccess world, BlockPos pos, EntityLivingBase entity) {
TileEntity te = world.getTileEntity(pos);
if (te != null && te instanceof TileEntitySkinnable) {
SkinPointer skinPointer = ((TileEntitySkinnable)te).getSkinPointer();
if (skinPointer != null) {
Skin skin = SkinUtils.getSkinDetectSide(skinPointer, true, true);
if (skin != null) {
return skin.getProperties().getPropertyBoolean(Skin.KEY_BLOCK_LADDER, false);
}
} else {
ModLogger.log(Level.WARN, String.format("Block skin at %s had no skin data.", pos.toString()));
}
}
return false;
}
@Override
public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) {
TileEntity te = world.getTileEntity(pos); |
<<<<<<<
ItemStackRenderHelper.renderItemAsArmourModel(stack, SkinTypeRegistry.skinBow, false);
=======
ItemStackRenderHelper.renderItemAsArmourModel(stack);
>>>>>>>
ItemStackRenderHelper.renderItemAsArmourModel(stack, false); |
<<<<<<<
String version;
=======
String homeDir = getHomeDirFromCommandLine(commandLine);
String version = null;
>>>>>>>
String homeDir = getHomeDirFromCommandLine(commandLine);
String version; |
<<<<<<<
import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.HTMLFlow;
import com.smartgwt.client.widgets.Img;
import com.smartgwt.client.widgets.events.ClickEvent;
import com.smartgwt.client.widgets.events.ClickHandler;
=======
import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.HTMLFlow;
import com.smartgwt.client.widgets.Img;
import com.smartgwt.client.widgets.events.ClickEvent;
import com.smartgwt.client.widgets.events.ClickHandler;
import com.smartgwt.client.widgets.layout.HLayout;
>>>>>>>
import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.HTMLFlow;
import com.smartgwt.client.widgets.Img;
import com.smartgwt.client.widgets.events.ClickEvent;
import com.smartgwt.client.widgets.events.ClickHandler;
<<<<<<<
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
=======
>>>>>>>
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
<<<<<<<
this.title.setContents("<span class=\"SectionHeader\">" + resource.getName()
+ "</span> <span class=\"subtitle\">" + resource.getResourceType().getName() + "</span>");
=======
this.title.setContents("<span class=\"SectionHeader\">" + resource.getName() + "</span> <span class=\"subtitle\">" + resource.getResourceType().getName() + "</span>");
>>>>>>>
this.title.setContents("<span class=\"SectionHeader\">" + resource.getName()
+ "</span> <span class=\"subtitle\">" + resource.getResourceType().getName() + "</span>");
<<<<<<<
this.availabilityImage.setSrc("resources/availability_"
+ (resource.getCurrentAvailability().getAvailabilityType() == AvailabilityType.UP ? "green" : "red")
+ "_24.png");
=======
this.availabilityImage.setSrc("resources/availability_" +
(resource.getCurrentAvailability().getAvailabilityType() == AvailabilityType.UP ? "green" : "red") +
"_24.png");
>>>>>>>
this.availabilityImage.setSrc("resources/availability_"
+ (resource.getCurrentAvailability().getAvailabilityType() == AvailabilityType.UP ? "green" : "red")
+ "_24.png");
<<<<<<<
String avail = (resource.getCurrentAvailability() != null && resource.getCurrentAvailability()
.getAvailabilityType() != null) ? (resource.getCurrentAvailability().getAvailabilityType().name()
.toLowerCase()) : "down";
badge.setSrc("types/" + category + "_" + avail + "_24.png");
=======
String avail = (resource.getCurrentAvailability() != null && resource.getCurrentAvailability().getAvailabilityType() != null)
? (resource.getCurrentAvailability().getAvailabilityType().name().toLowerCase()) : "down";
badge.setSrc("types/" + category + "_" + avail + "_24.png");
>>>>>>>
String avail = (resource.getCurrentAvailability() != null && resource.getCurrentAvailability()
.getAvailabilityType() != null) ? (resource.getCurrentAvailability().getAvailabilityType().name()
.toLowerCase()) : "down";
badge.setSrc("types/" + category + "_" + avail + "_24.png"); |
<<<<<<<
=======
import io.penguinstats.util.exception.BusinessException;
import io.penguinstats.util.validator.Validator;
>>>>>>>
import io.penguinstats.util.exception.BusinessException;
import io.penguinstats.util.validator.Validator;
<<<<<<<
=======
import java.io.UnsupportedEncodingException;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
>>>>>>>
import java.io.UnsupportedEncodingException;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
<<<<<<<
@Autowired
private ItemDropService itemDropService;
@Autowired
private UserService userService;
@Autowired
private StageService stageService;
@Autowired
private CookieUtil cookieUtil;
@Autowired
private ValidatorFacade validatorFacade;
@ApiOperation(value = "Submit a drop report",
notes = "Detailed instructions can be found at: https://developer.penguin-stats.io/docs/report-api")
@PostMapping
public ResponseEntity<SingleReportResponse> saveSingleReport(
@Valid @RequestBody SingleReportRequest singleReportRequest, HttpServletRequest request,
HttpServletResponse response) throws Exception {
String userID = cookieUtil.readUserIDFromCookie(request);
if (userID == null) {
userID = userService.createNewUser(IpUtil.getIpAddr(request));
}
try {
CookieUtil.setUserIDCookie(response, userID);
} catch (UnsupportedEncodingException e) {
log.error("Error in handleUserIDFromCookie: ", e);
}
log.info("user " + userID + " POST /report\n"
+ Objects.requireNonNull(JSONUtil.convertObjectToJSONObject(singleReportRequest)).toString(2));
String stageId = singleReportRequest.getStageId();
String source = singleReportRequest.getSource();
String version = singleReportRequest.getVersion();
Server server = singleReportRequest.getServer();
Long timestamp = System.currentTimeMillis();
String ip = IpUtil.getIpAddr(request);
Integer times = 1;
// Validation
ValidatorContext context = new ValidatorContext().setStageId(stageId).setServer(server).setTimes(times)
.setDrops(singleReportRequest.getDrops()).setTimestamp(timestamp).setIp(ip).setUserID(userID);
Boolean isReliable = validatorFacade.doValid(context);
// Combine typed drop list into untyped drop list. Sum up quantities for each item.
Map<String, Integer> itemIdQuantityMap = singleReportRequest.getDrops().stream()
.collect(groupingBy(TypedDrop::getItemId, summingInt(TypedDrop::getQuantity)));
List<Drop> drops = itemIdQuantityMap.entrySet().stream().map(e -> new Drop(e.getKey(), e.getValue()))
.collect(toList());
// For gacha type stage, the # of times should be the sum of quantities.
Stage stage = stageService.getStageByStageId(stageId);
if (stage != null) {
Boolean isGacha = stage.getIsGacha();
if (isGacha != null && isGacha) {
times = 0;
for (Drop drop : drops) {
times += drop.getQuantity();
}
}
}
ItemDrop itemDrop = new ItemDrop().setStageId(stageId).setServer(server).setTimes(times).setDrops(drops)
.setTimestamp(timestamp).setIp(ip).setIsReliable(isReliable).setIsDeleted(false).setSource(source)
.setVersion(version).setUserID(userID);
itemDropService.saveItemDrop(itemDrop);
String reportHash = HashUtil.getHash(itemDrop.getId().toString());
log.debug("Saving itemDrop: \n" + JSONUtil.convertObjectToJSONObject(itemDrop.toNoIDView()).toString(2));
return new ResponseEntity<SingleReportResponse>(new SingleReportResponse(reportHash), HttpStatus.CREATED);
}
@ApiOperation(value = "Recall the last Report",
notes = "Recall the last Drop Report by providing its hash value. "
+ "Notice that you can only recall the *last* report, "
+ "which in addition will also expire after 24 hours.")
@PostMapping(path = "/recall")
public ResponseEntity<String> recallPersonalReport(
@Valid @RequestBody RecallLastReportRequest recallLastReportRequest, HttpServletRequest request) throws Exception {
String userID = cookieUtil.readUserIDFromCookie(request);
if (userID == null) {
log.error("Error in recallPersonalReport: Cannot read user ID");
return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
}
log.info("user " + userID + " POST /report/recall\n");
itemDropService.recallItemDrop(userID, recallLastReportRequest.getReportHash());
return new ResponseEntity<>(HttpStatus.OK);
}
=======
@Autowired
private ItemDropService itemDropService;
@Autowired
private UserService userService;
@Autowired
private StageService stageService;
@Autowired
private CookieUtil cookieUtil;
@Autowired
private ValidatorFactory validatorFactory;
@ApiOperation(value = "Submit a drop report",
notes = "Detailed instructions can be found at: https://developer.penguin-stats.io/docs/report-api")
@PostMapping
public ResponseEntity<SingleReportResponse> saveSingleReport(
@Valid @RequestBody SingleReportRequest singleReportRequest, HttpServletRequest request,
HttpServletResponse response) throws Exception {
String userID = cookieUtil.readUserIDFromCookie(request);
if (userID == null) {
userID = userService.createNewUser(IpUtil.getIpAddr(request));
}
try {
CookieUtil.setUserIDCookie(response, userID);
} catch (UnsupportedEncodingException e) {
log.error("Error in handleUserIDFromCookie: uid={}", userID);
}
log.info("user " + userID + " POST /report\n"
+ Objects.requireNonNull(JSONUtil.convertObjectToJSONObject(singleReportRequest)).toString(2));
String stageId = singleReportRequest.getStageId();
String source = singleReportRequest.getSource();
String version = singleReportRequest.getVersion();
Server server = singleReportRequest.getServer();
Long timestamp = System.currentTimeMillis();
String ip = IpUtil.getIpAddr(request);
Integer times = 1;
Boolean isReliable = true;
// Validation
ValidatorType[] validatorTypes = new ValidatorType[]{STAGE_TIME, USER, IP, DROPS};
ValidatorContext context = new ValidatorContext().setStageId(stageId).setServer(server).setTimes(times)
.setDrops(singleReportRequest.getDrops()).setTimestamp(timestamp).setIp(ip).setUserID(userID);
for (ValidatorType validatorType : validatorTypes) {
Validator validator = validatorFactory.getValidator(validatorType, context);
if (!validator.validate()) {
isReliable = false;
log.warn("Failed to pass " + validatorType + " check.");
break;
} else {
log.debug("Pass " + validatorType + " check.");
}
}
// Combine typed drop list into untyped drop list. Sum up quantities for each item.
Map<String, Integer> itemIdQuantityMap = singleReportRequest.getDrops().stream()
.collect(groupingBy(TypedDrop::getItemId, summingInt(TypedDrop::getQuantity)));
List<Drop> drops = itemIdQuantityMap.entrySet().stream().map(e -> new Drop(e.getKey(), e.getValue()))
.collect(toList());
// For gacha type stage, the # of times should be the sum of quantities.
Stage stage = stageService.getStageByStageId(stageId);
if (stage != null) {
Boolean isGacha = stage.getIsGacha();
if (isGacha != null && isGacha) {
times = 0;
for (Drop drop : drops) {
times += drop.getQuantity();
}
}
}
ItemDrop itemDrop = new ItemDrop().setStageId(stageId).setServer(server).setTimes(times).setDrops(drops)
.setTimestamp(timestamp).setIp(ip).setIsReliable(isReliable).setIsDeleted(false).setSource(source)
.setVersion(version).setUserID(userID);
itemDropService.saveItemDrop(itemDrop);
String reportHash = HashUtil.getHash(itemDrop.getId().toString());
log.debug("Saving itemDrop: \n" + JSONUtil.convertObjectToJSONObject(itemDrop.toNoIDView()).toString(2));
return new ResponseEntity<SingleReportResponse>(new SingleReportResponse(reportHash), HttpStatus.CREATED);
}
@ApiOperation(value = "Recall the last Report",
notes = "Recall the last Drop Report by providing its hash value. "
+ "Notice that you can only recall the *last* report, "
+ "which in addition will also expire after 24 hours.")
@PostMapping(path = "/recall")
public ResponseEntity<String> recallPersonalReport(
@Valid @RequestBody RecallLastReportRequest recallLastReportRequest, HttpServletRequest request) throws Exception {
String userID = cookieUtil.readUserIDFromCookie(request);
if (userID == null) {
log.error("Error in recallPersonalReport: Cannot read user ID");
throw new BusinessException(ErrorCode.BUSINESS_EXCEPTION, "Cannot read user ID");
}
log.info("user " + userID + " POST /report/recall\n");
itemDropService.recallItemDrop(userID, recallLastReportRequest.getReportHash());
return new ResponseEntity<>(HttpStatus.OK);
}
>>>>>>>
@Autowired
private ItemDropService itemDropService;
@Autowired
private UserService userService;
@Autowired
private StageService stageService;
@Autowired
private CookieUtil cookieUtil;
@Autowired
private ValidatorFacade validatorFacade;
@ApiOperation(value = "Submit a drop report",
notes = "Detailed instructions can be found at: https://developer.penguin-stats.io/docs/report-api")
@PostMapping
public ResponseEntity<SingleReportResponse> saveSingleReport(
@Valid @RequestBody SingleReportRequest singleReportRequest, HttpServletRequest request,
HttpServletResponse response) throws Exception {
String userID = cookieUtil.readUserIDFromCookie(request);
if (userID == null) {
userID = userService.createNewUser(IpUtil.getIpAddr(request));
}
try {
CookieUtil.setUserIDCookie(response, userID);
} catch (UnsupportedEncodingException e) {
log.error("Error in handleUserIDFromCookie: uid={}", userID);
}
log.info("user " + userID + " POST /report\n"
+ Objects.requireNonNull(JSONUtil.convertObjectToJSONObject(singleReportRequest)).toString(2));
String stageId = singleReportRequest.getStageId();
String source = singleReportRequest.getSource();
String version = singleReportRequest.getVersion();
Server server = singleReportRequest.getServer();
Long timestamp = System.currentTimeMillis();
String ip = IpUtil.getIpAddr(request);
Integer times = 1;
// Validation
ValidatorContext context = new ValidatorContext().setStageId(stageId).setServer(server).setTimes(times)
.setDrops(singleReportRequest.getDrops()).setTimestamp(timestamp).setIp(ip).setUserID(userID);
Boolean isReliable = validatorFacade.doValid(context);
// Combine typed drop list into untyped drop list. Sum up quantities for each item.
Map<String, Integer> itemIdQuantityMap = singleReportRequest.getDrops().stream()
.collect(groupingBy(TypedDrop::getItemId, summingInt(TypedDrop::getQuantity)));
List<Drop> drops = itemIdQuantityMap.entrySet().stream().map(e -> new Drop(e.getKey(), e.getValue()))
.collect(toList());
// For gacha type stage, the # of times should be the sum of quantities.
Stage stage = stageService.getStageByStageId(stageId);
if (stage != null) {
Boolean isGacha = stage.getIsGacha();
if (isGacha != null && isGacha) {
times = 0;
for (Drop drop : drops) {
times += drop.getQuantity();
}
}
}
ItemDrop itemDrop = new ItemDrop().setStageId(stageId).setServer(server).setTimes(times).setDrops(drops)
.setTimestamp(timestamp).setIp(ip).setIsReliable(isReliable).setIsDeleted(false).setSource(source)
.setVersion(version).setUserID(userID);
itemDropService.saveItemDrop(itemDrop);
String reportHash = HashUtil.getHash(itemDrop.getId().toString());
log.debug("Saving itemDrop: \n" + JSONUtil.convertObjectToJSONObject(itemDrop.toNoIDView()).toString(2));
return new ResponseEntity<SingleReportResponse>(new SingleReportResponse(reportHash), HttpStatus.CREATED);
}
@ApiOperation(value = "Recall the last Report",
notes = "Recall the last Drop Report by providing its hash value. "
+ "Notice that you can only recall the *last* report, "
+ "which in addition will also expire after 24 hours.")
@PostMapping(path = "/recall")
public ResponseEntity<String> recallPersonalReport(
@Valid @RequestBody RecallLastReportRequest recallLastReportRequest, HttpServletRequest request) throws Exception {
String userID = cookieUtil.readUserIDFromCookie(request);
if (userID == null) {
log.error("Error in recallPersonalReport: Cannot read user ID");
throw new BusinessException(ErrorCode.BUSINESS_EXCEPTION, "Cannot read user ID");
}
log.info("user " + userID + " POST /report/recall\n");
itemDropService.recallItemDrop(userID, recallLastReportRequest.getReportHash());
return new ResponseEntity<>(HttpStatus.OK);
} |
<<<<<<<
int purgeOrphanedDriftFiles(Subject subject, long purgeMillis);
=======
int purgeOrphanedDriftFiles(Subject subject);
/**
* Returns the content associated with the specified hash as a string
*
* @param hash The hash the uniquely identifies the requested content
* @return The content as a string
*/
String getDriftFileBits(String hash);
>>>>>>>
int purgeOrphanedDriftFiles(Subject subject, long purgeMillis);
/**
* Returns the content associated with the specified hash as a string
*
* @param hash The hash the uniquely identifies the requested content
* @return The content as a string
*/
String getDriftFileBits(String hash); |
<<<<<<<
import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedIButton;
import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout;
=======
import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableIButton;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
>>>>>>>
import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedIButton;
import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; |
<<<<<<<
import org.rhq.core.domain.content.composite.PackageAndLatestVersionComposite;
import org.rhq.core.domain.content.composite.PackageTypeAndVersionFormatComposite;
import org.rhq.core.domain.criteria.PackageCriteria;
=======
import org.rhq.core.domain.criteria.InstalledPackageHistoryCriteria;
>>>>>>>
import org.rhq.core.domain.content.composite.PackageAndLatestVersionComposite;
import org.rhq.core.domain.content.composite.PackageTypeAndVersionFormatComposite;
import org.rhq.core.domain.criteria.PackageCriteria;
import org.rhq.core.domain.criteria.InstalledPackageHistoryCriteria; |
<<<<<<<
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.D3GraphListView;
=======
import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractD3GraphListView;
import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.D3GroupGraphListView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.D3GraphListView;
>>>>>>>
import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractD3GraphListView;
<<<<<<<
public abstract class AbstractTwoLevelTabSetView<T, U extends Layout> extends EnhancedVLayout implements
=======
public abstract class AbstractTwoLevelTabSetView<T, U extends Layout, V extends AbstractD3GraphListView> extends LocatableVLayout implements
>>>>>>>
public abstract class AbstractTwoLevelTabSetView<T, U extends Layout, V extends AbstractD3GraphListView> extends
EnhancedVLayout implements
<<<<<<<
protected D3GraphListView d3GraphListView;
=======
protected V graphListView;
>>>>>>>
protected V graphListView;
<<<<<<<
if(null != d3GraphListView){
d3GraphListView.redrawGraphs();
}
=======
if(null != graphListView){
graphListView.redrawGraphs();
}
>>>>>>>
if(null != graphListView){
graphListView.redrawGraphs();
} |
<<<<<<<
public void load() throws AugeasTreeException {
config.loadFiles();
augeas = new Augeas(config.getRootPath(), config.getLoadPath(), config.getMode());
=======
public void load() throws AugeasTreeException, AugeasException {
>>>>>>>
public void load() throws AugeasTreeException {
<<<<<<<
}
}catch(Exception e){
log.error("Loading of augeas failed",e);
throw new AugeasTreeException(e);
=======
augeas.load();
} catch (NoClassDefFoundError e) {
throw new AugeasException("Failed to initialize Augeas. It is probably not installed.", e);
} catch (Exception e) {
throw new AugeasException(e);
>>>>>>>
augeas.load();
} catch (NoClassDefFoundError e) {
throw new AugeasException("Failed to initialize Augeas. It is probably not installed.", e);
} catch (Exception e) {
throw new AugeasException(e); |
<<<<<<<
=======
import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.layout.VLayout;
import com.smartgwt.client.widgets.tab.Tab;
>>>>>>>
import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.tab.Tab;
<<<<<<<
=======
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.traits.TraitsView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation.OperationHistoryView;
>>>>>>>
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation.OperationHistoryView;
<<<<<<<
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
=======
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
>>>>>>>
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
<<<<<<<
public class ResourceDetailView extends LocatableVLayout implements BookmarkableView, ResourceSelectListener,
TwoLevelTabSelectedHandler {
=======
public class ResourceDetailView extends VLayout implements BookmarkableView,
TwoLevelTabSelectedHandler {
>>>>>>>
public class ResourceDetailView extends LocatableVLayout implements BookmarkableView, TwoLevelTabSelectedHandler {
<<<<<<<
public ResourceDetailView(String locatorId) {
super(locatorId);
}
=======
private String tabName;
private String subTabName;
>>>>>>>
private String tabName;
private String subTabName;
public ResourceDetailView(String locatorId) {
super(locatorId);
}
<<<<<<<
this.opHistory.setCanvas(new FullHTMLPane("/rhq/resource/operation/resourceOperationHistory-plain.xhtml?id="
+ resource.getId()));
this.opSched.setCanvas(new FullHTMLPane("/rhq/resource/operation/resourceOperationSchedules-plain.xhtml?id="
+ resource.getId()));
operationsTab.updateSubTab(this.opHistory);
operationsTab.updateSubTab(this.opSched);
=======
// operationsTab.updateSubTab("History", new FullHTMLPane(
// "/rhq/resource/operation/resourceOperationHistory-plain.xhtml?id=" + resource.getId()));
operationsTab.updateSubTab("Scheduled", new FullHTMLPane(
"/rhq/resource/operation/resourceOperationSchedules-plain.xhtml?id=" + resource.getId()));
configurationTab.updateSubTab("Current", new ResourceConfigurationEditView(resource));
configurationTab.updateSubTab("History", ConfigurationHistoryView.getHistoryOf(resource.getId()));
>>>>>>>
this.opSched.setCanvas(new FullHTMLPane("/rhq/resource/operation/resourceOperationSchedules-plain.xhtml?id="
+ resource.getId()));
operationsTab.updateSubTab(this.opHistory);
operationsTab.updateSubTab(this.opSched);
<<<<<<<
this.alertHistory.setCanvas(new FullHTMLPane("/rhq/resource/alert/listAlertHistory-plain.xhtml?id="
+ resource.getId()));
this.alertDef.setCanvas(new ResourceAlertDefinitionsView(alertsTab.getLocatorId(), resource));
this.alertDelete.setCanvas(new FullHTMLPane("/rhq/resource/alert/listAlertDefinitions-plain.xhtml?id="
+ resource.getId()));
alertsTab.updateSubTab(this.alertHistory);
alertsTab.updateSubTab(this.alertDef);
alertsTab.updateSubTab(this.alertDelete);
this.configCurrent.setCanvas(new ResourceConfigurationEditView(resource));
this.configHistory.setCanvas(ConfigurationHistoryView.getHistoryOf(configurationTab.getLocatorId(), resource
.getId()));
configurationTab.updateSubTab(this.configCurrent);
configurationTab.updateSubTab(this.configHistory);
=======
alertsTab.updateSubTab("History", new FullHTMLPane("/rhq/resource/alert/listAlertHistory-plain.xhtml?id="
+ resource.getId()));
alertsTab.updateSubTab("Definitions", new ResourceAlertDefinitionsView(resource));
alertsTab.updateSubTab("DELETEME", new FullHTMLPane("/rhq/resource/alert/listAlertDefinitions-plain.xhtml?id="
+ resource.getId()));
>>>>>>>
this.alertHistory.setCanvas(new FullHTMLPane("/rhq/resource/alert/listAlertHistory-plain.xhtml?id="
+ resource.getId()));
this.alertDef.setCanvas(new ResourceAlertDefinitionsView(alertsTab.getLocatorId(), resource));
this.alertDelete.setCanvas(new FullHTMLPane("/rhq/resource/alert/listAlertDefinitions-plain.xhtml?id="
+ resource.getId()));
alertsTab.updateSubTab(this.alertHistory);
alertsTab.updateSubTab(this.alertDef);
alertsTab.updateSubTab(this.alertDelete);
this.configCurrent.setCanvas(new ResourceConfigurationEditView(resource));
this.configHistory.setCanvas(ConfigurationHistoryView.getHistoryOf(configurationTab.getLocatorId(), resource
.getId()));
configurationTab.updateSubTab(this.configCurrent);
configurationTab.updateSubTab(this.configHistory);
<<<<<<<
this.eventHistory
.setCanvas(new FullHTMLPane("/rhq/resource/events/history-plain.xhtml?id=" + resource.getId()));
eventsTab.updateSubTab(this.eventHistory);
this.contentDeployed
.setCanvas(new FullHTMLPane("/rhq/resource/content/view-plain.xhtml?id=" + resource.getId()));
this.contentNew.setCanvas(new FullHTMLPane("/rhq/resource/content/deploy-plain.xhtml?id=" + resource.getId()));
this.contentSubscrip.setCanvas(new FullHTMLPane("/rhq/resource/content/subscription-plain.xhtml?id="
+ resource.getId()));
this.contentHistory.setCanvas(new FullHTMLPane("/rhq/resource/content/history-plain.xhtml?id="
+ resource.getId()));
contentTab.updateSubTab(contentDeployed);
contentTab.updateSubTab(contentNew);
contentTab.updateSubTab(contentSubscrip);
contentTab.updateSubTab(contentHistory);
=======
eventsTab.updateSubTab("History", new FullHTMLPane("/rhq/resource/events/history-plain.xhtml?id="
+ resource.getId()));
contentTab.updateSubTab("Deployed", new FullHTMLPane("/rhq/resource/content/view-plain.xhtml?id="
+ resource.getId()));
contentTab.updateSubTab("New", new FullHTMLPane("/rhq/resource/content/deploy-plain.xhtml?id="
+ resource.getId()));
contentTab.updateSubTab("Subscriptions", new FullHTMLPane("/rhq/resource/content/subscription-plain.xhtml?id="
+ resource.getId()));
contentTab.updateSubTab("History", new FullHTMLPane("/rhq/resource/content/history-plain.xhtml?id="
+ resource.getId()));
>>>>>>>
this.eventHistory
.setCanvas(new FullHTMLPane("/rhq/resource/events/history-plain.xhtml?id=" + resource.getId()));
eventsTab.updateSubTab(this.eventHistory);
this.contentDeployed
.setCanvas(new FullHTMLPane("/rhq/resource/content/view-plain.xhtml?id=" + resource.getId()));
this.contentNew.setCanvas(new FullHTMLPane("/rhq/resource/content/deploy-plain.xhtml?id=" + resource.getId()));
this.contentSubscrip.setCanvas(new FullHTMLPane("/rhq/resource/content/subscription-plain.xhtml?id="
+ resource.getId()));
this.contentHistory.setCanvas(new FullHTMLPane("/rhq/resource/content/history-plain.xhtml?id="
+ resource.getId()));
contentTab.updateSubTab(contentDeployed);
contentTab.updateSubTab(contentNew);
contentTab.updateSubTab(contentSubscrip);
contentTab.updateSubTab(contentHistory); |
<<<<<<<
currentlyDisplayed = subTab;
currentlySelected = locatorId;
=======
// currentlyDisplayed = subtabs.get(title);
currentlySelected = title;
>>>>>>>
// currentlyDisplayed = subTab;
currentlySelected = locatorId;
<<<<<<<
private void draw(SubTab subTab) {
// if (currentlyDisplayed != null) {
// currentlyDisplayed.getCanvas().hide();
// // removeMember(currentlyDisplayed);
// }
=======
private void draw(Canvas canvas) {
if (currentlyDisplayed != null && currentlyDisplayed != canvas) {
try {
currentlyDisplayed.hide();
} catch (Exception e) { } // ignore this
}
>>>>>>>
private void draw(SubTab subTab) {
if (currentlyDisplayed != null && currentlyDisplayed.getCanvas() != subTab.getCanvas()) {
try {
currentlyDisplayed.getCanvas().hide();
} catch (Exception e) {
// ignore this
}
} |
<<<<<<<
form = new OverviewForm(extendLocatorId("form"), resourceComposite);
LocatableDynamicForm currentAgentInfo = new LocatableDynamicForm(extendLocatorId("Agent_Info"));
populateAgentInfo(resourceComposite.getResource().getId(), currentAgentInfo);
errorsGrid = new Table(extendLocatorId("errors"), "Detected errors", null, null,
new String[] { ResourceErrorsDataSource.DETAIL_ID });
=======
OverviewForm form = new OverviewForm(extendLocatorId("form"), resourceComposite);
errorsGrid = new Table(extendLocatorId("errors"), MSG.view_summaryOverview_header_detectedErrors(), null, null, new String[]
{ ResourceErrorsDataSource.Field.DETAIL });
>>>>>>>
OverviewForm form = new OverviewForm(extendLocatorId("form"), resourceComposite);
LocatableDynamicForm currentAgentInfo = new LocatableDynamicForm(extendLocatorId("Agent_Info"));
populateAgentInfo(resourceComposite.getResource().getId(), currentAgentInfo);
errorsGrid = new Table(extendLocatorId("errors"), MSG.view_summaryOverview_header_detectedErrors(), null, null,
new String[] { ResourceErrorsDataSource.Field.DETAIL });
<<<<<<<
}
private void populateAgentInfo(final int id, final LocatableDynamicForm currentAgentInfo) {
if (currentAgentInfo != null) {
setLeft("10%");
setWidth("80%");
// currentAgentInfo.setBorder("1px dashed black");
final List<FormItem> formItems = new ArrayList<FormItem>();
HeaderItem headerItem = new HeaderItem("header", "Agent Managing this Resource");
headerItem.setValue("Agent Managing this Resource");
formItems.add(headerItem);
//populate remaining details
GWTServiceLookup.getAgentService().getAgentForResource(id, new AsyncCallback<Agent>() {
@Override
public void onFailure(Throwable caught) {
CoreGUI.getErrorHandler().handleError("Failed to locate agent managing resource id " + id + ".",
caught);
}
@Override
public void onSuccess(Agent agent) {
Log.debug("############ Debug: agent:" + agent);
//name
String name = "name";
StaticTextItem nameValue = new StaticTextItem(name, "Name");
nameValue.setValue(agent.getName());
formItems.add(nameValue);
//address
String address = "address";
StaticTextItem addressValue = new StaticTextItem(address, "Address");
addressValue.setValue(agent.getAddress());
formItems.add(addressValue);
//port
String port = "port";
StaticTextItem portValue = new StaticTextItem(port, "Port");
portValue.setValue(agent.getPort());
formItems.add(portValue);
// AgentClient client = agentManager.getAgentClient(agent);
// pingResults = client.ping(5000L);
//
// pingResults = agent.ping(5000L);
// //Agent Communiation status
// availabilityImage.setSrc("resources/availability_"
// + (resource.getCurrentAvailability().getAvailabilityType() == AvailabilityType.UP ? "green" : "red")
// + "_24.png");
//Last Received Avail report
//Full Endpoint
currentAgentInfo.setItems(formItems.toArray(new FormItem[formItems.size()]));
currentAgentInfo.markForRedraw();
}
});
//final form population
currentAgentInfo.setItems(formItems.toArray(new FormItem[formItems.size()]));
}
=======
>>>>>>>
}
private void populateAgentInfo(final int id, final LocatableDynamicForm currentAgentInfo) {
if (currentAgentInfo != null) {
setLeft("10%");
setWidth("80%");
// currentAgentInfo.setBorder("1px dashed black");
final List<FormItem> formItems = new ArrayList<FormItem>();
HeaderItem headerItem = new HeaderItem("header", "Agent Managing this Resource");
headerItem.setValue("Agent Managing this Resource");
formItems.add(headerItem);
//populate remaining details
GWTServiceLookup.getAgentService().getAgentForResource(id, new AsyncCallback<Agent>() {
@Override
public void onFailure(Throwable caught) {
CoreGUI.getErrorHandler().handleError("Failed to locate agent managing resource id " + id + ".",
caught);
}
@Override
public void onSuccess(Agent agent) {
Log.debug("############ Debug: agent:" + agent);
//name
String name = "name";
StaticTextItem nameValue = new StaticTextItem(name, "Name");
nameValue.setValue(agent.getName());
formItems.add(nameValue);
//address
String address = "address";
StaticTextItem addressValue = new StaticTextItem(address, "Address");
addressValue.setValue(agent.getAddress());
formItems.add(addressValue);
//port
String port = "port";
StaticTextItem portValue = new StaticTextItem(port, "Port");
portValue.setValue(agent.getPort());
formItems.add(portValue);
// AgentClient client = agentManager.getAgentClient(agent);
// pingResults = client.ping(5000L);
//
// pingResults = agent.ping(5000L);
// //Agent Communiation status
// availabilityImage.setSrc("resources/availability_"
// + (resource.getCurrentAvailability().getAvailabilityType() == AvailabilityType.UP ? "green" : "red")
// + "_24.png");
//Last Received Avail report
//Full Endpoint
currentAgentInfo.setItems(formItems.toArray(new FormItem[formItems.size()]));
currentAgentInfo.markForRedraw();
}
});
//final form population
currentAgentInfo.setItems(formItems.toArray(new FormItem[formItems.size()]));
}
<<<<<<<
private void initErrorsGrid() {
errorsGrid.setTooltip("Click on the rows to see the error details.");
=======
private void initErrorsGrid() {
errorsGrid.setTooltip(MSG.view_summaryOverview_tooltip_detectedErrors());
>>>>>>>
private void initErrorsGrid() {
errorsGrid.setTooltip(MSG.view_summaryOverview_tooltip_detectedErrors());
<<<<<<<
HTMLPane details = new HTMLPane();
details.setContents("<pre>" + record.getAttribute(ResourceErrorsDataSource.DETAIL_ID) + "</pre>");
=======
HTMLPane details = new HTMLPane();
details.setContents("<pre>" + record.getAttribute(ResourceErrorsDataSource.Field.DETAIL) + "</pre>");
>>>>>>>
HTMLPane details = new HTMLPane();
details.setContents("<pre>" + record.getAttribute(ResourceErrorsDataSource.Field.DETAIL) + "</pre>");
<<<<<<<
IButton ok = new IButton("Ok");
=======
IButton ok = new IButton(MSG.common_button_ok());
>>>>>>>
IButton ok = new IButton(MSG.common_button_ok()); |
<<<<<<<
editButton = new EnhancedIButton(editMode ? MSG.common_title_view_mode() : MSG.common_title_edit_mode());
editButton.setAutoFit(true);
=======
editButton = new LocatableIButton(footer.extendLocatorId("Mode"), editMode ? MSG.common_title_view_mode() : MSG
.common_title_edit_mode());
>>>>>>>
editButton = new EnhancedIButton(editMode ? MSG.common_title_view_mode() : MSG.common_title_edit_mode());
<<<<<<<
resetButton = new EnhancedIButton(MSG.common_button_reset());
resetButton.setAutoFit(true);
=======
resetButton = new LocatableIButton(footer.extendLocatorId("Reset"), MSG.common_button_reset());
>>>>>>>
resetButton = new EnhancedIButton(MSG.common_button_reset()); |
<<<<<<<
// Mapping non-clustered names -> attribute name in the cluster manager
private final String[] CLUSTER_SESSION_ATTRIBUTE_NAMES = { "maxInactiveInterval", "MaxInactiveInterval",
"activeSessions", "ActiveSessionCount", "sessionCounter", "CreatedSessionCount", "sessionAverageAliveTime", "",
"processingTime", "ProcessingTime", "maxActive", "MaxActiveSessionCount", "maxActiveSessions",
"MaxActiveAllowed", "expiredSessions", "ExpiredSessionCount", "rejectedSessions", "RejectedSessionCount",
"sessionIdLength", "SessionIdLength" };
=======
>>>>>>>
<<<<<<<
if (operation == WarOperation.REVERT) {
// Lets see if we have a backup of ouselves. If so, install it.
=======
if (operation == WarOperation.REVERT) {
>>>>>>>
if (operation == WarOperation.REVERT) {
<<<<<<<
EmsOperation mbeanOperation = this.jbossWebMBean.getOperation(name, new Class[0]);
=======
EmsOperation mbeanOperation = this.jbossWebMBean.getOperation(name);
>>>>>>>
EmsOperation mbeanOperation = this.jbossWebMBean.getOperation(name, new Class[0]); |
<<<<<<<
=======
>>>>>>> |
<<<<<<<
IButton scanForUpdatesButton = new EnhancedIButton(MSG.view_admin_plugins_scan());
scanForUpdatesButton.setAutoFit(true);
=======
IButton scanForUpdatesButton = new LocatableIButton(extendLocatorId("scanButton"),
MSG.view_admin_plugins_scan());
>>>>>>>
IButton scanForUpdatesButton = new EnhancedIButton(MSG.view_admin_plugins_scan());
<<<<<<<
IButton restartMasterPCButton = new EnhancedIButton(MSG.view_admin_plugins_restartMasterPC());
restartMasterPCButton.setAutoFit(true);
=======
IButton restartMasterPCButton = new LocatableIButton(extendLocatorId("restartMasterPCButton"),
MSG.view_admin_plugins_restartMasterPC());
>>>>>>>
IButton restartMasterPCButton = new EnhancedIButton(MSG.view_admin_plugins_restartMasterPC());
<<<<<<<
final IButton showUndeployedButton = new EnhancedIButton(MSG.view_admin_plugins_showUndeployed());
showUndeployedButton.setAutoFit(true);
=======
final IButton showUndeployedButton = new LocatableIButton(extendLocatorId("showUndeployedButton"),
MSG.view_admin_plugins_showUndeployed());
>>>>>>>
final IButton showUndeployedButton = new EnhancedIButton(MSG.view_admin_plugins_showUndeployed()); |
<<<<<<<
public List<String> getOrderingFieldNames() {
return orderingFieldNames;
=======
public Map<String, Object> getFilterFields() {
Map<String, Object> results = new HashMap<String, Object>();
for (Field filterField : getFields(Type.FILTER)) {
Object filterFieldValue = null;
try {
filterFieldValue = filterField.get(this);
} catch (IllegalAccessException iae) {
throw new RuntimeException(iae);
}
if (filterFieldValue != null) {
results.put(getCleansedFieldName(filterField, 6), filterFieldValue);
}
}
if (LOG.isDebugEnabled()) {
for (Map.Entry<String, Object> entries : results.entrySet()) {
LOG.debug("Filter: (" + entries.getKey() + ", " + entries.getValue() + ")");
}
}
return results;
>>>>>>>
public List<String> getOrderingFieldNames() {
return orderingFieldNames;
<<<<<<<
=======
public List<String> getFetchFields() {
List<String> results = new ArrayList<String>();
for (Field fetchField : getFields(Type.FETCH)) {
Object fetchFieldValue = null;
try {
fetchField.setAccessible(true);
fetchFieldValue = fetchField.get(this);
} catch (IllegalAccessException iae) {
throw new RuntimeException(iae);
}
if (fetchFieldValue != null) {
boolean shouldFetch = ((Boolean) fetchFieldValue).booleanValue();
if (shouldFetch) {
results.add(getCleansedFieldName(fetchField, 5));
}
}
}
if (LOG.isDebugEnabled()) {
for (String entry : results) {
LOG.debug("Fetch: (" + entry + ")");
}
}
return results;
}
>>>>>>> |
<<<<<<<
for (String fileName : bundleFiles.keySet()) {
File file = bundleFiles.get(fileName);
InputStream is = null;
try {
is = new FileInputStream(file);
// peg the file version to the bundle version. In the future we may allow a distribution
// to refer to existing versions of a file.
BundleFile bundleFile = bundleManager.addBundleFile(subject, bundleVersion.getId(), fileName,
bundleVersion.getVersion(), null, is);
log.debug("Added bundle file [" + bundleFile + "] to BundleVersion [" + bundleVersion + "]");
} finally {
safeClose(is);
if (null != file) {
file.delete();
=======
if (bundleFiles != null) {
for (String fileName : bundleFiles.keySet()) {
File file = bundleFiles.get(fileName);
InputStream is = null;
try {
is = new FileInputStream(file);
BundleFile bundleFile = bundleManager.addBundleFile(subject, bundleVersion.getId(), fileName,
"1.0", null, is);
log.debug("Added bundle file [" + bundleFile + "] to BundleVersion [" + bundleVersion + "]");
} finally {
safeClose(is);
if (null != file) {
file.delete();
}
>>>>>>>
if (bundleFiles != null) {
for (String fileName : bundleFiles.keySet()) {
File file = bundleFiles.get(fileName);
InputStream is = null;
try {
is = new FileInputStream(file);
// peg the file version to the bundle version. In the future we may allow a distribution
// to refer to existing versions of a file.
BundleFile bundleFile = bundleManager.addBundleFile(subject, bundleVersion.getId(), fileName,
bundleVersion.getVersion(), null, is);
log.debug("Added bundle file [" + bundleFile + "] to BundleVersion [" + bundleVersion + "]");
} finally {
safeClose(is);
if (null != file) {
file.delete();
} |
<<<<<<<
public void updateBundleDestinationTags(int bundleDestinationId, Set<Tag> tags) {
tagManager.updateBundleDestinationTags(getSessionSubject(), bundleDestinationId, tags);
}
=======
public PageList<TagReportComposite> findTagReportCompositesByCriteria(TagCriteria tagCriteria) {
return SerialUtility.prepare(tagManager.findTagReportCompositesByCriteria(getSessionSubject(), tagCriteria),
"TagService.findTagReportCompositesByCriteria");
}
>>>>>>>
public void updateBundleDestinationTags(int bundleDestinationId, Set<Tag> tags) {
tagManager.updateBundleDestinationTags(getSessionSubject(), bundleDestinationId, tags);
}
public PageList<TagReportComposite> findTagReportCompositesByCriteria(TagCriteria tagCriteria) {
return SerialUtility.prepare(tagManager.findTagReportCompositesByCriteria(getSessionSubject(), tagCriteria),
"TagService.findTagReportCompositesByCriteria");
} |
<<<<<<<
public ResourceGraphPortlet() {
super();
=======
public ResourceGraphPortlet(String locatorId) {
super(locatorId);
isPortalGraph = true;
//setChartHeight("100%");
>>>>>>>
public ResourceGraphPortlet() {
super();
isPortalGraph = true;
//setChartHeight("100%");
<<<<<<<
if (simple == null || simple.getIntegerValue() == null) {
=======
if (simple == null || simple.getIntegerValue() == null) {
>>>>>>>
if (simple == null || simple.getIntegerValue() == null) {
<<<<<<<
public final Portlet getInstance(EntityContext context) {
=======
@Override
public final Portlet getInstance(String locatorId, EntityContext context) {
>>>>>>>
@Override
public final Portlet getInstance(EntityContext context) { |
<<<<<<<
import org.rhq.core.domain.resource.ResourceError;
=======
import org.rhq.core.domain.resource.composite.DisambiguationReport;
import org.rhq.core.domain.resource.composite.ProblemResourceComposite;
>>>>>>>
import org.rhq.core.domain.resource.ResourceError;
import org.rhq.core.domain.resource.composite.DisambiguationReport;
import org.rhq.core.domain.resource.composite.ProblemResourceComposite;
<<<<<<<
public List<ResourceError> findResourceErrors(int resourceId) {
return SerialUtility.prepare(resourceManager.findResourceErrors(getSessionSubject(), resourceId),
"ResourceService.getResourceErrors");
}
=======
>>>>>>>
public List<ResourceError> findResourceErrors(int resourceId) {
return SerialUtility.prepare(resourceManager.findResourceErrors(getSessionSubject(), resourceId),
"ResourceService.getResourceErrors");
} |
<<<<<<<
int purgeOrphanedDriftFiles(Subject subject, long purgeMillis);
=======
int purgeOrphanedDriftFiles(Subject subject);
String getDriftFileBits(String hash);
>>>>>>>
int purgeOrphanedDriftFiles(Subject subject, long purgeMillis);
String getDriftFileBits(String hash); |
<<<<<<<
HTMLFlow tagString = new HTMLFlow("<a href=\"#Tag/" + tag.toString() + "\">" + tag.toString() + "</a>");
=======
HTMLFlow tagString = new HTMLFlow(
"<a href=\"" + LinkManager.getTagLink(tag.toString()) + "\">" +
tag.toString() + "</a>");
>>>>>>>
HTMLFlow tagString = new HTMLFlow("<a href=\"" + LinkManager.getTagLink(tag.toString()) + "\">"
+ tag.toString() + "</a>"); |
<<<<<<<
public ServerPluginDescriptorType getServerPluginDescriptor(String pluginName) throws Exception {
ServerPlugin plugin = getServerPlugin(pluginName);
=======
public ServerPluginDescriptorType getServerPluginDescriptor(PluginKey pluginKey) throws Exception {
Plugin plugin = getServerPlugin(pluginKey);
>>>>>>>
public ServerPluginDescriptorType getServerPluginDescriptor(PluginKey pluginKey) throws Exception {
ServerPlugin plugin = getServerPlugin(pluginKey);
<<<<<<<
public List<String> getServerPluginNamesByEnabled(boolean enabled) {
Query query = entityManager.createNamedQuery(ServerPlugin.QUERY_GET_NAMES_BY_ENABLED);
=======
public List<PluginKey> getServerPluginKeysByEnabled(boolean enabled) {
Query query = entityManager.createNamedQuery(Plugin.QUERY_GET_NAMES_BY_ENABLED_AND_TYPE);
>>>>>>>
public List<PluginKey> getServerPluginKeysByEnabled(boolean enabled) {
Query query = entityManager.createNamedQuery(ServerPlugin.QUERY_GET_NAMES_BY_ENABLED);
<<<<<<<
return query.getResultList();
=======
query.setParameter("type", PluginDeploymentType.SERVER);
return xquery.getResultList(); // TODO this is a list of strings, not plugin keys!!!
>>>>>>>
return xquery.getResultList(); // TODO this is a list of strings, not plugin keys!!!
<<<<<<<
public void purgeServerPlugin(Subject subject, String pluginName) {
Query q = this.entityManager.createNamedQuery(ServerPlugin.QUERY_FIND_ANY_BY_NAME);
q.setParameter("name", pluginName);
ServerPlugin doomed = (ServerPlugin) q.getSingleResult();
=======
public void purgeServerPlugin(Subject subject, PluginKey pluginKey) {
Query q = this.entityManager.createNamedQuery(Plugin.QUERY_FIND_ANY_BY_NAME_AND_TYPE);
q.setParameter("name", pluginKey.getPluginName());
q.setParameter("type", PluginDeploymentType.SERVER);
Plugin doomed = (Plugin) q.getSingleResult();
>>>>>>>
public void purgeServerPlugin(Subject subject, PluginKey pluginKey) {
Query q = this.entityManager.createNamedQuery(ServerPlugin.QUERY_FIND_ANY_BY_NAME);
q.setParameter("name", pluginKey.getPluginName());
ServerPlugin doomed = (ServerPlugin) q.getSingleResult();
<<<<<<<
public PluginStatusType getServerPluginStatus(String pluginName) {
Query q = entityManager.createNamedQuery(ServerPlugin.QUERY_GET_STATUS_BY_NAME);
q.setParameter("name", pluginName);
=======
public PluginStatusType getServerPluginStatus(PluginKey pluginKey) {
Query q = entityManager.createNamedQuery(Plugin.QUERY_GET_STATUS_BY_NAME_AND_TYPE);
q.setParameter("name", pluginKey.getPluginName());
q.setParameter("type", PluginDeploymentType.SERVER);
>>>>>>>
public PluginStatusType getServerPluginStatus(PluginKey pluginKey) {
Query q = entityManager.createNamedQuery(ServerPlugin.QUERY_GET_STATUS_BY_NAME);
q.setParameter("name", pluginKey.getPluginName()); |
<<<<<<<
=======
import org.jetbrains.annotations.Nullable;
>>>>>>>
import org.jetbrains.annotations.Nullable; |
<<<<<<<
// public static final String DYNA_GROUP_VIEW = "Inventory/Groups/DynagroupDefinitions";
=======
>>>>>>>
<<<<<<<
monitoringTab = new TwoLevelTab(new ViewName("Monitoring", MSG.view_tabs_common_monitoring()),
IconEnum.SUSPECT_METRICS);
monitorGraphs = new SubTab(monitoringTab, new ViewName("Graphs", MSG.view_tabs_common_graphs()), null);
monitorTables = new SubTab(monitoringTab, new ViewName("Tables", MSG.view_tabs_common_tables()), null);
monitorTraits = new SubTab(monitoringTab, new ViewName("Traits", MSG.view_tabs_common_traits()), null);
monitorSched = new SubTab(monitoringTab, new ViewName("Schedules", MSG.view_tabs_common_schedules()), null);
monitorCallTime = new SubTab(monitoringTab, new ViewName("CallTime", MSG.view_tabs_common_calltime()), null);
monitoringTab.registerSubTabs(monitorGraphs, monitorTables, monitorTraits, monitorSched, monitorCallTime);
=======
monitoringTab = new TwoLevelTab(getTabSet().extendLocatorId("Monitoring"), new ViewName("Monitoring",
MSG.view_tabs_common_monitoring()), IconEnum.SUSPECT_METRICS);
monitorGraphs = new SubTab(monitoringTab.extendLocatorId("Graphs"), new ViewName("Graphs",
MSG.view_tabs_common_graphs()), null);
monitorNewGraphs = new SubTab(monitoringTab.extendLocatorId("NewGraphs"), new ViewName("NewGraphs",
"d3 Graphs"), null);
monitorTables = new SubTab(monitoringTab.extendLocatorId("Tables"), new ViewName("Tables",
MSG.view_tabs_common_tables()), null);
monitorTraits = new SubTab(monitoringTab.extendLocatorId("Traits"), new ViewName("Traits",
MSG.view_tabs_common_traits()), null);
monitorSched = new SubTab(monitoringTab.extendLocatorId("Schedules"), new ViewName("Schedules",
MSG.view_tabs_common_schedules()), null);
monitorCallTime = new SubTab(monitoringTab.extendLocatorId("CallTime"), new ViewName("CallTime",
MSG.view_tabs_common_calltime()), null);
monitoringTab.registerSubTabs(monitorGraphs, monitorNewGraphs, monitorTables, monitorTraits, monitorSched, monitorCallTime);
>>>>>>>
monitoringTab = new TwoLevelTab(new ViewName("Monitoring", MSG.view_tabs_common_monitoring()),
IconEnum.SUSPECT_METRICS);
monitorGraphs = new SubTab(monitoringTab, new ViewName("Graphs", MSG.view_tabs_common_graphs()), null);
monitorNewGraphs = new SubTab(monitoringTab, new ViewName("NewGraphs", "d3 Graphs"), null);
monitorTables = new SubTab(monitoringTab, new ViewName("Tables", MSG.view_tabs_common_tables()), null);
monitorTraits = new SubTab(monitoringTab, new ViewName("Traits", MSG.view_tabs_common_traits()), null);
monitorSched = new SubTab(monitoringTab, new ViewName("Schedules", MSG.view_tabs_common_schedules()), null);
monitorCallTime = new SubTab(monitoringTab, new ViewName("CallTime", MSG.view_tabs_common_calltime()), null);
monitoringTab.registerSubTabs(monitorGraphs, monitorNewGraphs, monitorTables, monitorTraits, monitorSched,
monitorCallTime); |
<<<<<<<
import org.rhq.enterprise.gui.coregui.client.PopupWindow;
=======
>>>>>>>
<<<<<<<
return decorateWithTitleBar(ResourceConfigurationHistoryListView.VIEW_ID,
new SubsystemConfigurationHistoryListView(
extendLocatorId(ResourceConfigurationHistoryListView.VIEW_ID.getName()),
getGlobalPermissions().contains(Permission.MANAGE_INVENTORY)));
=======
return new ResourceConfigurationHistoryListView(extendLocatorId(
ResourceConfigurationHistoryListView.VIEW_ID.getName()),
getGlobalPermissions().contains(Permission.MANAGE_INVENTORY));
>>>>>>>
return new ResourceConfigurationHistoryListView(extendLocatorId(
ResourceConfigurationHistoryListView.VIEW_ID.getName()),
getGlobalPermissions().contains(Permission.MANAGE_INVENTORY));
<<<<<<<
return decorateWithTitleBar(OperationHistoryView.SUBSYSTEM_VIEW_ID,
new SubsystemOperationHistoryListView(extendLocatorId(
OperationHistoryView.SUBSYSTEM_VIEW_ID.getName()),
getGlobalPermissions().contains(Permission.MANAGE_INVENTORY)));
=======
return new SubsystemOperationHistoryListView(extendLocatorId(
OperationHistoryView.SUBSYSTEM_VIEW_ID.getName()),
getGlobalPermissions().contains(Permission.MANAGE_INVENTORY));
>>>>>>>
return new SubsystemOperationHistoryListView(extendLocatorId(
OperationHistoryView.SUBSYSTEM_VIEW_ID.getName()),
getGlobalPermissions().contains(Permission.MANAGE_INVENTORY));
<<<<<<<
return decorateWithTitleBar( AlertHistoryView.SUBSYSTEM_VIEW_ID,
new SubsystemRecentAlertsView(extendLocatorId(AlertHistoryView.SUBSYSTEM_VIEW_ID.getName()),
getGlobalPermissions().contains(Permission.MANAGE_INVENTORY)));
=======
return new SubsystemResourceAlertView(extendLocatorId(AlertHistoryView.SUBSYSTEM_VIEW_ID.getName()),
getGlobalPermissions().contains(Permission.MANAGE_INVENTORY));
>>>>>>>
return new SubsystemResourceAlertView(extendLocatorId(AlertHistoryView.SUBSYSTEM_VIEW_ID.getName()),
getGlobalPermissions().contains(Permission.MANAGE_INVENTORY));
<<<<<<<
return decorateWithTitleBar(AlertDefinitionReportView.VIEW_ID,
new AlertDefinitionReportView(extendLocatorId(AlertDefinitionReportView.VIEW_ID.getName())));
=======
return new AlertDefinitionReportView(extendLocatorId(AlertDefinitionReportView.VIEW_ID.getName()));
>>>>>>>
return new AlertDefinitionReportView(extendLocatorId(AlertDefinitionReportView.VIEW_ID.getName()));
<<<<<<<
return decorateWithTitleBar(DriftHistoryView.SUBSYSTEM_VIEW_ID,
new SubsystemResourceDriftView(extendLocatorId(DriftHistoryView.SUBSYSTEM_VIEW_ID.getName()),
getGlobalPermissions().contains(Permission.MANAGE_INVENTORY)));
=======
return new SubsystemResourceDriftView(extendLocatorId(DriftHistoryView.SUBSYSTEM_VIEW_ID.getName()),
getGlobalPermissions().contains(Permission.MANAGE_INVENTORY));
>>>>>>>
return new SubsystemResourceDriftView(extendLocatorId(DriftHistoryView.SUBSYSTEM_VIEW_ID.getName()),
getGlobalPermissions().contains(Permission.MANAGE_INVENTORY));
<<<<<<<
return decorateWithTitleBar(ResourceInstallReport.VIEW_ID,
new ResourceInstallReport(extendLocatorId(ResourceInstallReport.VIEW_ID.getName())));
=======
return new ResourceInstallReport(extendLocatorId(ResourceInstallReport.VIEW_ID.getName()));
>>>>>>>
return new ResourceInstallReport(extendLocatorId(ResourceInstallReport.VIEW_ID.getName()));
<<<<<<<
return decorateWithTitleBar(DriftComplianceReport.VIEW_ID,
new DriftComplianceReport(extendLocatorId(DriftComplianceReport.VIEW_ID.getName())));
=======
return new DriftComplianceReport(extendLocatorId(DriftComplianceReport.VIEW_ID.getName()));
>>>>>>>
return new DriftComplianceReport(extendLocatorId(DriftComplianceReport.VIEW_ID.getName())); |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.