conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
import de.uni_potsdam.hpi.metanome.algorithm_integration.input.RelationalInputGenerator;
import de.uni_potsdam.hpi.metanome.algorithm_integration.input.SQLInputGenerator;
=======
>>>>>>>
import de.uni_potsdam.hpi.metanome.algorithm_integration.input.RelationalInputGenerator;
<<<<<<<
public void execute() {
=======
@Override
public void execute() throws CouldNotReceiveResultException {
>>>>>>>
@Override
public void execute() {
<<<<<<<
public void setConfigurationValue(String identifier, boolean value) {
throw new UnsupportedOperationException();
}
public void setConfigurationValue(String identifier, SQLInputGenerator value) {
throw new UnsupportedOperationException();
}
@Override
public void setConfigurationValue(String identifier,
RelationalInputGenerator value)
throws AlgorithmConfigurationException {
if (identifier.equals("input file")){
System.out.println("Input file is not being set on algorithm.");
}
}
=======
>>>>>>>
@Override
public void setConfigurationValue(String identifier,
RelationalInputGenerator value)
throws AlgorithmConfigurationException {
if (identifier.equals("input file")){
System.out.println("Input file is not being set on algorithm.");
}
} |
<<<<<<<
import de.uni_potsdam.hpi.metanome.algorithm_integration.input.RelationalInputGenerator;
import de.uni_potsdam.hpi.metanome.algorithm_integration.input.SQLInputGenerator;
=======
>>>>>>>
import de.uni_potsdam.hpi.metanome.algorithm_integration.input.RelationalInputGenerator;
<<<<<<<
public void setConfigurationValue(String identifier, boolean value) {
throw new UnsupportedOperationException();
}
public void setConfigurationValue(String identifier, SQLInputGenerator value) {
throw new UnsupportedOperationException();
}
=======
>>>>>>>
<<<<<<<
@Override
public void setConfigurationValue(String identifier, RelationalInputGenerator value){
if (identifier.equals("input file")){
System.out.println("Input file is not being set on algorithm.");
}
}
=======
>>>>>>>
@Override
public void setConfigurationValue(String identifier, RelationalInputGenerator value){
if (identifier.equals("input file")){
System.out.println("Input file is not being set on algorithm.");
}
} |
<<<<<<<
import com.google.gwt.user.client.ui.VerticalPanel;
=======
>>>>>>> |
<<<<<<<
import com.google.gwt.user.client.rpc.IsSerializable;
=======
import com.google.common.annotations.GwtCompatible;
import com.google.common.annotations.GwtIncompatible;
import java.io.Serializable;
>>>>>>>
<<<<<<<
public class Result implements IsSerializable {
=======
@GwtCompatible
public class Result extends ResultsDbEntity implements Serializable {
>>>>>>>
public class Result implements Serializable { |
<<<<<<<
import java.util.ArrayList;
import java.util.List;
=======
import java.util.EnumMap;
>>>>>>>
import java.util.ArrayList;
import java.util.List;
import java.util.EnumMap;
<<<<<<<
public class ResultPrinter extends ResultReceiver {
protected PrintStream statStream;
protected PrintStream fdStream;
protected PrintStream uccStream;
protected PrintStream cuccStream;
protected PrintStream indStream;
protected PrintStream odStream;
=======
public class ResultPrinter implements CloseableOmniscientResultReceiver {
public static final String RESULT_TEST_DIR = "results/test";
public static final String RESULT_DIR = "results";
protected EnumMap<ResultType, PrintStream> openStreams;
>>>>>>>
public class ResultPrinter extends ResultReceiver {
protected PrintStream statStream;
protected PrintStream fdStream;
protected PrintStream uccStream;
protected PrintStream cuccStream;
protected PrintStream indStream;
protected PrintStream odStream;
protected EnumMap<ResultType, PrintStream> openStreams;
<<<<<<<
super(algorithmExecutionIdentifier, test);
=======
if (testDirectory) {
this.directory = RESULT_TEST_DIR;
} else {
this.directory = RESULT_DIR;
}
File directory = new File(this.directory);
if (!directory.exists()) {
directory.mkdirs();
}
this.algorithmExecutionIdentifier = algorithmExecutionIdentifier;
this.openStreams = new EnumMap<>(ResultType.class);
>>>>>>>
super(algorithmExecutionIdentifier, test);
this.openStreams = new EnumMap<>(ResultType.class);
<<<<<<<
protected PrintStream getCuccStream() throws CouldNotReceiveResultException {
if (cuccStream == null) {
cuccStream = openStream(CUCC_ENDING);
}
return cuccStream;
}
protected PrintStream getOdStream() throws CouldNotReceiveResultException {
if (odStream == null) {
odStream = openStream(OD_ENDING);
}
return odStream;
}
=======
>>>>>>> |
<<<<<<<
List<Field> fields = new ArrayList<>();
=======
List<JField> fields = new ArrayList<>();
>>>>>>>
List<Field> fields = new ArrayList<>();
<<<<<<<
extendEventsStatusOverview(fields, s);
series.add(obj(fields));
=======
series.add(j(fields));
>>>>>>>
series.add(obj(fields));
<<<<<<<
private void extendEventsStatusOverview(List<Field> fields, Series series) throws SearchIndexException {
EventSearchQuery query = new EventSearchQuery(securityService.getOrganization().getId(), securityService.getUser())
.withoutActions().withSeriesId(series.getIdentifier());
SearchResult<Event> result = searchIndex.getByQuery(query);
// collect recording statuses
int blacklisted = 0;
int optOut = 0;
int ready = 0;
for (SearchResultItem<Event> item : result.getItems()) {
Event event = item.getSource();
if (event.getSchedulingStatus() == null)
continue;
SchedulingStatus schedulingStatus = SchedulingStatus.valueOf(event.getSchedulingStatus());
if (SchedulingStatus.BLACKLISTED.equals(schedulingStatus)) {
blacklisted++;
} else if (series.isOptedOut() || SchedulingStatus.OPTED_OUT.equals(schedulingStatus)) {
optOut++;
} else {
ready++;
}
}
fields.add(f("events", obj(f("BLACKLISTED", v(blacklisted)), f("OPTED_OUT", v(optOut)), f("READY", v(ready)))));
}
=======
>>>>>>> |
<<<<<<<
if (cacheResults) resultsTab.fetchCacheResults();
=======
>>>>>>> |
<<<<<<<
}
protected void addInputField(boolean optional) {
BooleanInput field = new BooleanInput(optional);
this.inputWidgets.add(field);
int index = (this.getWidgetCount() < 1 ? 0 : this.getWidgetCount() - 1);
this.insert(field, index);
}
@Override
public ConfigurationSpecification getUpdatedSpecification() {
=======
}
protected void addInputField(boolean optional) {
BooleanInput field = new BooleanInput(optional);
this.inputWidgets.add(field);
int index = (this.getWidgetCount() < 1 ? 0 : this.getWidgetCount()-1);
this.insert(field, index);
}
@Override
public ConfigurationSpecificationBoolean getUpdatedSpecification() {
>>>>>>>
}
protected void addInputField(boolean optional) {
BooleanInput field = new BooleanInput(optional);
this.inputWidgets.add(field);
int index = (this.getWidgetCount() < 1 ? 0 : this.getWidgetCount() - 1);
this.insert(field, index);
}
@Override
public ConfigurationSpecificationBoolean getUpdatedSpecification() { |
<<<<<<<
@Override
public void setTempFileGenerator(FileGenerator tempFileGenerator) {
this.tempFileGenerator = tempFileGenerator;
}
=======
public void setConfigurationValue(String identifier, SQLInputGenerator value) {
throw new UnsupportedOperationException();
}
>>>>>>>
@Override
public void setTempFileGenerator(FileGenerator tempFileGenerator) {
this.tempFileGenerator = tempFileGenerator;
}
@Override
public void setConfigurationValue(String identifier, SQLInputGenerator value) {
throw new UnsupportedOperationException();
} |
<<<<<<<
protected ImmutableList<String> headerLine;
protected ImmutableList<String> nextLine;
=======
protected boolean skipDifferingLines;
protected List<String> headerLine;
protected List<String> nextLine;
>>>>>>>
protected List<String> headerLine;
protected List<String> nextLine;
<<<<<<<
protected FileIterator setSeparator(char separator) {
this.separator = separator;
return this;
}
protected FileIterator setQuoteChar(char quoteChar) {
this.quotechar = quoteChar;
return this;
}
protected FileIterator setEscapeChar(char escape) {
this.escape = escape;
return this;
}
protected FileIterator setSkipLines(int skipLines) {
this.skipLines = skipLines;
return this;
}
protected FileIterator setStrictQuotes(boolean strictQuotes) {
this.strictQuotes = strictQuotes;
return this;
}
protected FileIterator setIgnoreLeadingWhiteSpace(boolean ignoreLeadingWhiteSpace) {
this.ignoreLeadingWhiteSpace = ignoreLeadingWhiteSpace;
return this;
}
protected FileIterator setHasHeader(boolean hasHeader) {
this.hasHeader = hasHeader;
return this;
}
protected FileIterator setSkipDifferingLines(boolean skipDifferingLines) {
this.skipDifferingLines = skipDifferingLines;
return this;
}
=======
public int getNumberOfSkippedDifferingLines() {
return numberOfSkippedLines;
}
>>>>>>>
public int getNumberOfSkippedDifferingLines() {
return numberOfSkippedLines;
}
protected FileIterator setSeparator(char separator) {
this.separator = separator;
return this;
}
protected FileIterator setQuoteChar(char quoteChar) {
this.quotechar = quoteChar;
return this;
}
protected FileIterator setEscapeChar(char escape) {
this.escape = escape;
return this;
}
protected FileIterator setSkipLines(int skipLines) {
this.skipLines = skipLines;
return this;
}
protected FileIterator setStrictQuotes(boolean strictQuotes) {
this.strictQuotes = strictQuotes;
return this;
}
protected FileIterator setIgnoreLeadingWhiteSpace(boolean ignoreLeadingWhiteSpace) {
this.ignoreLeadingWhiteSpace = ignoreLeadingWhiteSpace;
return this;
}
protected FileIterator setHasHeader(boolean hasHeader) {
this.hasHeader = hasHeader;
return this;
}
protected FileIterator setSkipDifferingLines(boolean skipDifferingLines) {
this.skipDifferingLines = skipDifferingLines;
return this;
} |
<<<<<<<
import com.google.gwt.user.client.rpc.IsSerializable;
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
=======
>>>>>>>
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
<<<<<<<
import javax.xml.bind.annotation.XmlTransient;
=======
import java.io.Serializable;
>>>>>>>
import java.io.Serializable;
import javax.xml.bind.annotation.XmlTransient;
<<<<<<<
@JsonTypeInfo(
use = JsonTypeInfo.Id.NAME,
include = JsonTypeInfo.As.PROPERTY,
property = "type")
@JsonSubTypes({
@JsonSubTypes.Type(value = BasicStatistic.class, name = "BasicStatistic"),
@JsonSubTypes.Type(value = ConditionalUniqueColumnCombination.class, name = "ConditionalUniqueColumnCombination"),
@JsonSubTypes.Type(value = FunctionalDependency.class, name = "FunctionalDependency"),
@JsonSubTypes.Type(value = InclusionDependency.class, name = "InclusionDependency"),
@JsonSubTypes.Type(value = OrderDependency.class, name = "OrderDependency"),
@JsonSubTypes.Type(value = UniqueColumnCombination.class, name = "UniqueColumnCombination")
})
public interface Result extends IsSerializable {
=======
public interface Result extends Serializable {
>>>>>>>
@JsonTypeInfo(
use = JsonTypeInfo.Id.NAME,
include = JsonTypeInfo.As.PROPERTY,
property = "type")
@JsonSubTypes({
@JsonSubTypes.Type(value = BasicStatistic.class, name = "BasicStatistic"),
@JsonSubTypes.Type(value = ConditionalUniqueColumnCombination.class, name = "ConditionalUniqueColumnCombination"),
@JsonSubTypes.Type(value = FunctionalDependency.class, name = "FunctionalDependency"),
@JsonSubTypes.Type(value = InclusionDependency.class, name = "InclusionDependency"),
@JsonSubTypes.Type(value = OrderDependency.class, name = "OrderDependency"),
@JsonSubTypes.Type(value = UniqueColumnCombination.class, name = "UniqueColumnCombination")
})
public interface Result extends Serializable { |
<<<<<<<
protected ResultsPage resultsPage;
protected RunConfigurationPage runConfigurationsPage;
protected FinderServiceAsync finderService;
/**
* Constructor. Initiates creation of subpages.
*/
public BasePage() {
super(1, Unit.CM);
this.addStyleName("basePage");
this.insert(new TabWrapper(new DataSourcesPage(this)), "Data Sources", Tabs.DATA_SOURCES.ordinal());
this.insert(new TabWrapper(new AlgorithmsPage(this)), "Algorithms", Tabs.ALGORITHMS.ordinal());
this.runConfigurationsPage = new RunConfigurationPage(this);
this.insert(new TabWrapper(this.runConfigurationsPage), "Run Configuration", Tabs.RUN_CONFIGURATION.ordinal());
this.resultsPage = new ResultsPage(this);
this.insert(new TabWrapper(this.resultsPage), "Results", Tabs.RESULTS.ordinal());
this.insert(createAboutPage(), "About", Tabs.ABOUT.ordinal());
}
/**
* Create the "About" Page, which should include information about the project.
*
* @return Widget with contents to be placed on the page.
*/
private Widget createAboutPage() {
Label temporaryContent = new Label();
temporaryContent.setText("Metanome Version 0.0.2.");
return temporaryContent;
}
/**
* Hand control from the Run Configuration to displaying Results. Start executing the algorithm
* and fetch results at a regular interval.
*
* @param executionService
* @param algorithmName
* @param parameters
*/
public void startExecutionAndResultPolling(ExecutionServiceAsync executionService,
String algorithmName, List<ConfigurationSpecification> parameters) {
String executionIdentifier = getExecutionIdetifier(algorithmName);
ScrollPanel resultsTab = new ScrollPanel();
resultsTab.setHeight("95%");
// resultsPage.addExecution(resultsTab, new TabHeader(executionIdentifier, resultsTab, resultsPage));
ResultsTab resultsTabContent = new ResultsTab(executionService, executionIdentifier);
executionService.executeAlgorithm(algorithmName,
executionIdentifier,
parameters,
resultsTabContent.getCancelCallback());
resultsTabContent.startPolling();
resultsTab.add(new TabWrapper(resultsTabContent));
this.selectTab(resultsPage);
}
/**
* Generates a string that uniquely identifies an algorithm execution.
*
* @param algorithmName the name of the algorithm being executed
* @return a string consisting of the algorithmName and the current date and time
*/
protected String getExecutionIdetifier(String algorithmName) {
DateTimeFormat format = DateTimeFormat.getFormat("yyyy-MM-dd'T'HHmmss");
return algorithmName + format.format(new Date());
}
/**
* Generates a string representing all given data sources by concatenating their names.
* These are used as titles for the result tabs.
*
* @param dataSources the list of InputParameterDataSources to be descirbed
* @return a String with the names of all given data source parameters
*/
=======
protected ResultsPage resultsPage;
protected RunConfigurationPage runConfigurationsPage;
protected FinderServiceAsync finderService;
/**
* Constructor. Initiates creation of subpages.
*/
public BasePage() {
super(1, Unit.CM);
this.addStyleName(MetanomeResources.INSTANCE.metanomeStyle().basePage());
this.insert(new TabWrapper(new DataSourcesPage(this)), "Data Sources", Tabs.DATA_SOURCES.ordinal());
this.insert(new TabWrapper(new AlgorithmsPage(this)), "Algorithms", Tabs.ALGORITHMS.ordinal());
this.runConfigurationsPage = new RunConfigurationPage(this);
this.insert(new TabWrapper(this.runConfigurationsPage), "Run Configuration", Tabs.RUN_CONFIGURATION.ordinal());
this.resultsPage = new ResultsPage(this);
this.insert(new TabWrapper(this.resultsPage), "Results", Tabs.RESULTS.ordinal());
this.insert(createAboutPage(), "About", Tabs.ABOUT.ordinal());
}
/**
* Create the "About" Page, which should include information about the project.
*
* @return Widget with contents to be placed on the page.
*/
private Widget createAboutPage() {
SimplePanel content = new SimplePanel();
Label temporaryContent = new Label();
temporaryContent.setText("Metanome Version 0.0.2.");
content.add(temporaryContent);
//content.addStyleName("aboutPage");
return content;
}
/**
* Hand control from the Run Configuration to displaying Results. Start executing the algorithm
* and fetch results at a regular interval.
*
* @param executionService
* @param algorithmFileName
* @param parameters
*/
public void startExecutionAndResultPolling(ExecutionServiceAsync executionService,
String algorithmFileName, List<ConfigurationSpecification> parameters) {
String executionIdentifier = getExecutionIdetifier(algorithmFileName);
TabPanel resultTabsContainer = new TabPanel();
resultTabsContainer.setWidth("100%");
resultTabsContainer.setHeight("100%");
// Create new tab with result table
ScrollPanel resultsTab = new ScrollPanel();
ResultsTablePage resultsTableContent = new ResultsTablePage(executionService, executionIdentifier);
executionService.executeAlgorithm(algorithmFileName,
executionIdentifier,
parameters,
resultsTableContent.getCancelCallback());
resultsTableContent.startPolling();
resultsTab.add(resultsTableContent);
// Create new tab with visualizations of result
ResultsVisualizationPage visualizationTab = new ResultsVisualizationPage();
// Add first tab to result tab container
resultTabsContainer.add(resultsTab, "Table");
resultTabsContainer.add(visualizationTab, "Visualization");
resultTabsContainer.selectTab(0);
// remove the content from the result page and set the content to the new fetched result
this.resultsPage.clear();
this.resultsPage.add(resultTabsContainer);
this.selectTab(Tabs.RESULTS.ordinal());
}
/**
* Generates a string that uniquely identifies an algorithm execution.
*
* @param algorithmName the name of the algorithm being executed
* @return a string consisting of the algorithmName and the current date and time
*/
protected String getExecutionIdetifier(String algorithmName) {
DateTimeFormat format = DateTimeFormat.getFormat("yyyy-MM-dd'T'HHmmss");
return algorithmName + format.format(new Date());
}
/**
* Generates a string representing all given data sources by concatenating their names.
* These are used as titles for the result tabs.
*
* @param dataSources the list of InputParameterDataSources to be descirbed
* @return a String with the names of all given data source parameters
*/
>>>>>>>
protected ResultsPage resultsPage;
protected RunConfigurationPage runConfigurationsPage;
protected FinderServiceAsync finderService;
/**
* Constructor. Initiates creation of subpages.
*/
public BasePage() {
super(1, Unit.CM);
this.addStyleName("basePage");
this.insert(new TabWrapper(new DataSourcesPage(this)), "Data Sources", Tabs.DATA_SOURCES.ordinal());
this.insert(new TabWrapper(new AlgorithmsPage(this)), "Algorithms", Tabs.ALGORITHMS.ordinal());
this.runConfigurationsPage = new RunConfigurationPage(this);
this.insert(new TabWrapper(this.runConfigurationsPage), "Run Configuration", Tabs.RUN_CONFIGURATION.ordinal());
this.resultsPage = new ResultsPage(this);
this.insert(new TabWrapper(this.resultsPage), "Results", Tabs.RESULTS.ordinal());
this.insert(createAboutPage(), "About", Tabs.ABOUT.ordinal());
}
/**
* Create the "About" Page, which should include information about the project.
*
* @return Widget with contents to be placed on the page.
*/
private Widget createAboutPage() {
SimplePanel content = new SimplePanel();
Label temporaryContent = new Label();
temporaryContent.setText("Metanome Version 0.0.2.");
content.add(temporaryContent);
//content.addStyleName("aboutPage");
return content;
}
/**
* Hand control from the Run Configuration to displaying Results. Start executing the algorithm
* and fetch results at a regular interval.
*
* @param executionService
* @param algorithmFileName
* @param parameters
*/
public void startExecutionAndResultPolling(ExecutionServiceAsync executionService,
String algorithmFileName, List<ConfigurationSpecification> parameters) {
String executionIdentifier = getExecutionIdetifier(algorithmFileName);
TabPanel resultTabsContainer = new TabPanel();
resultTabsContainer.setWidth("100%");
resultTabsContainer.setHeight("100%");
// Create new tab with result table
ScrollPanel resultsTab = new ScrollPanel();
ResultsTablePage resultsTableContent = new ResultsTablePage(executionService, executionIdentifier);
executionService.executeAlgorithm(algorithmFileName,
executionIdentifier,
parameters,
resultsTableContent.getCancelCallback());
resultsTableContent.startPolling();
resultsTab.add(resultsTableContent);
// Create new tab with visualizations of result
ResultsVisualizationPage visualizationTab = new ResultsVisualizationPage();
// Add first tab to result tab container
resultTabsContainer.add(resultsTab, "Table");
resultTabsContainer.add(visualizationTab, "Visualization");
resultTabsContainer.selectTab(0);
// remove the content from the result page and set the content to the new fetched result
this.resultsPage.clear();
this.resultsPage.add(resultTabsContainer);
this.selectTab(Tabs.RESULTS.ordinal());
}
/**
* Generates a string that uniquely identifies an algorithm execution.
*
* @param algorithmName the name of the algorithm being executed
* @return a string consisting of the algorithmName and the current date and time
*/
protected String getExecutionIdetifier(String algorithmName) {
DateTimeFormat format = DateTimeFormat.getFormat("yyyy-MM-dd'T'HHmmss");
return algorithmName + format.format(new Date());
}
/**
* Generates a string representing all given data sources by concatenating their names.
* These are used as titles for the result tabs.
*
* @param dataSources the list of InputParameterDataSources to be descirbed
* @return a String with the names of all given data source parameters
*/ |
<<<<<<<
import net.minecraft.block.state.IBlockState;
=======
>>>>>>>
import net.minecraft.block.state.IBlockState;
<<<<<<<
import com.google.common.base.Objects;
import com.google.common.collect.Lists;
import com.mojang.authlib.GameProfile;
public class TileEntityGoldenEgg extends SyncedTileEntity implements IPlaceAwareTile, IBreakAwareTile, ITickable {
=======
public class TileEntityGoldenEgg extends SyncedTileEntity implements IPlacerAwareTile, IBreakAwareTile {
>>>>>>>
public class TileEntityGoldenEgg extends SyncedTileEntity implements IPlaceAwareTile, IBreakAwareTile, ITickable { |
<<<<<<<
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
=======
>>>>>>> |
<<<<<<<
private Set<Field> syncedFields;
public Icon[] textures = new Icon[6];
=======
>>>>>>>
public Icon[] textures = new Icon[6];
<<<<<<<
protected void findSyncedFields() {
if (teClass != null && SyncedTileEntity.class.isAssignableFrom(teClass)) {
syncedFields = new HashSet<Field>();
for (Field field : teClass.getDeclaredFields()) {
if (ISyncableObject.class.isAssignableFrom(field.getType())) {
field.setAccessible(true);
syncedFields.add(field);
}
}
}
}
public Set<Field> getSyncedFields() {
return syncedFields;
}
=======
>>>>>>> |
<<<<<<<
worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, OpenBlocks.Blocks.bigButton);
=======
super.onServerSync(changed);
worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, OpenBlocks.Blocks.bigButton.blockID);
>>>>>>>
super.onServerSync(changed);
worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, OpenBlocks.Blocks.bigButton); |
<<<<<<<
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
=======
>>>>>>> |
<<<<<<<
MinecraftForge.EVENT_BUS.register(this);
=======
if (Config.hanggliderEnableThermal) {
varioSwitchBinding = new KeyBinding("openblocks.keybind.vario_switch", Keyboard.KEY_V, "openblocks.keybind.category");
varioVolUpBinding = new KeyBinding("openblocks.keybind.vario_vol_up", Keyboard.KEY_NONE, "openblocks.keybind.category");
varioVolDownBinding = new KeyBinding("openblocks.keybind.vario_vol_down", Keyboard.KEY_NONE, "openblocks.keybind.category");
ClientRegistry.registerKeyBinding(varioSwitchBinding);
ClientRegistry.registerKeyBinding(varioVolUpBinding);
ClientRegistry.registerKeyBinding(varioVolDownBinding);
}
FMLCommonHandler.instance().bus().register(this);
>>>>>>>
if (Config.hanggliderEnableThermal) {
varioSwitchBinding = new KeyBinding("openblocks.keybind.vario_switch", Keyboard.KEY_V, "openblocks.keybind.category");
varioVolUpBinding = new KeyBinding("openblocks.keybind.vario_vol_up", Keyboard.KEY_NONE, "openblocks.keybind.category");
varioVolDownBinding = new KeyBinding("openblocks.keybind.vario_vol_down", Keyboard.KEY_NONE, "openblocks.keybind.category");
ClientRegistry.registerKeyBinding(varioSwitchBinding);
ClientRegistry.registerKeyBinding(varioVolUpBinding);
ClientRegistry.registerKeyBinding(varioVolDownBinding);
}
MinecraftForge.EVENT_BUS.register(this); |
<<<<<<<
if (!isItemHangglider(player.getHeldItemMainhand()) && !isItemHangglider(player.getHeldItemOffhand())) return false;
if (player.world.provider.getDimension() != glider.world.provider.getDimension()) return false;
=======
if (glider.handHeld == null || !isItemHangglider(player.getHeldItem(glider.handHeld))) return false;
if (player.worldObj.provider.getDimension() != glider.worldObj.provider.getDimension()) return false;
>>>>>>>
if (glider.handHeld == null || !isItemHangglider(player.getHeldItem(glider.handHeld))) return false;
if (player.world.provider.getDimension() != glider.world.provider.getDimension()) return false; |
<<<<<<<
addUrl("ComputerCraft", "http://www.google.com");
=======
addUrl("ComputerCraft", "http://www.computercraft.info/donate/");
addUrl("CCTurtle", "http://www.computercraft.info/donate/")
>>>>>>>
addUrl("ComputerCraft", "http://www.computercraft.info/donate/");
addUrl("CCTurtle", "http://www.computercraft.info/donate/"); |
<<<<<<<
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.FormParam;
import javax.ws.rs.POST;
=======
import javax.ws.rs.GET;
>>>>>>>
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.FormParam;
import javax.ws.rs.GET;
import javax.ws.rs.POST; |
<<<<<<<
import net.minecraftforge.fml.common.eventhandler.Cancelable;
=======
>>>>>>>
import net.minecraftforge.fml.common.eventhandler.Cancelable; |
<<<<<<<
import java.util.Date;
import java.util.List;
import java.util.Map;
=======
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Set;
>>>>>>>
import java.util.Date;
import java.util.List;
import java.util.Map;
<<<<<<<
import openmods.utils.NbtUtils;
=======
import openmods.utils.ItemUtils;
import openmods.utils.TagUtils;
>>>>>>>
import openmods.utils.NbtUtils;
<<<<<<<
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.mojang.authlib.GameProfile;
=======
>>>>>>> |
<<<<<<<
=======
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
>>>>>>> |
<<<<<<<
=======
if (isInitialized == false) {
double yaw = Math.toRadians(minecraft.renderViewEntity.rotationYaw - 180);
double pitch = Math.toRadians(minecraft.renderViewEntity.rotationPitch);
Matrix4f initial = new Matrix4f();
initial.rotate((float)pitch, new Vector3f(1, 0, 0));
initial.rotate((float)yaw, new Vector3f(0, 1, 0));
trackball.setTransform(initial);
isInitialized = true;
}
>>>>>>>
if (isInitialized == false) {
double yaw = Math.toRadians(minecraft.renderViewEntity.rotationYaw - 180);
double pitch = Math.toRadians(minecraft.renderViewEntity.rotationPitch);
Matrix4f initial = new Matrix4f();
initial.rotate((float)pitch, new Vector3f(1, 0, 0));
initial.rotate((float)yaw, new Vector3f(0, 1, 0));
trackball.setTransform(initial);
isInitialized = true;
}
<<<<<<<
GL11.glScaled(scale, -scale, scale);
GL11.glDisable(GL11.GL_CULL_FACE);
trackball.update(mouseX - 50, -(mouseY - 50)); // TODO: replace with proper
=======
GL11.glScaled(scale, -scale, scale);
trackball.update(mouseX - 50, -(mouseY - 50)); // TODO: replace with proper
// width,height
>>>>>>>
GL11.glScaled(scale, -scale, scale);
trackball.update(mouseX - 50, -(mouseY - 50)); // TODO: replace with proper
// width,height |
<<<<<<<
import net.minecraftforge.fml.common.registry.IEntityAdditionalSpawnData;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
=======
import net.minecraft.world.gen.NoiseGeneratorPerlin;
import openblocks.Config;
import openblocks.common.IVarioController;
import openblocks.common.Vario;
>>>>>>>
import net.minecraft.world.gen.NoiseGeneratorPerlin;
import net.minecraftforge.fml.common.registry.IEntityAdditionalSpawnData;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import openblocks.Config;
import openblocks.common.IVarioController;
import openblocks.common.Vario;
<<<<<<<
public class EntityHangGlider extends Entity implements IEntityAdditionalSpawnData {
=======
public static final int THERMAL_HEIGTH_MIN = 70;
public static final int THERMAL_HEIGTH_OPT = 110;
public static final int THERMAL_HEIGTH_MAX = 136;
public static final int THERMAL_STRONG_BONUS_HEIGTH = 100;
public static final double VSPEED_NORMAL = -0.052;
public static final double VSPEED_FAST = -0.176;
public static final double VSPEED_MIN = -0.32;
public static final double VSPEED_MAX = 0.4;
private static final int TICKS_PER_VARIO_UPDATE = 4;
public static final int FREQ_MIN = 300;
public static final int FREQ_AVG = 600;
public static final int FREQ_MAX = 2000;
public static final int BEEP_RATE_AVG = 4;
public static final int BEEP_RATE_MAX = 24;
>>>>>>>
public static final int THERMAL_HEIGTH_MIN = 70;
public static final int THERMAL_HEIGTH_OPT = 110;
public static final int THERMAL_HEIGTH_MAX = 136;
public static final int THERMAL_STRONG_BONUS_HEIGTH = 100;
public static final double VSPEED_NORMAL = -0.052;
public static final double VSPEED_FAST = -0.176;
public static final double VSPEED_MIN = -0.32;
public static final double VSPEED_MAX = 0.4; |
<<<<<<<
@Override
public File getWorldDir(World world) {
return new File(OpenBlocks.getBaseDir(), "saves/" + world.getSaveHandler().getWorldDirectoryName());
}
=======
/**
* Is this the server
*
* @return true if this is the server
*/
public boolean isServer() {
return false; // Why have this method? If the checking method changes in
// the future we fix it in one place.
}
/**
* Is this the client
*
* @return true if this is the client
*/
public boolean isClient() {
return true;
}
>>>>>>>
@Override
public File getWorldDir(World world) {
return new File(OpenBlocks.getBaseDir(), "saves/" + world.getSaveHandler().getWorldDirectoryName());
}
/**
* Is this the server
*
* @return true if this is the server
*/
public boolean isServer() {
return false; // Why have this method? If the checking method changes in
// the future we fix it in one place.
}
/**
* Is this the client
*
* @return true if this is the client
*/
public boolean isClient() {
return true;
} |
<<<<<<<
serviceRegistryJpaImpl.setEntityManagerFactory(emf);
=======
serviceRegistryJpaImpl.setPersistenceProvider(pp);
serviceRegistryJpaImpl.setPersistenceProperties(props);
Organization organization = new DefaultOrganization();
OrganizationDirectoryService organizationDirectoryService = EasyMock.createMock(OrganizationDirectoryService.class);
EasyMock.expect(organizationDirectoryService.getOrganization((String) EasyMock.anyObject()))
.andReturn(organization).anyTimes();
EasyMock.replay(organizationDirectoryService);
serviceRegistryJpaImpl.setOrganizationDirectoryService(organizationDirectoryService);
JaxbOrganization jaxbOrganization = JaxbOrganization.fromOrganization(organization);
User anonymous = new JaxbUser("anonymous", "test", jaxbOrganization, new JaxbRole(
jaxbOrganization.getAnonymousRole(), jaxbOrganization));
SecurityService securityService = EasyMock.createNiceMock(SecurityService.class);
EasyMock.expect(securityService.getUser()).andReturn(anonymous).anyTimes();
EasyMock.expect(securityService.getOrganization()).andReturn(organization).anyTimes();
EasyMock.replay(securityService);
serviceRegistryJpaImpl.setSecurityService(securityService);
}
private void registerTestHostAndService() throws ServiceRegistryException {
// register the hosts, service must be activated at this point
serviceRegistryJpaImpl.registerHost(TEST_HOST, "127.0.0.1", 1024, 1, 1);
serviceRegistryJpaImpl.registerHost(TEST_HOST_OTHER, "127.0.0.1", 1024, 1, 1);
serviceRegistryJpaImpl.registerService(TEST_SERVICE, TEST_HOST, TEST_PATH);
serviceRegistryJpaImpl.registerService(TEST_SERVICE, TEST_HOST_OTHER, TEST_PATH);
>>>>>>>
serviceRegistryJpaImpl.setEntityManagerFactory(emf);
Organization organization = new DefaultOrganization();
OrganizationDirectoryService organizationDirectoryService = EasyMock.createMock(OrganizationDirectoryService.class);
EasyMock.expect(organizationDirectoryService.getOrganization((String) EasyMock.anyObject()))
.andReturn(organization).anyTimes();
EasyMock.replay(organizationDirectoryService);
serviceRegistryJpaImpl.setOrganizationDirectoryService(organizationDirectoryService);
JaxbOrganization jaxbOrganization = JaxbOrganization.fromOrganization(organization);
User anonymous = new JaxbUser("anonymous", "test", jaxbOrganization, new JaxbRole(
jaxbOrganization.getAnonymousRole(), jaxbOrganization));
SecurityService securityService = EasyMock.createNiceMock(SecurityService.class);
EasyMock.expect(securityService.getUser()).andReturn(anonymous).anyTimes();
EasyMock.expect(securityService.getOrganization()).andReturn(organization).anyTimes();
EasyMock.replay(securityService);
serviceRegistryJpaImpl.setSecurityService(securityService);
}
private void registerTestHostAndService() throws ServiceRegistryException {
// register the hosts, service must be activated at this point
serviceRegistryJpaImpl.registerHost(TEST_HOST, "127.0.0.1", 1024, 1, 1);
serviceRegistryJpaImpl.registerHost(TEST_HOST_OTHER, "127.0.0.1", 1024, 1, 1);
serviceRegistryJpaImpl.registerService(TEST_SERVICE, TEST_HOST, TEST_PATH);
serviceRegistryJpaImpl.registerService(TEST_SERVICE, TEST_HOST_OTHER, TEST_PATH); |
<<<<<<<
=======
import java.util.EnumSet;
import net.minecraft.client.renderer.RenderBlocks;
>>>>>>>
<<<<<<<
=======
import openmods.utils.ColorUtils;
import openmods.utils.render.RenderUtils;
>>>>>>> |
<<<<<<<
=======
import io.netty.buffer.ByteBufInputStream;
import io.netty.buffer.ByteBufOutputStream;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
>>>>>>>
<<<<<<<
import openmods.network.event.*;
=======
import openmods.network.event.EventDirection;
import openmods.network.event.NetworkEvent;
import openmods.network.event.NetworkEventMeta;
import openmods.utils.ByteUtils;
>>>>>>>
import openmods.network.event.EventDirection;
import openmods.network.event.NetworkEvent;
import openmods.network.event.NetworkEventMeta;
<<<<<<<
import com.google.common.collect.Iterables;
import com.mojang.authlib.GameProfile;
import com.mojang.authlib.minecraft.MinecraftProfileTexture;
import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type;
import com.mojang.authlib.properties.Property;
=======
>>>>>>> |
<<<<<<<
public void onInventoryChanged(IInventory invent, int slotNumber) {
if (!world.isRemote) {
=======
public void onInventoryChanged(IInventory invent, OptionalInt slotNumber) {
if (!worldObj.isRemote) {
>>>>>>>
public void onInventoryChanged(IInventory invent, OptionalInt slotNumber) {
if (!world.isRemote) { |
<<<<<<<
@Override
public AxisAlignedBB getSelectedBoundingBox(World world, BlockPos pos) {
return new AxisAlignedBB(pos.getX() + 0.3, pos.getY() + 0.3, pos.getZ() + 0.3,
pos.getX() + 0.7, pos.getY() + 0.7, pos.getZ() + 0.7);
}
=======
>>>>>>> |
<<<<<<<
addSyncedObject(xpOutputs = new SyncableFlags());
addSyncedObject(itemOutputs = new SyncableFlags());
addSyncedObject(tank = new SyncableTank(TANK_CAPACITY, OpenBlocks.XP_FLUID));
=======
addSyncedObject(Keys.xpOutputs, xpOutputs);
addSyncedObject(Keys.itemOutputs, itemOutputs);
addSyncedObject(Keys.tankLevel, tankLevel);
addSyncedObject(Keys.vacuumDisabled, vacuumDisabled);
>>>>>>>
addSyncedObject(xpOutputs = new SyncableFlags());
addSyncedObject(itemOutputs = new SyncableFlags());
addSyncedObject(tank = new SyncableTank(TANK_CAPACITY, OpenBlocks.XP_FLUID));
addSyncedObject(vacuumDisabled = new SyncableBoolean());
<<<<<<<
if (player.isSneaking()) { return false; }
if (!worldObj.isRemote) {
openGui(player);
=======
if (player.isSneaking()) {
if(player.inventory.getStackInSlot(player.inventory.currentItem) == null) {
vacuumDisabled.negate();
return true;
}
return false;
} else if (!worldObj.isRemote) {
openGui(player, OpenBlocks.Gui.vacuumHopper);
>>>>>>>
if (player.isSneaking()) {
if(player.inventory.getStackInSlot(player.inventory.currentItem) == null) {
vacuumDisabled.negate();
return true;
}
return false;
} else if (!worldObj.isRemote) {
openGui(player); |
<<<<<<<
private boolean dirty = false;
=======
>>>>>>>
<<<<<<<
dirty = true;
}
@Override
public boolean isDirty() {
return dirty;
}
@Override
public void markDirty() {
dirty = true;
}
@Override
public void resetChangeTimer() {
}
@Override
public void tick() {
// TODO Auto-generated method stub
}
@Override
public void markClean() {
dirty = false;
=======
markClean();
>>>>>>>
markDirty(); |
<<<<<<<
=======
public class ModelPaintMixer extends ModelBase {
// fields
>>>>>>>
// fields |
<<<<<<<
import openmods.utils.CollectionUtils;
import openmods.utils.MathUtils;
=======
import openmods.utils.CollectionUtils;
import openmods.utils.ColorUtils;
import openmods.utils.ColorUtils.ColorMeta;
import openmods.utils.Coord;
import openmods.utils.MathUtils;
>>>>>>>
import openmods.utils.CollectionUtils;
import openmods.utils.MathUtils;
<<<<<<<
import com.google.common.base.Preconditions;
import com.google.common.collect.*;
import com.google.common.primitives.Doubles;
import com.google.common.primitives.Ints;
public class TileEntityGuide extends DroppableTileEntity implements ISyncListener, INeighbourAwareTile, IAddAwareTile, ITickable {
private static final Comparator<BlockPos> BlockPos_COMPARATOR = new Comparator<BlockPos>() {
=======
public class TileEntityGuide extends DroppableTileEntity implements ISyncListener, INeighbourAwareTile, IAddAwareTile {
private static final Comparator<Coord> COORD_COMPARATOR = new Comparator<Coord>() {
>>>>>>>
public class TileEntityGuide extends DroppableTileEntity implements ISyncListener, INeighbourAwareTile, IAddAwareTile, ITickable {
private static final Comparator<BlockPos> COMPARATOR = new Comparator<BlockPos>() {
<<<<<<<
private List<BlockPos> shape;
private List<BlockPos> previousShape;
=======
private CoordShape shape;
private CoordShape previousShape;
private CoordShape toDeleteShape;
>>>>>>>
private CoordShape shape;
private CoordShape previousShape;
private CoordShape toDeleteShape;
<<<<<<<
for (BlockPos c : shape) {
{
final int x = c.getX();
if (maxX < x) maxX = x;
if (minX > x) minX = x;
}
{
final int y = c.getY();
if (maxY < y) maxY = y;
if (minY > y) minY = y;
}
{
final int z = c.getZ();
if (maxZ < z) maxZ = z;
if (minZ > z) minZ = z;
}
=======
for (Coord c : shape.getCoords()) {
if (box.maxX < c.x) box.maxX = c.x;
if (box.maxY < c.y) box.maxY = c.y;
if (box.maxZ < c.z) box.maxZ = c.z;
if (box.minX > c.x) box.minX = c.x;
if (box.minY > c.y) box.minY = c.y;
if (box.minZ > c.z) box.minZ = c.z;
>>>>>>>
for (BlockPos c : shape.getCoords()) {
{
final int x = c.getX();
if (maxX < x) maxX = x;
if (minX > x) minX = x;
}
{
final int y = c.getY();
if (maxY < y) maxY = y;
if (minY > y) minY = y;
}
{
final int z = c.getZ();
if (maxZ < z) maxZ = z;
if (minZ > z) minZ = z;
}
<<<<<<<
protected List<BlockPos> getShapeSafe() {
=======
protected CoordShape getShapeSafe() {
>>>>>>>
protected CoordShape getShapeSafe() { |
<<<<<<<
if (!tag.hasKey(ItemImaginary.TAG_COLOR, Constants.NBT.TAG_INT)) return ItemStack.EMPTY;
=======
final Integer color = ItemImaginary.getColor(tag);
if (color == null) return null;
>>>>>>>
final Integer color = ItemImaginary.getColor(tag);
if (color == null) return ItemStack.EMPTY; |
<<<<<<<
=======
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
>>>>>>> |
<<<<<<<
import net.minecraft.world.chunk.Chunk.EnumCreateEntityType;
import net.minecraftforge.fluids.*;
=======
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidHandler;
import net.minecraftforge.fluids.IFluidTank;
>>>>>>>
import net.minecraft.world.chunk.Chunk.EnumCreateEntityType;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidHandler;
import net.minecraftforge.fluids.IFluidTank;
<<<<<<<
import com.google.common.collect.Lists;
public class TileEntityTank extends SyncedTileEntity implements IActivateAwareTile, IPlaceAwareTile, INeighbourAwareTile, ICustomHarvestDrops, ITickable {
=======
public class TileEntityTank extends SyncedTileEntity implements IActivateAwareTile, IPlacerAwareTile, INeighbourAwareTile, ICustomHarvestDrops {
>>>>>>>
public class TileEntityTank extends SyncedTileEntity implements IActivateAwareTile, IPlaceAwareTile, INeighbourAwareTile, ICustomHarvestDrops, ITickable { |
<<<<<<<
=======
@OneToMany(fetch = FetchType.EAGER, cascade = { CascadeType.REMOVE })
@JoinTable(name = "mh_message_template_mh_comment", joinColumns = {
@JoinColumn(name = "message_template_id", referencedColumnName = "id") }, inverseJoinColumns = {
@JoinColumn(name = "comments_id", referencedColumnName = "id", unique = true) })
private List<CommentDto> comments = new ArrayList<CommentDto>();
>>>>>>> |
<<<<<<<
private final static ResourceLocation texture = OpenBlocks.location("textures/models/projector.png");
=======
private final static ResourceLocation TEXTURE = new ResourceLocation("openblocks", "textures/models/projector.png");
private static final float BLOCK_CENTRE_TRANSLATION = 0.5F;
>>>>>>>
private final static ResourceLocation texture = OpenBlocks.location("textures/models/projector.png");
private static final float BLOCK_CENTRE_TRANSLATION = 0.5F;
<<<<<<<
public void renderTileEntityAt(TileEntityProjector projector, double x, double y, double z, float partialTickTime, int destroyProgess) {
=======
public void renderTileEntityAt(final TileEntity te, final double x, final double y, final double z, final float partialTickTime) {
>>>>>>>
public void renderTileEntityAt(TileEntityProjector projector, double x, double y, double z, float partialTickTime, int destroyProgess) {
<<<<<<<
GL11.glTranslated(-0.5, 0, -0.5);
GlStateManager.color(1, 1, 1);
=======
GL11.glTranslated(-BLOCK_CENTRE_TRANSLATION, 0, -BLOCK_CENTRE_TRANSLATION);
GL11.glColor3f(1, 1, 1);
>>>>>>>
GL11.glTranslated(-BLOCK_CENTRE_TRANSLATION, 0, -BLOCK_CENTRE_TRANSLATION);
GlStateManager.color(1, 1, 1);
<<<<<<<
private static void renderMap(final TileEntityProjector projector, int mapId) {
final World world = projector.getWorld();
if (world != null) {
HeightMapData data = MapDataManager.getMapData(world, mapId);
=======
private static void renderMap(final TileEntityProjector projector, final int mapId) {
if (projector.getWorldObj() != null) {
HeightMapData data = MapDataManager.getMapData(projector.getWorldObj(), mapId);
>>>>>>>
private static void renderMap(final TileEntityProjector projector, int mapId) {
final World world = projector.getWorld();
if (world != null) {
HeightMapData data = MapDataManager.getMapData(world, mapId); |
<<<<<<<
import java.util.List;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.fml.common.eventhandler.Cancelable;
import net.minecraftforge.fml.common.eventhandler.Event;
=======
>>>>>>>
<<<<<<<
=======
import cpw.mods.fml.common.eventhandler.Cancelable;
import cpw.mods.fml.common.eventhandler.Event;
import java.util.List;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
>>>>>>>
import java.util.List;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.fml.common.eventhandler.Cancelable;
import net.minecraftforge.fml.common.eventhandler.Event; |
<<<<<<<
public File getWorldDir(World world) {
return new File(OpenBlocks.getBaseDir(), DimensionManager.getWorld(0).getSaveHandler().getWorldDirectoryName());
}
=======
/**
* Is this the server
*
* @return true if this is the server
*/
public boolean isServer() {
return true; // Why have this method? If the checking method changes in
// the future we fix it in one place.
}
/**
* Is this the client
*
* @return true if this is the client
*/
public boolean isClient() {
return false;
}
/**
* Checks if this game is SinglePlayer
*
* @return true if this is single player
*/
public boolean isSinglePlayer() {
// Yeah I know it doesn't matter now but why not have it :P
MinecraftServer serverInstance = MinecraftServer.getServer();
if (serverInstance == null) return false;
return serverInstance.isSinglePlayer();
}
>>>>>>>
public File getWorldDir(World world) {
return new File(OpenBlocks.getBaseDir(), DimensionManager.getWorld(0).getSaveHandler().getWorldDirectoryName());
}
/**
* Is this the server
*
* @return true if this is the server
*/
public boolean isServer() {
return true; // Why have this method? If the checking method changes in
// the future we fix it in one place.
}
/**
* Is this the client
*
* @return true if this is the client
*/
public boolean isClient() {
return false;
}
/**
* Checks if this game is SinglePlayer
*
* @return true if this is single player
*/
public boolean isSinglePlayer() {
// Yeah I know it doesn't matter now but why not have it :P
MinecraftServer serverInstance = MinecraftServer.getServer();
if (serverInstance == null) return false;
return serverInstance.isSinglePlayer();
} |
<<<<<<<
import com.google.common.base.Predicate;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
public class TileEntityTarget extends SyncedTileEntity implements ISurfaceAttachment, INeighbourAwareTile, IAddAwareTile, ITickable {
=======
public class TileEntityTarget extends SyncedTileEntity implements ISurfaceAttachment, INeighbourAwareTile, IAddAwareTile {
>>>>>>>
public class TileEntityTarget extends SyncedTileEntity implements ISurfaceAttachment, INeighbourAwareTile, IAddAwareTile, ITickable { |
<<<<<<<
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import com.mojang.authlib.GameProfile;
=======
>>>>>>>
<<<<<<<
private BlockPos findLocation(World world, EntityPlayer player, GravePlacementChecker checker) {
BlockPos searchPos = playerPos;
if (Config.voidGraves && searchPos.getY() == 0) searchPos = searchPos.up();
=======
private Coord findLocation(World world, EntityPlayer player, GravePlacementChecker checker) {
final int limitedPosY = Math.min(Math.max(posY, Config.minGraveY), Config.maxGraveY);
>>>>>>>
private BlockPos findLocation(World world, EntityPlayer player, GravePlacementChecker checker) {
final int limitedPosY = Math.min(Math.max(playerPos.getY(), Config.minGraveY), Config.maxGraveY);
BlockPos searchPos = new BlockPos(playerPos.getX(), limitedPosY, playerPos.getZ());
<<<<<<<
for (BlockPos c : getSearchOrder(searchSize)) {
final BlockPos tryPos = searchPos.add(c);
if (checker.canPlace(world, player, tryPos)) return tryPos;
=======
for (Coord c : getSearchOrder(searchSize)) {
final int y = limitedPosY + c.y;
if (y > Config.maxGraveY || y < Config.minGraveY) continue;
final int x = posX + c.x;
final int z = posZ + c.z;
if (checker.canPlace(world, player, x, y, z)) return new Coord(x, y, z);
>>>>>>>
for (BlockPos c : getSearchOrder(searchSize)) {
final BlockPos tryPos = searchPos.add(c);
final int y = tryPos.getY();
if (y > Config.maxGraveY || y < Config.minGraveY) continue;
if (checker.canPlace(world, player, tryPos)) return tryPos; |
<<<<<<<
import net.minecraft.block.state.IBlockState;
=======
>>>>>>>
import net.minecraft.block.state.IBlockState;
<<<<<<<
import net.minecraft.util.EnumFacing;
import openmods.api.*;
import openmods.colors.ColorMeta;
=======
import openblocks.OpenBlocks.Blocks;
import openmods.api.IActivateAwareTile;
import openmods.api.ICustomHarvestDrops;
import openmods.api.ICustomPickItem;
import openmods.api.IPlacerAwareTile;
>>>>>>>
import net.minecraft.util.EnumFacing;
import openmods.api.IActivateAwareTile;
import openmods.api.ICustomHarvestDrops;
import openmods.api.ICustomPickItem;
import openmods.api.IPlaceAwareTile;
import openmods.colors.ColorMeta; |
<<<<<<<
protected AbstractSessionHandler(FixApplication fixApplication,
FixClock fixClock,
SessionRepository sessionRepository) {
=======
protected AbstractSessionHandler(FixApplication fixApplication, FixClock fixClock, SessionRepository sessionRepository) {
>>>>>>>
protected AbstractSessionHandler(FixApplication fixApplication,
FixClock fixClock,
SessionRepository sessionRepository) {
<<<<<<<
response.getHeader().setSendingTime(fixClock.millis());
=======
>>>>>>> |
<<<<<<<
import org.joda.time.DateTime;
import org.joda.time.DateTimeFieldType;
import org.joda.time.LocalDate;
import org.joda.time.LocalTime;
=======
>>>>>>>
import org.joda.time.DateTime;
import org.joda.time.DateTimeFieldType;
import org.joda.time.LocalDate;
import org.joda.time.LocalTime;
<<<<<<<
=======
import java.time.LocalDate;
import java.time.LocalTime;
import java.time.ZonedDateTime;
>>>>>>>
<<<<<<<
private final DateTime testDate = new LocalDate(1998, 6, 4).toDateTime(new LocalTime(8, 3, 31, 0), UTC);
=======
private final LocalDate testDate = LocalDate.of(1998, 6, 4);
private final long testDateTime = ZonedDateTime.of(testDate, LocalTime.of(8, 3, 31), systemUTC().zone()).toInstant().toEpochMilli();
private final long testDateTimeWithMillis = ZonedDateTime.of(testDate, LocalTime.of(8, 3, 31, (int) TimeUnit.MILLISECONDS.toNanos(537)), systemUTC().zone()).toInstant().toEpochMilli();
>>>>>>>
private final LocalDate testDate = LocalDate.of(1998, 6, 4);
private final long testDateTime = ZonedDateTime.of(testDate, LocalTime.of(8, 3, 31), systemUTC().zone()).toInstant().toEpochMilli();
private final long testDateTimeWithMillis = ZonedDateTime.of(testDate, LocalTime.of(8, 3, 31, (int) TimeUnit.MILLISECONDS.toNanos(537)), systemUTC().zone()).toInstant().toEpochMilli();
private final DateTime testDate = new LocalDate(1998, 6, 4).toDateTime(new LocalTime(8, 3, 31, 0), UTC);
<<<<<<<
assertEquals(testDate.getMillis(), UTCTimestampField.parse(TIMESTAMP_NO_MILLIS.getBytes()));
=======
assertEquals(testDateTime, UTCTimestampField.parse(TIMESTAMP_NO_MILLIS.getBytes()));
>>>>>>>
assertEquals(testDateTime, UTCTimestampField.parse(TIMESTAMP_NO_MILLIS.getBytes()));
assertEquals(testDate.getMillis(), UTCTimestampField.parse(TIMESTAMP_NO_MILLIS.getBytes()));
<<<<<<<
assertEquals(testDate.withField(DateTimeFieldType.millisOfSecond(), 537).getMillis(), UTCTimestampField.parse((TIMESTAMP_WITH_MILLIS.getBytes())));
=======
assertEquals(testDateTimeWithMillis, UTCTimestampField.parse((TIMESTAMP_WITH_MILLIS.getBytes())));
>>>>>>>
assertEquals(testDate.withField(DateTimeFieldType.millisOfSecond(), 537).getMillis(), UTCTimestampField.parse((TIMESTAMP_WITH_MILLIS.getBytes())));
<<<<<<<
assertEquals(testDate.getMillis(), field.getValue().longValue());
=======
assertEquals(testDateTime, field.getValue().longValue());
>>>>>>>
assertEquals(testDate.getMillis(), field.getValue().longValue());
<<<<<<<
assertEquals(testDate.withField(DateTimeFieldType.millisOfSecond(), 537).getMillis(), field.getValue().longValue());
=======
assertEquals(testDateTimeWithMillis, field.getValue().longValue());
>>>>>>>
assertEquals(testDate.withField(DateTimeFieldType.millisOfSecond(), 537).getMillis(), field.getValue().longValue()); |
<<<<<<<
import fixio.fixprotocol.fields.AbstractField;
import fixio.fixprotocol.fields.FieldFactory;
import fixio.fixprotocol.fields.IntField;
import fixio.fixprotocol.fields.StringField;
import it.unimi.dsi.fastutil.ints.Int2ObjectLinkedOpenHashMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
=======
import fixio.fixprotocol.fields.*;
import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap;
>>>>>>>
import fixio.fixprotocol.fields.*;
import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap;
import fixio.fixprotocol.fields.AbstractField;
import fixio.fixprotocol.fields.FieldFactory;
import fixio.fixprotocol.fields.IntField;
import fixio.fixprotocol.fields.StringField;
import it.unimi.dsi.fastutil.ints.Int2ObjectLinkedOpenHashMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
<<<<<<<
private final Int2ObjectMap<FixMessageFragment> body = new Int2ObjectLinkedOpenHashMap<>();
=======
private final Int2ObjectArrayMap<FixMessageFragment> body = new Int2ObjectArrayMap<>();
>>>>>>>
private final Int2ObjectArrayMap<FixMessageFragment> body = new Int2ObjectArrayMap<>();
private final Int2ObjectMap<FixMessageFragment> body = new Int2ObjectLinkedOpenHashMap<>(); |
<<<<<<<
import it.unimi.dsi.fastutil.ints.Int2ObjectLinkedOpenHashMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
=======
import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap;
>>>>>>>
import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectLinkedOpenHashMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
<<<<<<<
private final Int2ObjectMap<FixMessageFragment> body;
=======
private final Int2ObjectArrayMap<FixMessageFragment> body;
>>>>>>>
private final Int2ObjectArrayMap<FixMessageFragment> body;
<<<<<<<
header = new FixMessageHeader();
trailer = new FixMessageTrailer();
body = new Int2ObjectLinkedOpenHashMap<>(expectedBodyFieldCount);
=======
this.header = new FixMessageHeader();
this.trailer = new FixMessageTrailer();
this.body = new Int2ObjectArrayMap<>(expectedBodyFieldCount);
>>>>>>>
this.header = new FixMessageHeader();
this.trailer = new FixMessageTrailer();
this.body = new Int2ObjectArrayMap<>(expectedBodyFieldCount);
<<<<<<<
body = new Int2ObjectLinkedOpenHashMap<>(DEFAULT_BODY_FIELD_COUNT);
=======
this.body = new Int2ObjectArrayMap<>(DEFAULT_BODY_FIELD_COUNT);
>>>>>>>
this.body = new Int2ObjectArrayMap<>(DEFAULT_BODY_FIELD_COUNT); |
<<<<<<<
import org.joda.time.LocalDate;
import org.joda.time.LocalTime;
=======
import junitparams.JUnitParamsRunner;
import junitparams.Parameters;
>>>>>>>
import junitparams.JUnitParamsRunner;
import junitparams.Parameters;
<<<<<<<
=======
import java.time.LocalDate;
import java.time.LocalTime;
import java.time.ZonedDateTime;
>>>>>>>
import java.time.LocalDate;
import java.time.LocalTime;
import java.time.ZonedDateTime;
<<<<<<<
=======
import java.util.concurrent.TimeUnit;
>>>>>>>
import java.util.concurrent.TimeUnit;
<<<<<<<
assertEquals("value", new LocalDate(1998, 6, 4).toDateTime(new LocalTime(8, 3, 31, 537), UTC).getMillis(), field.getValue().longValue());
=======
assertEquals("value", ZonedDateTime.of(LocalDate.of(1998, 6, 4), LocalTime.of(8, 3, 31, (int) TimeUnit.MILLISECONDS.toNanos(537)), systemUTC().zone()).toInstant().toEpochMilli(), field.getValue().longValue());
>>>>>>>
assertEquals("value", new LocalDate(1998, 6, 4).toDateTime(new LocalTime(8, 3, 31, 537), UTC).getMillis(), field.getValue().longValue());
<<<<<<<
assertEquals("value", new LocalDate(1998, 6, 4).toDateTime(new LocalTime(8, 3, 31, 0), UTC).getMillis(), field.getValue().longValue());
=======
assertEquals("value", ZonedDateTime.of(LocalDate.of(1998, 6, 4), LocalTime.of(8, 3, 31), systemUTC().zone()).toInstant().toEpochMilli(), field.getValue().longValue());
}
@Test
@Parameters({"200303", "20030320", "200303w2"})
public void testFromStringValueMonthYear(final String value) throws Exception {
final int tag = FieldType.MaturityMonthYear.tag();
StringField field = FieldFactory.fromStringValue(DataType.MONTHYEAR, tag, value);
assertEquals("tagnum", tag, field.getTagNum());
assertEquals("value", value, field.getValue());
>>>>>>>
assertEquals("value", new LocalDate(1998, 6, 4).toDateTime(new LocalTime(8, 3, 31, 0), UTC).getMillis(), field.getValue().longValue());
}
@Test
@Parameters({"200303", "20030320", "200303w2"})
public void testFromStringValueMonthYear(final String value) throws Exception {
final int tag = FieldType.MaturityMonthYear.tag();
StringField field = FieldFactory.fromStringValue(DataType.MONTHYEAR, tag, value);
assertEquals("tagnum", tag, field.getTagNum());
assertEquals("value", value, field.getValue()); |
<<<<<<<
public IdpResponse(@NonNull String providerId, @NonNull String email) {
this(providerId, email, null, null, null, ResultCodes.OK);
}
public IdpResponse(@NonNull String providerId, @NonNull String email, @NonNull String token) {
this(providerId, email, null, token, null, ResultCodes.OK);
}
public IdpResponse(
@NonNull String providerId,
@NonNull String email,
@NonNull String token,
@NonNull String secret) {
this(providerId, email, null, token, secret, ResultCodes.OK);
}
public static IdpResponse create(
String providerId,
String email,
String phoneNumber,
String token,
String secret,
int errorCode) {
return new IdpResponse(providerId, email, phoneNumber, token, secret, errorCode);
}
=======
>>>>>>> |
<<<<<<<
mDataSnapshots.add(index, snapshot);
notifyListenersOnChildChanged(ChangeEventType.MOVED, snapshot, index, oldIndex);
=======
mDataSnapshots.add(realIndex, snapshot);
notifyChangeEventListeners(EventType.MOVED, snapshot, realIndex, oldIndex);
>>>>>>>
mDataSnapshots.add(realIndex, snapshot);
notifyListenersOnChildChanged(ChangeEventType.MOVED, snapshot, index, oldIndex);
<<<<<<<
notifyListenersOnChildChanged(ChangeEventType.REMOVED, snapshot, index, -1);
=======
notifyChangeEventListeners(EventType.REMOVED, snapshot, realIndex);
>>>>>>>
notifyListenersOnChildChanged(ChangeEventType.REMOVED, snapshot, realIndex, -1); |
<<<<<<<
boolean mEnableCredentials = true;
boolean mEnableHints = true;
=======
String mPrivacyPolicyUrl;
boolean mIsSmartLockEnabled = true;
>>>>>>>
String mPrivacyPolicyUrl;
boolean mEnableCredentials = true;
boolean mEnableHints = true;
<<<<<<<
mEnableCredentials,
mEnableHints,
=======
mPrivacyPolicyUrl,
mIsSmartLockEnabled,
>>>>>>>
mPrivacyPolicyUrl,
mEnableCredentials,
mEnableHints,
<<<<<<<
mEnableCredentials,
mEnableHints,
=======
mPrivacyPolicyUrl,
mIsSmartLockEnabled,
>>>>>>>
mPrivacyPolicyUrl,
mEnableCredentials,
mEnableHints, |
<<<<<<<
import com.google.firebase.auth.PhoneAuthProvider;
=======
import com.google.firebase.auth.FirebaseUser;
>>>>>>>
import com.google.firebase.auth.PhoneAuthProvider;
import com.google.firebase.auth.FirebaseUser; |
<<<<<<<
private void setUpTermsOfService() {
if (TextUtils.isEmpty(mHelper.getFlowParams().termsOfServiceUrl)) {
return;
}
mAgreementText.showTermsForUri(Uri.parse(mHelper.getFlowParams().termsOfServiceUrl),
R.string.button_text_save);
}
=======
>>>>>>> |
<<<<<<<
true /* credentialPickerEnabled */,
true /* hintSelectorEnabled */,
=======
null /* privacyPolicyUrl */,
true /* smartLockEnabled */,
>>>>>>>
null /* privacyPolicyUrl */,
true /* credentialPickerEnabled */,
true /* hintSelectorEnabled */, |
<<<<<<<
=======
@Nullable
public final String privacyPolicyUrl;
public final boolean smartLockEnabled;
>>>>>>>
@Nullable
public final String privacyPolicyUrl;
<<<<<<<
boolean enableCredentials,
boolean enableHints,
=======
@Nullable String privacyPolicyUrl,
boolean smartLockEnabled,
>>>>>>>
@Nullable String privacyPolicyUrl,
boolean enableCredentials,
boolean enableHints,
<<<<<<<
this.enableCredentials = enableCredentials;
this.enableHints = enableHints;
=======
this.privacyPolicyUrl = privacyPolicyUrl;
this.smartLockEnabled = smartLockEnabled;
>>>>>>>
this.privacyPolicyUrl = privacyPolicyUrl;
this.enableCredentials = enableCredentials;
this.enableHints = enableHints;
<<<<<<<
dest.writeInt(enableCredentials ? 1 : 0);
dest.writeInt(enableHints ? 1 : 0);
=======
dest.writeString(privacyPolicyUrl);
dest.writeInt(smartLockEnabled ? 1 : 0);
>>>>>>>
dest.writeString(privacyPolicyUrl);
dest.writeInt(enableCredentials ? 1 : 0);
dest.writeInt(enableHints ? 1 : 0);
<<<<<<<
boolean enableCredentials = in.readInt() != 0;
boolean enableHints = in.readInt() != 0;
=======
String privacyPolicyUrl = in.readString();
boolean smartLockEnabled = in.readInt() != 0;
>>>>>>>
String privacyPolicyUrl = in.readString();
boolean enableCredentials = in.readInt() != 0;
boolean enableHints = in.readInt() != 0;
<<<<<<<
enableCredentials,
enableHints,
=======
privacyPolicyUrl,
smartLockEnabled,
>>>>>>>
privacyPolicyUrl,
enableCredentials,
enableHints, |
<<<<<<<
String key = data.getKey();
Query ref = mDataRef.child(key);
=======
DatabaseReference ref = mDataRef.child(data.getKey());
>>>>>>>
String key = data.getKey();
DatabaseReference ref = mDataRef.child(key);
<<<<<<<
mHasQueuedInstantOps = true;
notifyChangeEventListeners(ChangeEventListener.EventType.REMOVED, snapshot, index);
=======
notifyChangeEventListeners(EventType.REMOVED, snapshot, index);
>>>>>>>
mHasQueuedInstantOps = true;
notifyChangeEventListeners(EventType.REMOVED, snapshot, index);
<<<<<<<
if (!isKeyAtIndex(key, index)) {
// We don't already know about this data, add it
mDataSnapshots.add(index, snapshot);
notifyChangeEventListeners(ChangeEventListener.EventType.ADDED, snapshot, index);
mQueuedAdditions.remove(key);
if (mQueuedAdditions.isEmpty()) notifyListenersOnDataChanged();
} else {
=======
if (isKeyAtIndex(key, index)) {
>>>>>>>
if (isKeyAtIndex(key, index)) {
<<<<<<<
notifyChangeEventListeners(ChangeEventListener.EventType.CHANGED, snapshot, index);
notifyListenersOnDataChanged();
=======
notifyChangeEventListeners(EventType.CHANGED, snapshot, index);
} else {
// We don't already know about this data, add it
mDataSnapshots.add(index, snapshot);
notifyChangeEventListeners(EventType.ADDED, snapshot, index);
>>>>>>>
notifyChangeEventListeners(EventType.CHANGED, snapshot, index);
notifyListenersOnDataChanged();
} else {
// We don't already know about this data, add it
mDataSnapshots.add(index, snapshot);
notifyChangeEventListeners(EventType.ADDED, snapshot, index);
mQueuedAdditions.remove(key);
if (mQueuedAdditions.isEmpty()) notifyListenersOnDataChanged();
<<<<<<<
notifyChangeEventListeners(ChangeEventListener.EventType.REMOVED, snapshot, index);
notifyListenersOnDataChanged();
=======
notifyChangeEventListeners(EventType.REMOVED, snapshot, index);
>>>>>>>
notifyChangeEventListeners(EventType.REMOVED, snapshot, index);
notifyListenersOnDataChanged(); |
<<<<<<<
import com.firebase.uidemo.database.firestore.FirestoreChatActivity;
import com.firebase.uidemo.database.realtime.ChatActivity;
=======
import com.firebase.uidemo.database.realtime.RealtimeDbChatActivity;
>>>>>>>
import com.firebase.uidemo.database.firestore.FirestoreChatActivity;
import com.firebase.uidemo.database.realtime.RealtimeDbChatActivity;
<<<<<<<
ChatActivity.class,
FirestoreChatActivity.class,
=======
>>>>>>>
<<<<<<<
R.string.name_chat,
R.string.name_firestore_chat,
R.string.name_auth_ui,
R.string.name_image
=======
R.string.title_auth_activity,
R.string.title_realtime_database_activity,
R.string.title_storage_activity
>>>>>>>
R.string.title_auth_activity,
R.string.name_firestore_chat,
R.string.title_realtime_database_activity,
R.string.title_storage_activity
<<<<<<<
R.string.desc_chat,
R.string.desc_firestore_chat,
R.string.desc_auth_ui,
R.string.desc_image
=======
R.string.desc_auth,
R.string.desc_realtime_database,
R.string.desc_storage
>>>>>>>
R.string.desc_auth,
R.string.desc_firestore_chat,
R.string.desc_realtime_database,
R.string.desc_storage |
<<<<<<<
=======
import androidx.annotation.RequiresApi;
>>>>>>>
import androidx.annotation.RequiresApi;
<<<<<<<
import java.util.Map;
=======
>>>>>>>
import java.util.Map;
<<<<<<<
int importance = NotificationManager.IMPORTANCE_HIGH;
final String importanceString = bundle.getString("importance");
if (importanceString != null) {
switch (importanceString.toLowerCase()) {
case "default":
importance = NotificationManager.IMPORTANCE_DEFAULT;
break;
case "max":
importance = NotificationManager.IMPORTANCE_MAX;
break;
case "high":
importance = NotificationManager.IMPORTANCE_HIGH;
break;
case "low":
importance = NotificationManager.IMPORTANCE_LOW;
break;
case "min":
importance = NotificationManager.IMPORTANCE_MIN;
break;
case "none":
importance = NotificationManager.IMPORTANCE_NONE;
break;
case "unspecified":
importance = NotificationManager.IMPORTANCE_UNSPECIFIED;
break;
default:
importance = NotificationManager.IMPORTANCE_HIGH;
}
}
=======
int importance = 4; // Same as HIGH for lower version
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
importance = NotificationManager.IMPORTANCE_HIGH;
final String importanceString = bundle.getString("importance");
if (importanceString != null) {
switch (importanceString.toLowerCase()) {
case "default":
importance = NotificationManager.IMPORTANCE_DEFAULT;
break;
case "max":
importance = NotificationManager.IMPORTANCE_MAX;
break;
case "high":
importance = NotificationManager.IMPORTANCE_HIGH;
break;
case "low":
importance = NotificationManager.IMPORTANCE_LOW;
break;
case "min":
importance = NotificationManager.IMPORTANCE_MIN;
break;
case "none":
importance = NotificationManager.IMPORTANCE_NONE;
break;
case "unspecified":
importance = NotificationManager.IMPORTANCE_UNSPECIFIED;
break;
default:
importance = NotificationManager.IMPORTANCE_HIGH;
}
}
}
>>>>>>>
int importance = 4; // Same as HIGH for lower version
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
importance = NotificationManager.IMPORTANCE_HIGH;
final String importanceString = bundle.getString("importance");
if (importanceString != null) {
switch (importanceString.toLowerCase()) {
case "default":
importance = NotificationManager.IMPORTANCE_DEFAULT;
break;
case "max":
importance = NotificationManager.IMPORTANCE_MAX;
break;
case "high":
importance = NotificationManager.IMPORTANCE_HIGH;
break;
case "low":
importance = NotificationManager.IMPORTANCE_LOW;
break;
case "min":
importance = NotificationManager.IMPORTANCE_MIN;
break;
case "none":
importance = NotificationManager.IMPORTANCE_NONE;
break;
case "unspecified":
importance = NotificationManager.IMPORTANCE_UNSPECIFIED;
break;
default:
importance = NotificationManager.IMPORTANCE_HIGH;
}
}
}
<<<<<<<
=======
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { // API 24 and higher
// Restore showing timestamp on Android 7+
// Source: https://developer.android.com/reference/android/app/Notification.Builder.html#setShowWhen(boolean)
boolean showWhen = bundle.getBoolean("showWhen", true);
notification.setShowWhen(showWhen);
}
>>>>>>>
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { // API 24 and higher
// Restore showing timestamp on Android 7+
// Source: https://developer.android.com/reference/android/app/Notification.Builder.html#setShowWhen(boolean)
boolean showWhen = bundle.getBoolean("showWhen", true);
notification.setShowWhen(showWhen);
}
<<<<<<<
String group = bundle.getString("group");
=======
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT_WATCH) { // API 20 and higher
String group = bundle.getString("group");
>>>>>>>
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT_WATCH) { // API 20 and higher
String group = bundle.getString("group");
<<<<<<<
public WritableArray getScheduledLocalNotifications() {
WritableArray scheduled = Arguments.createArray();
Map<String, ?> scheduledNotifications = scheduledNotificationsPersistence.getAll();
for (Map.Entry<String, ?> entry : scheduledNotifications.entrySet()) {
try {
RNPushNotificationAttributes notification = fromJson(entry.getValue().toString());
WritableMap notificationMap = Arguments.makeNativeMap(notification.toBundle());
scheduled.pushMap(notificationMap);
} catch (JSONException e) {
Log.e(LOG_TAG, e.getMessage());
}
}
return scheduled;
}
=======
>>>>>>>
public WritableArray getScheduledLocalNotifications() {
WritableArray scheduled = Arguments.createArray();
Map<String, ?> scheduledNotifications = scheduledNotificationsPersistence.getAll();
for (Map.Entry<String, ?> entry : scheduledNotifications.entrySet()) {
try {
RNPushNotificationAttributes notification = fromJson(entry.getValue().toString());
WritableMap notificationMap = Arguments.makeNativeMap(notification.toBundle());
scheduled.pushMap(notificationMap);
} catch (JSONException e) {
Log.e(LOG_TAG, e.getMessage());
}
}
return scheduled;
}
<<<<<<<
NotificationManager manager = notificationManager();
int importance = NotificationManager.IMPORTANCE_HIGH;
Uri soundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
// Instanciate a default channel with default sound.
String channel_id_sound = NOTIFICATION_CHANNEL_ID + "-default-" + importance + "-" + DEFAULT_VIBRATION;
checkOrCreateChannel(manager, channel_id_sound, soundUri, importance, new long[]{0, DEFAULT_VIBRATION});
// Instanciate a default channel without sound defined for backward compatibility.
String channel_id_no_sound = NOTIFICATION_CHANNEL_ID + "-" + importance + "-" + DEFAULT_VIBRATION;
checkOrCreateChannel(manager, channel_id_no_sound, null, importance, new long[]{0, DEFAULT_VIBRATION});
=======
if(!this.config.getChannelCreateDefault()) {
return;
}
NotificationManager manager = notificationManager();
int importance = 4; // Default value of HIGH for lower version
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
importance = NotificationManager.IMPORTANCE_HIGH;
}
Uri soundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
// Instanciate a default channel with default sound.
String channel_id_sound = NOTIFICATION_CHANNEL_ID + "-" + importance + "-default-" + DEFAULT_VIBRATION;
checkOrCreateChannel(manager, channel_id_sound, soundUri, importance, new long[] {0, DEFAULT_VIBRATION});
}
public List<String> listChannels() {
List<String> channels = new ArrayList<>();
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O)
return channels;
NotificationManager manager = notificationManager();
if (manager == null)
return channels;
List<NotificationChannel> listChannels = manager.getNotificationChannels();
for(NotificationChannel channel : listChannels) {
channels.add(channel.getId());
}
return channels;
}
public boolean channelExists(String channel_id) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O)
return false;
NotificationManager manager = notificationManager();
if (manager == null)
return false;
NotificationChannel channel = manager.getNotificationChannel(channel_id);
return channel != null;
}
public void deleteChannel(String channel_id) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O)
return;
NotificationManager manager = notificationManager();
if (manager == null)
return;
manager.deleteNotificationChannel(channel_id);
>>>>>>>
if(!this.config.getChannelCreateDefault()) {
return;
}
NotificationManager manager = notificationManager();
int importance = 4; // Default value of HIGH for lower version
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
importance = NotificationManager.IMPORTANCE_HIGH;
}
Uri soundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
// Instanciate a default channel with default sound.
String channel_id_sound = NOTIFICATION_CHANNEL_ID + "-" + importance + "-default-" + DEFAULT_VIBRATION;
checkOrCreateChannel(manager, channel_id_sound, soundUri, importance, new long[] {0, DEFAULT_VIBRATION});
}
public List<String> listChannels() {
List<String> channels = new ArrayList<>();
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O)
return channels;
NotificationManager manager = notificationManager();
if (manager == null)
return channels;
List<NotificationChannel> listChannels = manager.getNotificationChannels();
for(NotificationChannel channel : listChannels) {
channels.add(channel.getId());
}
return channels;
}
public boolean channelExists(String channel_id) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O)
return false;
NotificationManager manager = notificationManager();
if (manager == null)
return false;
NotificationChannel channel = manager.getNotificationChannel(channel_id);
return channel != null;
}
public void deleteChannel(String channel_id) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O)
return;
NotificationManager manager = notificationManager();
if (manager == null)
return;
manager.deleteNotificationChannel(channel_id);
<<<<<<<
private boolean isApplicationInForeground(Context context) {
=======
public boolean isApplicationInForeground(Context context) {
>>>>>>>
public boolean isApplicationInForeground(Context context) { |
<<<<<<<
public abstract List<Stmt> generateInitialisers();
=======
public abstract List<? extends Stmt> generateInitialisers(Solver solver);
/**
* TODO: Documentation.
*
* @author Henry J. Wylde
*/
public static final class Any extends Sort {
private Any() {}
/**
* {@inheritDoc}
*/
@Override
public List<? extends Stmt> generateInitialisers(Solver solver) {
List<Stmt> initialisers = new ArrayList<Stmt>();
initialisers.addAll(generateSorts());
return initialisers;
}
public String getName() {
return "Any";
}
/**
* {@inheritDoc}
*/
@Override
public String toString() {
return getName();
}
private Collection<? extends Stmt> generateSorts() {
return Arrays.asList(new Stmt.DeclareSort(getName(), 0));
}
}
/**
* TODO: Documentation.
*
* @author Henry J. Wylde
*/
public static final class Array extends Sort {
private final String index;
private final String element;
public Array(String index, String element) {
if (index == null) {
throw new NullPointerException("index cannot be null");
}
if (element == null) {
throw new NullPointerException("element cannot be null");
}
this.index = index;
this.element = element;
}
/**
* {@inheritDoc}
*/
@Override
public List<? extends Stmt> generateInitialisers(Solver solver) {
return Collections.emptyList();
}
public String getName() {
return "Array";
}
/**
* {@inheritDoc}
*/
@Override
public String toString() {
return "(" + getName() + " " + index + " " + element + ")";
}
}
/**
* TODO: Documentation.
*
* @author Henry J. Wylde
*/
public static final class Bool extends Sort {
private Bool() {}
/**
* {@inheritDoc}
*/
@Override
public List<? extends Stmt> generateInitialisers(Solver solver) {
return Collections.emptyList();
}
public String getName() {
return "Bool";
}
/**
* {@inheritDoc}
*/
@Override
public String toString() {
return getName();
}
}
/**
* TODO: Documentation.
*
* @author Henry J. Wylde
*/
public static final class Int extends Sort {
private Int() {}
/**
* {@inheritDoc}
*/
@Override
public List<? extends Stmt> generateInitialisers(Solver solver) {
return Collections.emptyList();
}
public String getName() {
return "Int";
}
/**
* {@inheritDoc}
*/
@Override
public String toString() {
return getName();
}
}
/**
* TODO: Documentation.
*
* @author Henry J. Wylde
*/
public static final class Real extends Sort {
private Real() {}
/**
* {@inheritDoc}
*/
@Override
public List<? extends Stmt> generateInitialisers(Solver solver) {
return Collections.emptyList();
}
public String getName() {
return "Real";
}
/**
* {@inheritDoc}
*/
@Override
public String toString() {
return getName();
}
}
>>>>>>>
public abstract List<? extends Stmt> generateInitialisers();
/**
* TODO: Documentation.
*
* @author Henry J. Wylde
*/
public static final class Any extends Sort {
private Any() {}
/**
* {@inheritDoc}
*/
@Override
public List<? extends Stmt> generateInitialisers() {
List<Stmt> initialisers = new ArrayList<Stmt>();
initialisers.addAll(generateSorts());
return initialisers;
}
public String getName() {
return "Any";
}
/**
* {@inheritDoc}
*/
@Override
public String toString() {
return getName();
}
private Collection<? extends Stmt> generateSorts() {
return Arrays.asList(new Stmt.DeclareSort(getName(), 0));
}
}
/**
* TODO: Documentation.
*
* @author Henry J. Wylde
*/
public static final class Array extends Sort {
private final String index;
private final String element;
public Array(String index, String element) {
if (index == null) {
throw new NullPointerException("index cannot be null");
}
if (element == null) {
throw new NullPointerException("element cannot be null");
}
this.index = index;
this.element = element;
}
/**
* {@inheritDoc}
*/
@Override
public List<? extends Stmt> generateInitialisers() {
return Collections.emptyList();
}
public String getName() {
return "Array";
}
/**
* {@inheritDoc}
*/
@Override
public String toString() {
return "(" + getName() + " " + index + " " + element + ")";
}
}
/**
* TODO: Documentation.
*
* @author Henry J. Wylde
*/
public static final class Bool extends Sort {
private Bool() {}
/**
* {@inheritDoc}
*/
@Override
public List<? extends Stmt> generateInitialisers() {
return Collections.emptyList();
}
public String getName() {
return "Bool";
}
/**
* {@inheritDoc}
*/
@Override
public String toString() {
return getName();
}
}
/**
* TODO: Documentation.
*
* @author Henry J. Wylde
*/
public static final class Int extends Sort {
private Int() {}
/**
* {@inheritDoc}
*/
@Override
public List<? extends Stmt> generateInitialisers() {
return Collections.emptyList();
}
public String getName() {
return "Int";
}
/**
* {@inheritDoc}
*/
@Override
public String toString() {
return getName();
}
}
/**
* TODO: Documentation.
*
* @author Henry J. Wylde
*/
public static final class Real extends Sort {
private Real() {}
/**
* {@inheritDoc}
*/
@Override
public List<? extends Stmt> generateInitialisers() {
return Collections.emptyList();
}
public String getName() {
return "Real";
}
/**
* {@inheritDoc}
*/
@Override
public String toString() {
return getName();
}
}
<<<<<<<
public List<Stmt> generateInitialisers() {
=======
public List<? extends Stmt> generateInitialisers(Solver solver) {
>>>>>>>
public List<? extends Stmt> generateInitialisers() {
<<<<<<<
private List<Stmt> generateSubsetFunctions() {
=======
private List<? extends Stmt> generateSubsetFunctions(Solver solver) {
>>>>>>>
private List<? extends Stmt> generateSubsetFunctions() {
<<<<<<<
public List<Stmt> generateInitialisers() {
=======
public List<? extends Stmt> generateInitialisers(Solver solver) {
>>>>>>>
public List<? extends Stmt> generateInitialisers() { |
<<<<<<<
public Object getOrCreate(InjectSignature signature, Factory factory) throws ObjectGraphException {
lock.lock();
=======
public Object getOrCreate(InjectSignature signature, Factory factory) {
mapLock.lock();
>>>>>>>
public Object getOrCreate(InjectSignature signature, Factory factory) throws ObjectGraphException {
mapLock.lock(); |
<<<<<<<
import org.apache.commons.lang.StringUtils;
import org.opencastproject.mediapackage.MediaPackageException;
import org.opencastproject.mediapackage.Track;
import org.opencastproject.silencedetection.api.MediaSegment;
import org.opencastproject.silencedetection.api.MediaSegments;
import org.opencastproject.silencedetection.api.SilenceDetectionFailedException;
import org.opencastproject.silencedetection.impl.SilenceDetectionProperties;
import org.opencastproject.util.NotFoundException;
import org.opencastproject.workspace.api.Workspace;
import org.osgi.framework.BundleContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
=======
>>>>>>>
import org.osgi.framework.BundleContext;
<<<<<<<
=======
minSilenceLength = parseLong(properties, SilenceDetectionProperties.SILENCE_MIN_LENGTH, DEFAULT_SILENCE_MIN_LENGTH);
minVoiceLength = parseLong(properties, SilenceDetectionProperties.VOICE_MIN_LENGTH, DEFAULT_VOICE_MIN_LENGTH);
preSilenceLength = parseLong(properties, SilenceDetectionProperties.SILENCE_PRE_LENGTH, DEFAULT_SILENCE_PRE_LENGTH);
thresholdDB = properties.getProperty(SilenceDetectionProperties.SILENCE_THRESHOLD_DB, DEFAULT_THRESHOLD_DB);
String binary = properties.getProperty(FFMPEG_BINARY_CONFIG, FFMPEG_BINARY_DEFAULT);
>>>>>>>
minSilenceLength = parseLong(properties, SilenceDetectionProperties.SILENCE_MIN_LENGTH, DEFAULT_SILENCE_MIN_LENGTH);
minVoiceLength = parseLong(properties, SilenceDetectionProperties.VOICE_MIN_LENGTH, DEFAULT_VOICE_MIN_LENGTH);
preSilenceLength = parseLong(properties, SilenceDetectionProperties.SILENCE_PRE_LENGTH, DEFAULT_SILENCE_PRE_LENGTH);
thresholdDB = properties.getProperty(SilenceDetectionProperties.SILENCE_THRESHOLD_DB, DEFAULT_THRESHOLD_DB);
String binary = properties.getProperty(FFMPEG_BINARY_CONFIG, FFMPEG_BINARY_DEFAULT); |
<<<<<<<
if (context != null) {
if (context.decrementAndGet() == 0) {
if (thrown != null) {
SpanUtil.onError(thrown, context.getSpan());
}
context.closeAndFinish();
}
=======
if (context != null && context.decrementAndGet() == 0) {
if (thrown != null)
captureException(context.getSpan(), thrown);
context.closeAndFinish();
>>>>>>>
if (context != null && context.decrementAndGet() == 0) {
if (thrown != null)
SpanUtil.onError(thrown, context.getSpan());
context.closeAndFinish(); |
<<<<<<<
ListView listView = (ListView) findViewById(R.id.listView);
listView.setAdapter(new ArrayAdapter<>(this, android.R.layout.simple_list_item_1
, new String[]{"提示框", "确定框", "换头像", "输入框", "进度框", "等待框", "动态改变内容"
, "自定义dialog", "list中使用", "倒计时"}));
listView.setOnItemClickListener(this);
=======
RecyclerView recyclerView = (RecyclerView) findViewById(R.id.recyclerView);
recyclerView.setLayoutManager(new GridLayoutManager(this, 2));
List<String> data = Arrays.asList(new String[]{"提示框", "确定框", "换头像", "输入框"
, "进度框", "等待框", "动态改变内容"
, "自定义dialog", "list中使用", "倒计时", "三个按钮"});
BaseQuickAdapter adapter = new BaseQuickAdapter<String, BaseViewHolder>(android.R.layout.simple_list_item_1
, data) {
@Override
protected void convert(BaseViewHolder helper, String item) {
helper.setText(android.R.id.text1, item);
}
};
recyclerView.setAdapter(adapter);
adapter.setOnItemClickListener(this);
// ScaleLayoutConfig.init(this.getApplicationContext(),480,800);
>>>>>>>
ListView listView = (ListView) findViewById(R.id.listView);
listView.setAdapter(new ArrayAdapter<>(this, android.R.layout.simple_list_item_1
, new String[]{"提示框", "确定框", "换头像", "输入框", "进度框", "等待框", "动态改变内容"
, "自定义dialog", "list中使用", "倒计时"}));
listView.setOnItemClickListener(this);
// ScaleLayoutConfig.init(this.getApplicationContext(),480,800);
<<<<<<<
=======
case 10:
new CircleDialog.Builder(this)
.setTitle("标题")
.setText("提示框")
.setNegative("取消", new View.OnClickListener() {
@Override
public void onClick(View v) {
Toast.makeText(MainActivity.this, "取消", Toast.LENGTH_SHORT).show();
}
})
.setNeutral("中间", new View.OnClickListener() {
@Override
public void onClick(View v) {
Toast.makeText(MainActivity.this, "中间", Toast.LENGTH_SHORT).show();
}
})
.setPositive("确定", new View.OnClickListener() {
@Override
public void onClick(View v) {
Toast.makeText(MainActivity.this, "确定", Toast.LENGTH_SHORT).show();
}
})
.show();
break;
>>>>>>> |
<<<<<<<
import com.radixdlt.client.core.atoms.AtomBuilder;
import com.radixdlt.client.core.atoms.AtomObservation;
=======
>>>>>>>
import com.radixdlt.client.core.atoms.AtomObservation; |
<<<<<<<
private static String TO_ADDRESS_BASE58 = "JFgcgRKq6GbQqP8mZzDRhtr7K7YQM1vZiYopZLRpAeVxcnePRXX";
//private static String TO_ADDRESS_BASE58 = null;
private static String PAYLOAD = "A gift for you!";
private static long AMOUNT = 1000;
=======
private static String TO_ADDRESS_BASE58 = "JGuwJVu7REeqQtx7736GB9AJ91z5xB55t8NvteaoC25AumYovjp";
//private static String TO_ADDRESS_BASE58 = null;
private static long AMOUNT = 1;
private static String MESSAGE = "A gift!";
>>>>>>>
private static String TO_ADDRESS_BASE58 = "JFgcgRKq6GbQqP8mZzDRhtr7K7YQM1vZiYopZLRpAeVxcnePRXX";
//private static String TO_ADDRESS_BASE58 = null;
private static String MESSAGE = "A gift for you!";
private static long AMOUNT = 1000; |
<<<<<<<
=======
import com.radixdlt.client.core.address.EUID;
import static org.mockito.Mockito.mock;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
>>>>>>>
import static org.mockito.Mockito.mock;
import static org.assertj.core.api.Assertions.assertThatThrownBy; |
<<<<<<<
import com.radixdlt.client.core.address.EUID;
import com.radixdlt.client.core.atoms.AtomObservation;
import io.reactivex.Observable;
import io.reactivex.disposables.Disposable;
=======
>>>>>>>
import com.radixdlt.client.core.atoms.AtomObservation;
import io.reactivex.Observable;
import io.reactivex.disposables.Disposable;
<<<<<<<
private final ConcurrentHashMap<EUID, Observable<AtomObservation>> cache = new ConcurrentHashMap<>();
=======
private final ConcurrentHashMap<RadixAddress, Observable<Atom>> cache = new ConcurrentHashMap<>();
>>>>>>>
private final ConcurrentHashMap<RadixAddress, Observable<AtomObservation>> cache = new ConcurrentHashMap<>();
<<<<<<<
private final Function<EUID, Observable<AtomObservation>> fetcher;
=======
private final Function<RadixAddress, Observable<Atom>> fetcher;
>>>>>>>
private final Function<RadixAddress, Observable<AtomObservation>> fetcher;
<<<<<<<
euid, destination -> {
Observable<AtomObservation> fetchedAtoms = fetcher.apply(destination)
=======
address, destination -> {
Observable<Atom> fetchedAtoms = fetcher.apply(destination)
>>>>>>>
address, destination -> {
Observable<AtomObservation> fetchedAtoms = fetcher.apply(destination)
<<<<<<<
fetchedAtoms.subscribe(atomObservation -> atomStore.accept(euid, atomObservation));
=======
fetchedAtoms.subscribe(atom -> atomStore.accept(address, atom));
>>>>>>>
fetchedAtoms.subscribe(atomObservation -> atomStore.accept(address, atomObservation)); |
<<<<<<<
import com.radixdlt.client.atommodel.tokens.TokenClassReference;
=======
>>>>>>>
import com.radixdlt.client.atommodel.tokens.TokenClassReference; |
<<<<<<<
Observable.fromCallable(() -> new TransactionAtoms(address, Asset.XRD.getId())),
ledger.getAllAtoms(address.getUID()),
=======
Observable.fromCallable(() -> new TransactionAtoms(address, Asset.TEST.getId())),
ledger.getAllAtoms(address.getUID(), TransactionAtom.class),
>>>>>>>
Observable.fromCallable(() -> new TransactionAtoms(address, Asset.TEST.getId())),
ledger.getAllAtoms(address.getUID()), |
<<<<<<<
import com.google.gson.JsonArray;
=======
import java.util.List;
import java.util.UUID;
import org.json.JSONObject;
import org.radix.common.ID.EUID;
import org.radix.serialization2.DsonOutput.Output;
import org.radix.serialization2.JsonJavaType;
import org.radix.serialization2.Serialization;
import org.radix.serialization2.client.GsonJson;
import org.radix.serialization2.client.Serialize;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
>>>>>>>
import com.google.gson.JsonArray;
import java.util.List;
import java.util.UUID;
import org.json.JSONObject;
import org.radix.common.ID.EUID;
import org.radix.serialization2.DsonOutput.Output;
import org.radix.serialization2.JsonJavaType;
import org.radix.serialization2.Serialization;
import org.radix.serialization2.client.GsonJson;
import org.radix.serialization2.client.Serialize;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
<<<<<<<
import com.radixdlt.client.core.atoms.AtomObservation;
=======
import com.radixdlt.client.core.atoms.Atom;
>>>>>>>
import com.radixdlt.client.core.atoms.AtomObservation;
import com.radixdlt.client.core.atoms.Atom;
<<<<<<<
* @param destination atoms at a particular destination
=======
* @param atomQuery query specifying which atoms to retrieve
>>>>>>>
* @param atomQuery query specifying which atoms to retrieve
<<<<<<<
public Observable<AtomObservation> getAtoms(EUID destination) {
=======
public Observable<Atom> getAtoms(AtomQuery atomQuery) {
>>>>>>>
public Observable<AtomObservation> getAtoms(AtomQuery atomQuery) {
<<<<<<<
.flatMap(observedAtomsJson -> {
JsonArray atomsJson = observedAtomsJson.getAsJsonArray("atoms");
boolean isHead = observedAtomsJson.has("isHead") && observedAtomsJson.get("isHead").getAsBoolean();
return Observable.fromIterable(atomsJson)
.map(atomJson -> RadixJson.getGson().fromJson(atomJson, Atom.class))
.map(AtomObservation::storeAtom)
.concatWith(Maybe.fromCallable(() -> isHead ? AtomObservation.head() : null));
=======
.map(jsonAtom -> Serialize.getInstance().fromJson(jsonAtom.toString(), Atom.class))
.map(atom -> {
atom.putDebug("RECEIVED", System.currentTimeMillis());
return atom;
>>>>>>>
.flatMap(observedAtomsJson -> {
JsonArray atomsJson = observedAtomsJson.getAsJsonArray("atoms");
boolean isHead = observedAtomsJson.has("isHead") && observedAtomsJson.get("isHead").getAsBoolean();
return Observable.fromIterable(atomsJson)
.map(jsonAtom -> Serialize.getInstance().fromJson(jsonAtom.toString(), Atom.class))
.map(AtomObservation::storeAtom)
.concatWith(Maybe.fromCallable(() -> isHead ? AtomObservation.head() : null)); |
<<<<<<<
import com.radixdlt.client.core.address.EUID;
import com.radixdlt.client.core.atoms.AtomObservation;
=======
import com.radixdlt.client.atommodel.accounts.RadixAddress;
import com.radixdlt.client.core.atoms.Atom;
>>>>>>>
import com.radixdlt.client.atommodel.accounts.RadixAddress;
import com.radixdlt.client.core.atoms.AtomObservation;
<<<<<<<
Observable<AtomObservation> getAtoms(EUID destination);
=======
Observable<Atom> getAtoms(RadixAddress address);
>>>>>>>
Observable<AtomObservation> getAtoms(RadixAddress address); |
<<<<<<<
=======
import com.radixdlt.client.core.atoms.Atom;
>>>>>>>
<<<<<<<
return ledger.getAllAtoms(address.getUID())
.map(dataStoreTranslator::fromAtom)
.flatMapMaybe(data -> data.isPresent() ? Maybe.just(data.get()) : Maybe.empty());
=======
pull();
return ledger.getAtomStore().getAtoms(address.getUID())
.filter(Atom::isMessageAtom)
.map(Atom::getAsMessageAtom)
.map(dataStoreTranslator::fromAtom);
>>>>>>>
pull();
return ledger.getAtomStore().getAtoms(address.getUID())
.map(dataStoreTranslator::fromAtom)
.flatMapMaybe(data -> data.isPresent() ? Maybe.just(data.get()) : Maybe.empty());
<<<<<<<
ledger.getAllAtoms(address.getUID()),
=======
ledger.getAtomStore().getAtoms(address.getUID())
.filter(Atom::isTransactionAtom)
.map(Atom::getAsTransactionAtom),
>>>>>>>
ledger.getAtomStore().getAtoms(address.getUID()), |
<<<<<<<
observer.assertValue(observation -> observation.getAtom().getAsMessageAtom().getApplicationId().equals("Test"));
=======
>>>>>>> |
<<<<<<<
import io.reactivex.Maybe;
=======
import io.reactivex.Observable;
>>>>>>>
import io.reactivex.Maybe;
import io.reactivex.Observable;
<<<<<<<
* Flag whether to check universe or not
*/
private final boolean checkUniverse;
/**
=======
* The amount of time to delay in between node connection requests
*/
private final int delaySecs;
/**
>>>>>>>
* Flag whether to check universe or not
*/
private final boolean checkUniverse;
/**
* The amount of time to delay in between node connection requests
*/
private final int delaySecs;
/**
<<<<<<<
this.checkUniverse = checkUniverse;
=======
this.delaySecs = 3;
>>>>>>>
this.checkUniverse = checkUniverse;
this.delaySecs = 3; |
<<<<<<<
=======
import com.yahoo.omid.notifications.client.OmidDelta;
>>>>>>>
<<<<<<<
=======
protected static OmidDelta registrationService;
>>>>>>>
<<<<<<<
=======
registrationService = new OmidDelta("TestApp");
>>>>>>>
<<<<<<<
=======
if (registrationService != null) {
registrationService.close();
}
>>>>>>> |
<<<<<<<
this.previousLargestDeletedTimestamp = this.timestampOracle.get();
this.largestDeletedTimestamp = this.previousLargestDeletedTimestamp;
this.uncommited = new Uncommitted(timestampOracle.first());
=======
>>>>>>>
<<<<<<<
this.uncommited = new Uncommitted(timestampOracle.first());
=======
this.previousLargestDeletedTimestamp = this.timestampOracle.get();
this.largestDeletedTimestamp = this.previousLargestDeletedTimestamp;
this.uncommited = new Uncommited(timestampOracle.first());
>>>>>>>
this.previousLargestDeletedTimestamp = this.timestampOracle.get();
this.largestDeletedTimestamp = this.previousLargestDeletedTimestamp;
this.uncommited = new Uncommitted(timestampOracle.first()); |
<<<<<<<
import com.yahoo.omid.client.CommitUnsuccessfulException;
import com.yahoo.omid.transaction.TransactionManager;
import com.yahoo.omid.transaction.TransactionState;
import com.yahoo.omid.transaction.TTable;
=======
import com.yahoo.omid.transaction.RollbackException;
import com.yahoo.omid.transaction.TransactionManager;
import com.yahoo.omid.transaction.Transaction;
import com.yahoo.omid.transaction.TTable;
>>>>>>>
import com.yahoo.omid.transaction.RollbackException;
import com.yahoo.omid.transaction.TTable;
import com.yahoo.omid.transaction.Transaction;
import com.yahoo.omid.transaction.TransactionManager; |
<<<<<<<
import com.yahoo.omid.notifications.client.IncrementalApplication;
import com.yahoo.omid.notifications.client.Observer;
import com.yahoo.omid.notifications.client.DeltaOmid;
=======
import com.yahoo.omid.notifications.client.ObserverBehaviour;
import com.yahoo.omid.notifications.client.OmidDelta;
>>>>>>>
import com.yahoo.omid.notifications.client.DeltaOmid;
import com.yahoo.omid.notifications.client.IncrementalApplication;
import com.yahoo.omid.notifications.client.Observer;
<<<<<<<
=======
final OmidDelta registrationService = new OmidDelta("ExampleApp");
>>>>>>>
<<<<<<<
}
=======
}
Runtime.getRuntime().addShutdownHook(new Thread() {
public void run() {
try {
registrationService.close();
logger.info("ooo Omid ooo - Omid's Notification Example App Stopped (CTRL+C) - ooo Omid ooo");
} catch (IOException e) {
// Ignore
}
}
});
>>>>>>>
}
<<<<<<<
Observer obs1 = new Observer() {
Interest interestObs1 = new Interest(Constants.TABLE_1, Constants.COLUMN_FAMILY_1, Constants.COLUMN_1);
=======
Interest interestObs1 = new Interest(Constants.TABLE, Constants.COLUMN_FAMILY_1, Constants.COLUMN_1);
registrationService.registerObserverInterest("o1" /* Observer Name */, new ObserverBehaviour() {
>>>>>>>
Observer obs1 = new Observer() {
Interest interestObs1 = new Interest(Constants.TABLE_1, Constants.COLUMN_FAMILY_1, Constants.COLUMN_1);
<<<<<<<
=======
registrationService.close();
>>>>>>> |
<<<<<<<
import com.yahoo.omid.transaction.TransactionManager;
import com.yahoo.omid.transaction.TransactionState;
import com.yahoo.omid.transaction.TTable;
=======
import com.yahoo.omid.transaction.TransactionManager;
import com.yahoo.omid.transaction.Transaction;
import com.yahoo.omid.transaction.TTable;
>>>>>>>
import com.yahoo.omid.transaction.TTable;
import com.yahoo.omid.transaction.Transaction;
import com.yahoo.omid.transaction.TransactionManager;
<<<<<<<
TTable table = new TTable(hbaseConf, TEST_TABLE);
TransactionState t=tm.beginTransaction();
=======
TTable table = new TTable(hbaseConf, TEST_TABLE);
Transaction t=tm.begin();
>>>>>>>
TTable table = new TTable(hbaseConf, TEST_TABLE);
Transaction t=tm.begin();
<<<<<<<
TTable table = new TTable(hbaseConf, TEST_TABLE);
TransactionState t=tm.beginTransaction();
=======
TTable table = new TTable(hbaseConf, TEST_TABLE);
Transaction t=tm.begin();
>>>>>>>
TTable table = new TTable(hbaseConf, TEST_TABLE);
Transaction t=tm.begin();
<<<<<<<
TTable table = new TTable(hbaseConf, TEST_TABLE);
TransactionState t=tm.beginTransaction();
=======
TTable table = new TTable(hbaseConf, TEST_TABLE);
Transaction t=tm.begin();
>>>>>>>
TTable table = new TTable(hbaseConf, TEST_TABLE);
Transaction t=tm.begin(); |
<<<<<<<
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.concurrent.ExecutionException;
import static com.yahoo.omid.committable.CommitTable.CommitTimestamp.Location.CACHE;
import static com.yahoo.omid.committable.CommitTable.CommitTimestamp.Location.COMMIT_TABLE;
import static com.yahoo.omid.committable.CommitTable.CommitTimestamp.Location.NOT_PRESENT;
import static com.yahoo.omid.committable.CommitTable.CommitTimestamp.Location.SHADOW_CELL;
import static com.yahoo.omid.metrics.MetricsUtils.name;
=======
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.concurrent.ExecutionException;
import static com.yahoo.omid.committable.CommitTable.CommitTimestamp.Location.CACHE;
import static com.yahoo.omid.committable.CommitTable.CommitTimestamp.Location.COMMIT_TABLE;
import static com.yahoo.omid.committable.CommitTable.CommitTimestamp.Location.NOT_PRESENT;
import static com.yahoo.omid.committable.CommitTable.CommitTimestamp.Location.SHADOW_CELL;
>>>>>>>
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.concurrent.ExecutionException;
import static com.yahoo.omid.committable.CommitTable.CommitTimestamp.Location.CACHE;
import static com.yahoo.omid.committable.CommitTable.CommitTimestamp.Location.COMMIT_TABLE;
import static com.yahoo.omid.committable.CommitTable.CommitTimestamp.Location.NOT_PRESENT;
import static com.yahoo.omid.committable.CommitTable.CommitTimestamp.Location.SHADOW_CELL;
import static com.yahoo.omid.metrics.MetricsUtils.name;
<<<<<<<
public void postBegin(AbstractTransaction<? extends CellId> transaction) throws TransactionManagerException {
}
;
=======
public void postBegin(AbstractTransaction<? extends CellId> transaction)
throws TransactionManagerException {
}
;
>>>>>>>
public void postBegin(AbstractTransaction<? extends CellId> transaction) throws TransactionManagerException {
}
<<<<<<<
public void preCommit(AbstractTransaction<? extends CellId> transaction) throws TransactionManagerException {
}
;
=======
public void preCommit(AbstractTransaction<? extends CellId> transaction)
throws TransactionManagerException {
}
;
>>>>>>>
public void preCommit(AbstractTransaction<? extends CellId> transaction) throws TransactionManagerException {
}
<<<<<<<
Optional<CommitTimestamp> readCommitTimestampFromShadowCell(long cellStartTimestamp, CommitTimestampLocator locator)
=======
Optional<CommitTimestamp> readCommitTimestampFromShadowCell(long cellStartTimestamp,
CommitTimestampLocator locator)
>>>>>>>
Optional<CommitTimestamp> readCommitTimestampFromShadowCell(long cellStartTimestamp, CommitTimestampLocator locator) |
<<<<<<<
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.SettableFuture;
=======
>>>>>>>
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.SettableFuture;
<<<<<<<
import com.yahoo.omid.metrics.NullMetricsProvider;
import com.yahoo.omid.tsoclient.TSOClient;
=======
>>>>>>>
import com.yahoo.omid.metrics.NullMetricsProvider;
<<<<<<<
PostCommitActions syncPostCommitter = spy(
new HBaseSyncPostCommitter(new NullMetricsProvider(), commitTableClient));
AbstractTransactionManager tm = HBaseTransactionManager.newBuilder()
.withConfiguration(hbaseConf)
.withCommitTableClient(commitTableClient)
.withTSOClient(client)
.postCommitter(syncPostCommitter)
.build();
=======
AbstractTransactionManager tm = spy((AbstractTransactionManager) HBaseTransactionManager.builder(hbaseOmidClientConf)
.commitTableClient(commitTableClient)
.build());
>>>>>>>
PostCommitActions syncPostCommitter = spy(
new HBaseSyncPostCommitter(new NullMetricsProvider(), commitTableClient));
AbstractTransactionManager tm = HBaseTransactionManager.builder(hbaseOmidClientConf)
.commitTableClient(commitTableClient)
.postCommitter(syncPostCommitter)
.build();
<<<<<<<
PostCommitActions syncPostCommitter = spy(
new HBaseSyncPostCommitter(new NullMetricsProvider(), commitTableClient));
AbstractTransactionManager tm = HBaseTransactionManager.newBuilder()
.withConfiguration(hbaseConf)
.withCommitTableClient(commitTableClient)
.withTSOClient(client)
.postCommitter(syncPostCommitter)
.build();
=======
AbstractTransactionManager tm = spy((AbstractTransactionManager) HBaseTransactionManager.builder(hbaseOmidClientConf)
.commitTableClient(commitTableClient)
.build());
>>>>>>>
PostCommitActions syncPostCommitter = spy(
new HBaseSyncPostCommitter(new NullMetricsProvider(), commitTableClient));
AbstractTransactionManager tm = HBaseTransactionManager.builder(hbaseOmidClientConf)
.commitTableClient(commitTableClient)
.postCommitter(syncPostCommitter)
.build(); |
<<<<<<<
import com.yahoo.omid.metrics.NullMetricsProvider;
import com.yahoo.omid.tsoclient.TSOClient;
import org.apache.commons.configuration.BaseConfiguration;
=======
>>>>>>>
import com.yahoo.omid.metrics.NullMetricsProvider;
import com.yahoo.omid.tsoclient.TSOClient;
import org.apache.commons.configuration.BaseConfiguration;
<<<<<<<
TSOClient client = TSOClient.newBuilder().withConfiguration(getTSOClientDefaultConfiguration()).build();
PostCommitActions syncPostCommitter = spy(
new HBaseSyncPostCommitter(new NullMetricsProvider(), commitTableClient));
AbstractTransactionManager tm = HBaseTransactionManager.newBuilder()
.withConfiguration(hbaseConf)
.withCommitTableClient(commitTableClient)
.withTSOClient(client)
.postCommitter(syncPostCommitter)
.build();
=======
HBaseOmidClientConfiguration hbaseOmidClientConf = new HBaseOmidClientConfiguration();
hbaseOmidClientConf.setConnectionString(TSO_SERVER_HOST + ":" + TSO_SERVER_PORT);
hbaseOmidClientConf.setHBaseConfiguration(hbaseConf);
AbstractTransactionManager tm = spy((AbstractTransactionManager) HBaseTransactionManager.builder(hbaseOmidClientConf)
.commitTableClient(commitTableClient)
.build());
>>>>>>>
HBaseOmidClientConfiguration hbaseOmidClientConf = new HBaseOmidClientConfiguration();
hbaseOmidClientConf.setConnectionString(TSO_SERVER_HOST + ":" + TSO_SERVER_PORT);
hbaseOmidClientConf.setHBaseConfiguration(hbaseConf);
PostCommitActions syncPostCommitter = spy(
new HBaseSyncPostCommitter(new NullMetricsProvider(), commitTableClient));
AbstractTransactionManager tm = spy((AbstractTransactionManager) HBaseTransactionManager.builder(hbaseOmidClientConf)
.postCommitter(syncPostCommitter)
.commitTableClient(commitTableClient)
.build()); |
<<<<<<<
=======
private Interest interest;
private AppSandbox appSandbox;
>>>>>>>
<<<<<<<
public ScannerContainer(String interest, AppSandbox appSandbox) throws IOException {
this.interest = Interest.fromString(interest);
this.appSandbox = appSandbox;
this.exec = Executors.newSingleThreadExecutor(new ThreadFactoryBuilder().setNameFormat("Scanner container [" + interest + "]").build());
// Generate scaffolding on HBase to maintain the information required to
// perform notifications
HBaseAdmin admin = new HBaseAdmin(config);
try { // TODO: This code should not be here in a production system
// because it disables the table to add a CF
HTableDescriptor tableDesc = admin.getTableDescriptor(this.interest.getTableAsHBaseByteArray());
if (!tableDesc.hasFamily(Bytes.toBytes(Constants.HBASE_META_CF))) {
String tableName = this.interest.getTable();
=======
public ScannerContainer(String interest, AppSandbox appSandbox) throws IOException {
this.interest = Interest.fromString(interest);
this.appSandbox = appSandbox;
this.exec = Executors.newSingleThreadExecutor(new ThreadFactoryBuilder().setNameFormat("Scanner container [" + interest + "]").build());
// Generate scaffolding on HBase to maintain the information required to
// perform notifications
HBaseAdmin admin = new HBaseAdmin(config);
try { // TODO: This code should not be here in a production system
// because it disables the table to add a CF
HTableDescriptor tableDesc = admin.getTableDescriptor(this.interest.getTableAsHBaseByteArray());
if (!tableDesc.hasFamily(Bytes.toBytes(Constants.HBASE_META_CF))) {
String tableName = this.interest.getTable();
>>>>>>>
public ScannerContainer(String interest, AppSandbox appSandbox) throws IOException {
this.interest = Interest.fromString(interest);
this.appSandbox = appSandbox;
this.exec = Executors.newSingleThreadExecutor(new ThreadFactoryBuilder().setNameFormat("Scanner container [" + interest + "]").build());
// Generate scaffolding on HBase to maintain the information required to
// perform notifications
HBaseAdmin admin = new HBaseAdmin(config);
try { // TODO: This code should not be here in a production system
// because it disables the table to add a CF
HTableDescriptor tableDesc = admin.getTableDescriptor(this.interest.getTableAsHBaseByteArray());
if (!tableDesc.hasFamily(Bytes.toBytes(Constants.HBASE_META_CF))) {
String tableName = this.interest.getTable(); |
<<<<<<<
import com.yahoo.omid.transaction.TransactionManager;
import com.yahoo.omid.transaction.TransactionState;
import com.yahoo.omid.transaction.TTable;
=======
import com.yahoo.omid.transaction.TransactionManager;
import com.yahoo.omid.transaction.Transaction;
import com.yahoo.omid.transaction.TTable;
>>>>>>>
import com.yahoo.omid.transaction.TTable;
import com.yahoo.omid.transaction.Transaction;
import com.yahoo.omid.transaction.TransactionManager; |
<<<<<<<
import scala.actors.threadpool.Arrays;
=======
import com.google.common.util.concurrent.ThreadFactoryBuilder;
>>>>>>>
import scala.actors.threadpool.Arrays;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
<<<<<<<
private Configuration config = HBaseConfiguration.create();
private final ExecutorService exec = Executors.newSingleThreadExecutor();
=======
private final ExecutorService exec;
>>>>>>>
private Configuration config = HBaseConfiguration.create();
private final ExecutorService exec;
<<<<<<<
public ScannerContainer(String interest, AppSandbox appSandbox) throws IOException {
this.interest = Interest.fromString(interest);
this.appSandbox = appSandbox;
// Generate scaffolding on HBase to maintain the information required to
// perform notifications
HBaseAdmin admin = new HBaseAdmin(config);
try { // TODO: This code should not be here in a production system
// because it disables the table to add a CF
HTableDescriptor tableDesc = admin.getTableDescriptor(this.interest.getTableAsHBaseByteArray());
if (!tableDesc.hasFamily(Bytes.toBytes(Constants.HBASE_META_CF))) {
String tableName = this.interest.getTable();
=======
public ScannerContainer(String interest, Map<String, List<String>> interestsToObservers, Map<String, List<String>> observersToHosts) {
this.interest = interest;
this.interestsToObservers = interestsToObservers;
this.observersToHosts = observersToHosts;
exec = Executors.newSingleThreadExecutor(new ThreadFactoryBuilder().setNameFormat("Scanner container [" + interest + "]").build());
>>>>>>>
public ScannerContainer(String interest, AppSandbox appSandbox) throws IOException {
this.interest = Interest.fromString(interest);
this.appSandbox = appSandbox;
this.exec = Executors.newSingleThreadExecutor(new ThreadFactoryBuilder().setNameFormat("Scanner container [" + interest + "]").build());
// Generate scaffolding on HBase to maintain the information required to
// perform notifications
HBaseAdmin admin = new HBaseAdmin(config);
try { // TODO: This code should not be here in a production system
// because it disables the table to add a CF
HTableDescriptor tableDesc = admin.getTableDescriptor(this.interest.getTableAsHBaseByteArray());
if (!tableDesc.hasFamily(Bytes.toBytes(Constants.HBASE_META_CF))) {
String tableName = this.interest.getTable(); |
<<<<<<<
=======
import com.ebay.junitnexgen.category.Module;
>>>>>>>
<<<<<<<
//@Category( {P1,IE })
// @Module("VjoRuntimeTests")
=======
//@Category( {P1,IE })
@Module("VjoRuntimeTests")
>>>>>>>
//@Category( {P1,IE })
<<<<<<<
//@Category( {P2,FF })
// @Module("VjoRuntimeTests")
=======
//@Category( {P2,FF })
@Module("VjoRuntimeTests")
>>>>>>> |
<<<<<<<
=======
import com.ebay.junitnexgen.category.Module;
>>>>>>>
<<<<<<<
//@Category( { P1, IE })
// @Module("VjoRuntimeTests")
=======
//@Category( { P1, IE })
@Module("VjoRuntimeTests")
>>>>>>>
<<<<<<<
//@Category( { P2, FF })
// @Module("VjoRuntimeTests")
=======
//@Category( { P2, FF })
@Module("VjoRuntimeTests")
>>>>>>> |
<<<<<<<
=======
import static org.junit.Assert.fail;
>>>>>>>
<<<<<<<
=======
import com.ebay.junitnexgen.category.Module;
>>>>>>>
<<<<<<<
//@Category( { P2, FF })
// @Module("VjoRuntimeTests")
=======
//@Category( { P2, FF })
@Module("VjoRuntimeTests")
>>>>>>>
//@Category( { P2, FF })
// @Module("VjoRuntimeTests")
<<<<<<<
//@Category( { P2, FF })
// @Module("VjoRuntimeTests")
=======
//@Category( { P2, FF })
@Module("VjoRuntimeTests")
>>>>>>>
//@Category( { P2, FF })
// @Module("VjoRuntimeTests")
<<<<<<<
//@Category( { P2, FF })
// @Module("VjoRuntimeTests")
=======
//@Category( { P2, FF })
@Module("VjoRuntimeTests")
>>>>>>>
//@Category( { P2, FF })
// @Module("VjoRuntimeTests")
<<<<<<<
//@Category( { P2, FF })
// @Module("VjoRuntimeTests")
=======
//@Category( { P2, FF })
@Module("VjoRuntimeTests")
>>>>>>>
//@Category( { P2, FF })
// @Module("VjoRuntimeTests")
<<<<<<<
//@Category( { P2, FF })
// @Module("VjoRuntimeTests")
=======
//@Category( { P2, FF })
@Module("VjoRuntimeTests")
>>>>>>>
//@Category( { P2, FF })
// @Module("VjoRuntimeTests") |
<<<<<<<
import static org.junit.Assert.assertTrue;
=======
>>>>>>>
import static org.junit.Assert.assertTrue; |
<<<<<<<
import org.springframework.data.graph.neo4j.support.query.ConversionServiceQueryResultConverter;
import org.springframework.data.graph.neo4j.support.query.EmbeddedQueryEngine;
import org.springframework.data.graph.neo4j.support.query.QueryEngine;
import org.springframework.data.graph.neo4j.support.query.QueryResultConverter;
=======
import org.springframework.data.graph.neo4j.support.query.EmbeddedQueryEngine;
import org.springframework.data.graph.neo4j.support.query.QueryEngine;
>>>>>>>
import org.springframework.data.graph.neo4j.support.query.ConversionServiceQueryResultConverter;
import org.springframework.data.graph.neo4j.support.query.EmbeddedQueryEngine;
import org.springframework.data.graph.neo4j.support.query.QueryEngine;
<<<<<<<
@Override
public QueryEngine queryEngineFor(EmbeddedQueryEngine.Type type) {
return new EmbeddedQueryEngine(delegate, createResultConverter());
}
private ConversionServiceQueryResultConverter createResultConverter() {
if (conversionService == null) return null;
return new ConversionServiceQueryResultConverter(conversionService);
}
=======
@Override
public QueryEngine queryEngineFor(EmbeddedQueryEngine.Type type) {
return new EmbeddedQueryEngine(delegate);
}
>>>>>>>
@Override
public QueryEngine queryEngineFor(EmbeddedQueryEngine.Type type) {
return new EmbeddedQueryEngine(delegate, createResultConverter());
}
private ConversionServiceQueryResultConverter createResultConverter() {
if (conversionService == null) return null;
return new ConversionServiceQueryResultConverter(conversionService);
} |
<<<<<<<
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
=======
import android.os.Handler;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
>>>>>>>
import android.os.Handler;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
<<<<<<<
=======
import android.view.Display;
import android.view.LayoutInflater;
>>>>>>>
import android.view.Display;
import android.view.LayoutInflater;
<<<<<<<
import android.view.View.OnClickListener;
import android.widget.CompoundButton;
import android.widget.CompoundButton.OnCheckedChangeListener;
import android.widget.RadioButton;
=======
import android.view.animation.Animation;
import android.view.animation.Animation.AnimationListener;
import android.view.animation.TranslateAnimation;
import android.widget.FrameLayout;
>>>>>>>
import android.view.animation.Animation;
import android.view.animation.Animation.AnimationListener;
import android.view.animation.TranslateAnimation;
import android.widget.FrameLayout;
<<<<<<<
static final private int MENU_COMMAND_REFRESH = Menu.FIRST + 0;
static final private int MENU_COMMAND_MORE = Menu.FIRST + 1;
private MyApplication m_application;
private String m_selfPlayerID;
private View m_spinner;
private int m_curTab = TAB_PROFILE;
=======
static final private int MENU_COMMAND_REFRESH = Menu.FIRST + 0;
static final private int MENU_COMMAND_MORE = Menu.FIRST + 1;
private Boolean m_showingSidebar = false;
private MyApplication m_application;
private String m_selfPlayerID;
private String m_selfPlayerName;
private View m_spinner;
private int m_curTab = TAB_PROFILE;
private Page m_curPage = Page.Profile;
private Page m_newPage;
>>>>>>>
static final private int MENU_COMMAND_REFRESH = Menu.FIRST + 0;
static final private int MENU_COMMAND_MORE = Menu.FIRST + 1;
private Boolean m_showingSidebar = false;
private MyApplication m_application;
private String m_selfPlayerID;
private String m_selfPlayerName;
private View m_spinner;
private int m_curTab = TAB_PROFILE;
private Page m_curPage = Page.Profile;
private Page m_newPage;
<<<<<<<
private RadioButton m_btnProfile;
private RadioButton m_btnActivity;
private RadioButton m_btnSkills;
private RadioButton m_btnFriends;
private ProfileFragment m_profileFrm;
private SkillFragment m_skillFrm;
private UnlearnFragment m_unlearnFrm;
private ActivityFragment m_activityFrm;
private FriendsFragment m_friendsFrm;
private View m_stack;
private View m_profileView, m_activityView, m_skillsView, m_unlearnView,
m_friendsView;
=======
private ProfileFragment m_profileFrm;
private SkillFragment m_skillFrm;
private UnlearnFragment m_unlearnFrm;
private ActivityFragment m_activityFrm;
private FriendsFragment m_friendsFrm;
private MailboxFragment m_mailboxFrm;
private SettingsFragment m_settingsFrm;
private AchievementsFragment m_achievementsFrm;
private View m_stack;
private BaseFragment m_curFrm;
private View m_profileView, m_activityView, m_skillsView, m_unlearnView,
m_friendsView, m_mailboxView, m_settingsView;
>>>>>>>
private ProfileFragment m_profileFrm;
private SkillFragment m_skillFrm;
private UnlearnFragment m_unlearnFrm;
private ActivityFragment m_activityFrm;
private FriendsFragment m_friendsFrm;
private MailboxFragment m_mailboxFrm;
private SettingsFragment m_settingsFrm;
private AchievementsFragment m_achievementsFrm;
private View m_stack;
private BaseFragment m_curFrm;
private View m_profileView, m_activityView, m_skillsView, m_unlearnView,
m_friendsView, m_mailboxView, m_settingsView;
<<<<<<<
m_application = (MyApplication) getApplicationContext();
m_application.init(this);
setTitle(getResources().getString(R.string.str_main_title));
initLayout();
=======
m_application = (MyApplication) getApplicationContext();
m_application.homeScreen = this;
m_application.Init(this);
>>>>>>>
m_application = (MyApplication) getApplicationContext();
m_application.homeScreen = this;
m_application.init(this);
<<<<<<<
public void setCurrentFragment(Fragment f, boolean bAddToStack) {
FragmentManager fm = getSupportFragmentManager();
=======
public MailboxFragment getMailboxFragment()
{
return m_mailboxFrm;
}
public void setCurrentFragment(Fragment f, boolean bAddToStack) {
m_curFrm = (BaseFragment) f;
FragmentManager fm = getSupportFragmentManager();
>>>>>>>
public MailboxFragment getMailboxFragment()
{
return m_mailboxFrm;
}
public void setCurrentFragment(Fragment f, boolean bAddToStack) {
m_curFrm = (BaseFragment) f;
FragmentManager fm = getSupportFragmentManager();
<<<<<<<
int nTab = m_btnProfile.isChecked() ? TAB_PROFILE : (m_btnActivity
.isChecked() ? TAB_ACTIVITY
: (m_btnFriends.isChecked() ? TAB_FRIENDS : TAB_SKILLS));
=======
>>>>>>>
<<<<<<<
((BaseFragment) f).logPageView();
if (nTab == TAB_PROFILE) {
=======
((BaseFragment) f).logPageView();
if (m_curPage == Page.Profile) {
>>>>>>>
((BaseFragment) f).logPageView();
if (m_curPage == Page.Profile) {
<<<<<<<
} else if (nTab == TAB_ACTIVITY) {
=======
} else if (m_curPage == Page.Activity) {
>>>>>>>
} else if (m_curPage == Page.Activity) {
<<<<<<<
} else if (nTab == TAB_FRIENDS) {
=======
m_mailboxView.setVisibility(View.GONE);
m_settingsView.setVisibility(View.GONE);
} else if (m_curPage == Page.Friends) {
>>>>>>>
m_mailboxView.setVisibility(View.GONE);
m_settingsView.setVisibility(View.GONE);
} else if (m_curPage == Page.Friends) {
<<<<<<<
m_unlearnView.setVisibility(View.GONE);
} else {
=======
m_unlearnView.setVisibility(View.GONE);
m_mailboxView.setVisibility(View.GONE);
m_settingsView.setVisibility(View.GONE);
} else if (m_curPage == Page.Mailbox) {
viewId = R.id.fragmentView_mailbox;
m_mailboxView.setVisibility(View.VISIBLE);
m_friendsView.setVisibility(View.GONE);
m_profileView.setVisibility(View.GONE);
m_activityView.setVisibility(View.GONE);
m_skillsView.setVisibility(View.GONE);
m_unlearnView.setVisibility(View.GONE);
m_settingsView.setVisibility(View.GONE);
} else if (m_curPage == Page.Settings) {
viewId = R.id.fragmentView_settings;
m_settingsView.setVisibility(View.VISIBLE);
m_friendsView.setVisibility(View.GONE);
m_profileView.setVisibility(View.GONE);
m_activityView.setVisibility(View.GONE);
m_skillsView.setVisibility(View.GONE);
m_unlearnView.setVisibility(View.GONE);
m_mailboxView.setVisibility(View.GONE);
} else {
>>>>>>>
m_unlearnView.setVisibility(View.GONE);
m_mailboxView.setVisibility(View.GONE);
m_settingsView.setVisibility(View.GONE);
} else if (m_curPage == Page.Mailbox) {
viewId = R.id.fragmentView_mailbox;
m_mailboxView.setVisibility(View.VISIBLE);
m_friendsView.setVisibility(View.GONE);
m_profileView.setVisibility(View.GONE);
m_activityView.setVisibility(View.GONE);
m_skillsView.setVisibility(View.GONE);
m_unlearnView.setVisibility(View.GONE);
m_settingsView.setVisibility(View.GONE);
} else if (m_curPage == Page.Settings) {
viewId = R.id.fragmentView_settings;
m_settingsView.setVisibility(View.VISIBLE);
m_friendsView.setVisibility(View.GONE);
m_profileView.setVisibility(View.GONE);
m_activityView.setVisibility(View.GONE);
m_skillsView.setVisibility(View.GONE);
m_unlearnView.setVisibility(View.GONE);
m_mailboxView.setVisibility(View.GONE);
} else {
<<<<<<<
=======
m_mailboxView.setVisibility(View.GONE);
m_settingsView.setVisibility(View.GONE);
>>>>>>>
m_mailboxView.setVisibility(View.GONE);
m_settingsView.setVisibility(View.GONE);
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
m_mailboxFrm = new MailboxFragment();
m_settingsFrm = new SettingsFragment();
>>>>>>>
m_mailboxFrm = new MailboxFragment();
m_settingsFrm = new SettingsFragment();
<<<<<<<
setCurrentFragment(m_profileFrm, false);
=======
m_mailboxView = findViewById(R.id.fragmentView_mailbox);
m_settingsView = findViewById(R.id.fragmentView_settings);
setCurrentFragment(m_profileFrm, false);
>>>>>>>
m_mailboxView = findViewById(R.id.fragmentView_mailbox);
m_settingsView = findViewById(R.id.fragmentView_settings);
setCurrentFragment(m_profileFrm, false);
<<<<<<<
public boolean onPrepareOptionsMenu(Menu menu) {
menu.clear();
BaseFragment bf;
bf = getCurrentFragment();
if (bf != null && bf.doesSupportRefresh())
menu.add(0, MENU_COMMAND_REFRESH, Menu.NONE + 0,
R.string.str_menu_refresh);
if (bf != null && bf.doesSupportMore())
menu.add(1, MENU_COMMAND_MORE, Menu.NONE + 1,
R.string.str_menu_more);
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
BaseFragment bf;
switch (item.getItemId()) {
case MENU_COMMAND_REFRESH:
bf = getCurrentFragment();
if (bf != null) {
bf.onRefresh();
FlurryAgent.logEvent(bf.getClass().toString()
+ " - Clicked to refresh");
}
break;
case MENU_COMMAND_MORE:
bf = getCurrentFragment();
if (bf != null) {
bf.onMore();
FlurryAgent.logEvent(bf.getClass().toString()
+ " - Clicked to load more");
}
break;
}
return super.onOptionsItemSelected(item);
}
public BaseFragment getCurrentFragment() {
FragmentManager fm = getSupportFragmentManager();
int resId = m_btnProfile.isChecked() ? R.id.fragmentView_profile
: (m_btnActivity.isChecked() ? R.id.fragmentView_activity
: (m_btnFriends.isChecked() ? R.id.fragmentView_friends
: R.id.fragmentView_skills));
if (resId == R.id.fragmentView_skills && skillOrUnlearn == TAB_UNLEARN) {
resId = R.id.fragmentView_unlearn;
}
return (BaseFragment) fm.findFragmentById(resId);
=======
public boolean onPrepareOptionsMenu(Menu menu) {
menu.clear();
if (m_curFrm != null && m_curFrm.doesSupportRefresh())
menu.add(0, MENU_COMMAND_REFRESH, Menu.NONE + 0,
R.string.str_menu_refresh);
if (m_curFrm != null && m_curFrm.doesSupportMore())
menu.add(1, MENU_COMMAND_MORE, Menu.NONE + 1,
R.string.str_menu_more);
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case MENU_COMMAND_REFRESH:
if (m_curFrm != null) {
m_curFrm.onRefresh();
FlurryAgent.logEvent(m_curFrm.getClass().toString()
+ " - Clicked to refresh");
}
break;
case MENU_COMMAND_MORE:
if (m_curFrm != null) {
m_curFrm.onMore();
FlurryAgent.logEvent(m_curFrm.getClass().toString()
+ " - Clicked to load more");
}
break;
}
return super.onOptionsItemSelected(item);
>>>>>>>
public boolean onPrepareOptionsMenu(Menu menu) {
menu.clear();
if (m_curFrm != null && m_curFrm.doesSupportRefresh())
menu.add(0, MENU_COMMAND_REFRESH, Menu.NONE + 0,
R.string.str_menu_refresh);
if (m_curFrm != null && m_curFrm.doesSupportMore())
menu.add(1, MENU_COMMAND_MORE, Menu.NONE + 1,
R.string.str_menu_more);
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case MENU_COMMAND_REFRESH:
if (m_curFrm != null) {
m_curFrm.onRefresh();
FlurryAgent.logEvent(m_curFrm.getClass().toString() + " - Clicked to refresh");
}
break;
case MENU_COMMAND_MORE:
if (m_curFrm != null) {
m_curFrm.onMore();
FlurryAgent.logEvent(m_curFrm.getClass().toString() + " - Clicked to load more");
}
break;
}
return super.onOptionsItemSelected(item);
<<<<<<<
/*
* void initPushToRefresh() { m_homeScrollView = ( PullToRefreshScrollView)
* findViewById(R.id.homeScrollView); m_homeScrollView.init(this);
*
* m_homeScrollView.setOnRefreshListener( new
* PullToRefreshScrollView.OnRefreshListener() {
*
* @Override public void onRefresh(boolean bTop) { getMoreInfo(!bTop); } });
* }
*/
public void setPlayerName(String playerName) {
m_btnProfile.setText(playerName);
=======
/*
* void initPushToRefresh() { m_homeScrollView = ( PullToRefreshScrollView)
* findViewById(R.id.homeScrollView); m_homeScrollView.init(this);
*
* m_homeScrollView.setOnRefreshListener( new
* PullToRefreshScrollView.OnRefreshListener() {
*
* @Override public void onRefresh(boolean bTop) { getMoreInfo(!bTop); } });
* }
*/
public void setPlayerName(String playerName) {
m_selfPlayerName = playerName;
}
public String getPlayerName() {
return m_selfPlayerName;
>>>>>>>
/*
* void initPushToRefresh() { m_homeScrollView = ( PullToRefreshScrollView)
* findViewById(R.id.homeScrollView); m_homeScrollView.init(this);
*
* m_homeScrollView.setOnRefreshListener( new
* PullToRefreshScrollView.OnRefreshListener() {
*
* @Override public void onRefresh(boolean bTop) { getMoreInfo(!bTop); } });
* }
*/
public void setPlayerName(String playerName) {
m_selfPlayerName = playerName;
}
public String getPlayerName() {
return m_selfPlayerName; |
<<<<<<<
private RadioButton m_btnProfile;
private RadioButton m_btnActivity;
private RadioButton m_btnSkills;
private RadioButton m_btnFriends;
private RadioButton m_btnAchievements;
=======
>>>>>>>
<<<<<<<
private void initBottomPane() {
m_btnProfile = (RadioButton) findViewById(R.id.btn_home);
m_btnActivity = (RadioButton) findViewById(R.id.btn_activity);
m_btnSkills = (RadioButton) findViewById(R.id.btn_skill);
m_btnFriends = (RadioButton) findViewById(R.id.btn_friends);
m_btnAchievements = (RadioButton) findViewById(R.id.btn_achievements);
m_btnProfile.setTypeface(m_application.m_vagFont);
m_btnActivity.setTypeface(m_application.m_vagFont);
m_btnSkills.setTypeface(m_application.m_vagFont);
m_btnFriends.setTypeface(m_application.m_vagFont);
m_btnAchievements.setTypeface(m_application.m_vagFont);
m_btnProfile.setOnCheckedChangeListener(new OnCheckedChangeListener() {
public void onCheckedChanged(CompoundButton buttonView,
boolean isChecked) {
// int icon = isChecked? R.drawable.id_card_icon_focus:
// R.drawable.id_card_icon;
buttonView.setTextColor(isChecked ? 0xffffffff : 0xffa0a0a0);
// buttonView.setCompoundDrawablesWithIntrinsicBounds(0, icon,
// 0, 0);
}
});
m_btnProfile.setOnClickListener(new OnClickListener() {
public void onClick(View arg0) {
if (m_curTab == TAB_PROFILE)
clearFragmentStack();
else {
setCurrentFragment(m_profileFrm, false);
m_curTab = TAB_PROFILE;
}
}
});
m_btnSkills.setOnCheckedChangeListener(new OnCheckedChangeListener() {
public void onCheckedChanged(CompoundButton buttonView,
boolean isChecked) {
// int icon = isChecked? R.drawable.skill_icon_focus:
// R.drawable.skill_icon;
buttonView.setTextColor(isChecked ? 0xffffffff : 0xffa0a0a0);
// buttonView.setCompoundDrawablesWithIntrinsicBounds(0, icon,
// 0, 0);
}
});
m_btnSkills.setOnClickListener(new OnClickListener() {
public void onClick(View arg0) {
if (m_curTab == TAB_SKILLS || m_curTab == TAB_UNLEARN)
clearFragmentStack();
else {
if (skillOrUnlearn == TAB_SKILLS) {
setCurrentFragment(m_skillFrm, false);
m_curTab = TAB_SKILLS;
skillOrUnlearn = TAB_SKILLS;
} else if (skillOrUnlearn == TAB_UNLEARN) {
setCurrentFragment(m_unlearnFrm, false);
m_curTab = TAB_UNLEARN;
skillOrUnlearn = TAB_UNLEARN;
}
}
}
});
m_btnActivity.setOnCheckedChangeListener(new OnCheckedChangeListener() {
public void onCheckedChanged(CompoundButton buttonView,
boolean isChecked) {
// int icon = isChecked? R.drawable.activity_icon_focus:
// R.drawable.activity_icon;
buttonView.setTextColor(isChecked ? 0xffffffff : 0xffa0a0a0);
// buttonView.setCompoundDrawablesWithIntrinsicBounds(0, icon,
// 0, 0);
}
=======
public void setSelectedPage(Page page) {
>>>>>>>
public void setSelectedPage(Page page) {
<<<<<<<
m_btnFriends.setOnCheckedChangeListener(new OnCheckedChangeListener() {
public void onCheckedChanged(CompoundButton buttonView,
boolean isChecked) {
buttonView.setTextColor(isChecked ? 0xffffffff : 0xffa0a0a0);
}
});
m_btnFriends.setOnClickListener(new OnClickListener() {
public void onClick(View arg0) {
if (m_curTab == TAB_FRIENDS)
clearFragmentStack();
else {
setCurrentFragment(m_friendsFrm, false);
m_curTab = TAB_FRIENDS;
}
}
});
m_btnAchievements.setOnCheckedChangeListener(new OnCheckedChangeListener() {
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
buttonView.setTextColor(isChecked ? 0xffffffff : 0xffa0a0a0);
}
});
m_btnAchievements.setOnClickListener(new OnClickListener() {
public void onClick(View arg0) {
if (m_curTab == TAB_ACHIEVEMENTS)
clearFragmentStack();
else {
setCurrentFragment(m_achievementsFrm, false);
m_curTab = TAB_ACHIEVEMENTS;
}
}
});
=======
/*
* Unlearning Code
*
* if (m_curTab == TAB_SKILLS || m_curTab == TAB_UNLEARN)
* clearFragmentStack(); else { if (skillOrUnlearn == TAB_SKILLS) {
* setCurrentFragment(m_skillFrm, false); m_curTab = TAB_SKILLS;
* skillOrUnlearn = TAB_SKILLS; } else if (skillOrUnlearn ==
* TAB_UNLEARN) { setCurrentFragment(m_unlearnFrm, false); m_curTab =
* TAB_UNLEARN; skillOrUnlearn = TAB_UNLEARN; } }
*/
>>>>>>>
/*
* Unlearning Code
*
* if (m_curTab == TAB_SKILLS || m_curTab == TAB_UNLEARN)
* clearFragmentStack(); else { if (skillOrUnlearn == TAB_SKILLS) {
* setCurrentFragment(m_skillFrm, false); m_curTab = TAB_SKILLS;
* skillOrUnlearn = TAB_SKILLS; } else if (skillOrUnlearn ==
* TAB_UNLEARN) { setCurrentFragment(m_unlearnFrm, false); m_curTab =
* TAB_UNLEARN; skillOrUnlearn = TAB_UNLEARN; } }
*/
<<<<<<<
=======
m_curFrm = (BaseFragment) f;
>>>>>>>
m_curFrm = (BaseFragment) f;
<<<<<<<
int nTab = m_btnProfile.isChecked() ? TAB_PROFILE : (m_btnActivity.isChecked() ? TAB_ACTIVITY : (m_btnFriends.isChecked() ? TAB_FRIENDS : (m_btnAchievements.isChecked() ? TAB_ACHIEVEMENTS : TAB_SKILLS)));
=======
>>>>>>>
<<<<<<<
public BaseFragment getCurrentFragment() {
FragmentManager fm = getSupportFragmentManager();
int resId = m_btnProfile.isChecked() ? R.id.fragmentView_profile : (m_btnActivity.isChecked() ? R.id.fragmentView_activity : (m_btnFriends.isChecked() ? R.id.fragmentView_friends : (m_btnAchievements.isChecked() ? R.id.fragmentView_achievements : R.id.fragmentView_skills)));
if (resId == R.id.fragmentView_skills && skillOrUnlearn == TAB_UNLEARN) {
resId = R.id.fragmentView_unlearn;
}
return (BaseFragment) fm.findFragmentById(resId);
}
=======
>>>>>>> |
<<<<<<<
private static final StackTraceElement DEFAULT_CALLER_DATA = new StackTraceElement("", "", "", 0);
=======
>>>>>>>
private static final StackTraceElement DEFAULT_CALLER_DATA = new StackTraceElement("", "", "", 0);
<<<<<<<
StackTraceElement callerData = extractCallerData(event);
fieldsNode.put("caller_class_name", callerData.getClassName());
fieldsNode.put("caller_method_name", callerData.getMethodName());
fieldsNode.put("caller_file_name", callerData.getFileName());
fieldsNode.put("caller_line_number", callerData.getLineNumber());
=======
>>>>>>>
StackTraceElement callerData = extractCallerData(event);
fieldsNode.put("caller_class_name", callerData.getClassName());
fieldsNode.put("caller_method_name", callerData.getMethodName());
fieldsNode.put("caller_file_name", callerData.getFileName());
fieldsNode.put("caller_line_number", callerData.getLineNumber());
<<<<<<<
Map<String, String> mdc = event.getMDCPropertyMap();
if (mdc != null) {
for (Entry<String, String> entry : mdc.entrySet()) {
=======
Context context = getContext();
if (context != null) {
addPropertiesAsFields(fieldsNode, context.getCopyOfPropertyMap());
}
addPropertiesAsFields(fieldsNode, event.getMDCPropertyMap());
return fieldsNode;
}
private void addPropertiesAsFields(final ObjectNode fieldsNode, final Map<String, String> properties) {
if (properties != null) {
for (Entry<String, String> entry : properties.entrySet()) {
>>>>>>>
Context context = getContext();
if (context != null) {
addPropertiesAsFields(fieldsNode, context.getCopyOfPropertyMap());
}
addPropertiesAsFields(fieldsNode, event.getMDCPropertyMap());
return fieldsNode;
}
private void addPropertiesAsFields(final ObjectNode fieldsNode, final Map<String, String> properties) {
if (properties != null) {
for (Entry<String, String> entry : properties.entrySet()) {
<<<<<<<
return fieldsNode;
}
private StackTraceElement extractCallerData(final ILoggingEvent event) {
final StackTraceElement[] ste = event.getCallerData();
if (ste == null || ste.length == 0) {
return DEFAULT_CALLER_DATA;
}
return ste[0];
=======
>>>>>>>
}
private StackTraceElement extractCallerData(final ILoggingEvent event) {
final StackTraceElement[] ste = event.getCallerData();
if (ste == null || ste.length == 0) {
return DEFAULT_CALLER_DATA;
}
return ste[0]; |
<<<<<<<
import java.nio.charset.Charset;
=======
import java.io.OutputStream;
>>>>>>>
import java.io.OutputStream;
import java.nio.charset.Charset;
<<<<<<<
=======
import ch.qos.logback.core.CoreConstants;
import ch.qos.logback.core.encoder.Encoder;
>>>>>>>
import ch.qos.logback.core.CoreConstants;
import ch.qos.logback.core.encoder.Encoder;
<<<<<<<
if (this.lineSeparator != null) {
IOUtils.write(this.lineSeparator, outputStream, charset);
}
=======
doEncodeWrapped(suffix, event);
IOUtils.write(CoreConstants.LINE_SEPARATOR, outputStream);
>>>>>>>
doEncodeWrapped(suffix, event);
if (this.lineSeparator != null) {
IOUtils.write(this.lineSeparator, outputStream, charset);
}
<<<<<<<
=======
private void doEncodeWrapped(Encoder<Event> wrapped, Event event) throws IOException {
if (wrapped != null) {
wrapped.doEncode(event);
}
}
>>>>>>>
private void doEncodeWrapped(Encoder<Event> wrapped, Event event) throws IOException {
if (wrapped != null) {
wrapped.doEncode(event);
}
}
<<<<<<<
charset = Charset.forName(formatter.getEncoding());
=======
startWrapped(prefix);
startWrapped(suffix);
}
private void startWrapped(Encoder<Event> wrapped) {
if (wrapped != null && !wrapped.isStarted()) {
wrapped.start();
}
>>>>>>>
charset = Charset.forName(formatter.getEncoding());
startWrapped(prefix);
startWrapped(suffix);
}
private void startWrapped(Encoder<Event> wrapped) {
if (wrapped != null && !wrapped.isStarted()) {
wrapped.start();
}
<<<<<<<
=======
closeWrapped(prefix);
closeWrapped(suffix);
IOUtils.write(CoreConstants.LINE_SEPARATOR, outputStream);
>>>>>>>
closeWrapped(prefix);
closeWrapped(suffix); |
<<<<<<<
import com.fasterxml.jackson.databind.JsonNode;
import org.apache.commons.lang.time.FastDateFormat;
import org.slf4j.Marker;
import java.io.IOException;
import java.util.Iterator;
import java.util.Map;
=======
>>>>>>>
import com.fasterxml.jackson.databind.JsonNode;
import org.apache.commons.lang.time.FastDateFormat;
import org.slf4j.Marker;
import java.io.IOException;
import java.util.Iterator;
import java.util.Map;
<<<<<<<
final Marker marker = event.getMarker();
=======
>>>>>>>
final Marker marker = event.getMarker();
<<<<<<<
if (marker.getName() != "JSON") {
node.add(marker.getName());
}
=======
node.add(marker.getName());
>>>>>>>
if (marker.getName() != "JSON") {
node.add(marker.getName());
}
<<<<<<<
private JsonNode getJsonNode(ILoggingEvent event) {
final Object[] args = event.getArgumentArray();
return MAPPER.convertValue(args, JsonNode.class);
}
=======
>>>>>>>
private JsonNode getJsonNode(ILoggingEvent event) {
final Object[] args = event.getArgumentArray();
return MAPPER.convertValue(args, JsonNode.class);
}
<<<<<<<
=======
public void setCustomFields(JsonNode customFields) {
this.customFields = customFields;
}
public JsonNode getCustomFields() {
return this.customFields;
}
>>>>>>>
public void setCustomFields(JsonNode customFields) {
this.customFields = customFields;
}
public JsonNode getCustomFields() {
return this.customFields;
} |
<<<<<<<
import org.sonatype.plexus.build.incremental.BuildContext;
=======
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
>>>>>>>
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.sonatype.plexus.build.incremental.BuildContext;
<<<<<<<
public class NarSystemMojo extends AbstractNarMojo {
/** @component */
private BuildContext buildContext;
@Override
public final void narExecute() throws MojoExecutionException, MojoFailureException {
// get packageName if specified for JNI.
String packageName = null;
String narSystemName = null;
File narSystemDirectory = null;
boolean jniFound = false;
for (final Iterator i = getLibraries().iterator(); !jniFound && i.hasNext();) {
final Library library = (Library) i.next();
if (library.getType().equals(Library.JNI) || library.getType().equals(Library.SHARED)) {
packageName = library.getNarSystemPackage();
narSystemName = library.getNarSystemName();
narSystemDirectory = new File(getTargetDirectory(), library.getNarSystemDirectory());
jniFound = true;
}
}
if (!jniFound || packageName == null) {
if (!jniFound) {
getLog().debug("NAR: not building a shared or JNI library, so not generating NarSystem class.");
} else {
getLog().warn("NAR: no system package specified; unable to generate NarSystem class.");
}
return;
}
=======
@Mojo(name = "nar-system-generate", defaultPhase = LifecyclePhase.GENERATE_RESOURCES, requiresProject = true)
public class NarSystemMojo
extends AbstractNarMojo
{
>>>>>>>
@Mojo(name = "nar-system-generate", defaultPhase = LifecyclePhase.GENERATE_RESOURCES, requiresProject = true)
public class NarSystemMojo
extends AbstractNarMojo
{
/** @component */
private BuildContext buildContext;
@Override
public final void narExecute() throws MojoExecutionException, MojoFailureException {
// get packageName if specified for JNI.
String packageName = null;
String narSystemName = null;
File narSystemDirectory = null;
boolean jniFound = false;
for (final Iterator i = getLibraries().iterator(); !jniFound && i.hasNext();) {
final Library library = (Library) i.next();
if (library.getType().equals(Library.JNI) || library.getType().equals(Library.SHARED)) {
packageName = library.getNarSystemPackage();
narSystemName = library.getNarSystemName();
narSystemDirectory = new File(getTargetDirectory(), library.getNarSystemDirectory());
jniFound = true;
}
}
if (!jniFound || packageName == null) {
if (!jniFound) {
getLog().debug("NAR: not building a shared or JNI library, so not generating NarSystem class.");
} else {
getLog().warn("NAR: no system package specified; unable to generate NarSystem class.");
}
return;
} |
<<<<<<<
private Set<String> includes = new HashSet<String>();
=======
@Parameter(required = true)
private Set includes = new HashSet();
>>>>>>>
@Parameter(required = true)
private Set<String> includes = new HashSet<String>();
<<<<<<<
private Set<String> excludes = new HashSet<String>();
=======
@Parameter(required = true)
private Set excludes = new HashSet();
>>>>>>>
@Parameter(required = true)
private Set<String> excludes = new HashSet<String>();
<<<<<<<
private Set<String> testIncludes = new HashSet<String>();
=======
@Parameter(required = true)
private Set testIncludes = new HashSet();
>>>>>>>
@Parameter(required = true)
private Set<String> testIncludes = new HashSet<String>();
<<<<<<<
private Set<String> testExcludes = new HashSet<String>();
=======
@Parameter(required = true)
private Set testExcludes = new HashSet();
>>>>>>>
@Parameter(required = true)
private Set<String> testExcludes = new HashSet<String>();
<<<<<<<
private List<String> defines;
=======
@Parameter
private List defines;
>>>>>>>
@Parameter
private List<String> defines;
<<<<<<<
private List<String> undefines;
=======
@Parameter
private List undefines;
>>>>>>>
@Parameter
private List<String> undefines;
<<<<<<<
private List<IncludePath> includePaths;
=======
@Parameter
private List includePaths;
>>>>>>>
@Parameter
private List<IncludePath> includePaths;
<<<<<<<
private List<IncludePath> testIncludePaths;
=======
@Parameter
private List testIncludePaths;
>>>>>>>
@Parameter
private List<IncludePath> testIncludePaths;
<<<<<<<
private List<String> systemIncludePaths;
=======
@Parameter
private List systemIncludePaths;
>>>>>>>
@Parameter
private List<String> systemIncludePaths;
<<<<<<<
private List<String> options;
=======
@Parameter
private List options;
>>>>>>>
@Parameter
private List<String> options;
<<<<<<<
private List<String> testOptions;
=======
@Parameter
private List testOptions;
>>>>>>>
@Parameter
private List<String> testOptions; |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.