conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
=======
import hunternif.mc.atlas.ext.watcher.*;
import hunternif.mc.atlas.ext.watcher.impl.StructureWatcherFortress;
import hunternif.mc.atlas.ext.watcher.impl.StructureWatcherGeneric;
import hunternif.mc.atlas.ext.watcher.impl.StructureWatcherVillage;
import hunternif.mc.atlas.item.ItemAtlas;
import huntern... |
<<<<<<<
import net.minecraft.server.world.ServerWorld;
import net.minecraft.util.registry.RegistryKey;
=======
>>>>>>>
import net.minecraft.util.registry.RegistryKey;
<<<<<<<
.getMarkersAtChunk(world.getDimensionRegistryKey(), chunkX / MarkersData.CHUNK_STEP,
chunkZ / MarkersD... |
<<<<<<<
private final List<IButtonListener> listeners = new ArrayList<IButtonListener>();
=======
private static final ResourceLocation DEFAULT_CLICK_SOUND = new ResourceLocation("gui.button.press");
private final List<IButtonListener> listeners = new ArrayList<>();
>>>>>>>
private final List<IButtonListener>... |
<<<<<<<
private boolean _annotationsPopUpEnabled = true;
=======
private boolean _pitchEnabled = true;
>>>>>>>
private boolean _pitchEnabled = true;
<<<<<<<
public void setAnnotationsPopUpEnabled(boolean value) {
_annotationsPopUpEnabled = value;
}
=======
public void setPitchEnab... |
<<<<<<<
import java.io.FileNotFoundException;
import java.nio.file.Files;
=======
>>>>>>>
import java.io.FileNotFoundException; |
<<<<<<<
import org.xdi.config.oxtrust.AppConfiguration;
import org.xdi.model.SimpleCustomProperty;
import org.xdi.model.SimpleExtendedCustomProperty;
import org.xdi.model.SimpleProperty;
import org.xdi.model.custom.script.CustomScriptType;
import org.xdi.model.custom.script.model.CustomScript;
import org.xdi.model.ldap... |
<<<<<<<
import java.io.ByteArrayOutputStream;
import java.io.Closeable;
import java.io.IOException;
import java.io.InputStream;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
=======
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import java.io.*;
>>>>>>>
import javax.... |
<<<<<<<
import org.gluu.search.filter.Filter;
=======
import javax.ejb.Stateless;
import javax.inject.Inject;
import javax.inject.Named;
import java.util.*;
>>>>>>>
import org.gluu.search.filter.Filter;
import javax.ejb.Stateless;
import javax.inject.Inject;
import javax.inject.Named;
import java.util.*; |
<<<<<<<
=======
import java.util.ArrayList;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.hp.hpl.jena.sparql.core.DatasetGraph;
>>>>>>> |
<<<<<<<
import com.opencsv.CSVReader;
import java.io.BufferedWriter;
=======
>>>>>>>
import java.io.BufferedWriter;
<<<<<<<
import java.io.FileOutputStream;
import java.io.FileReader;
=======
>>>>>>>
import java.io.FileOutputStream;
<<<<<<<
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
im... |
<<<<<<<
public List<DatasetEntity> getSeries(GetObservationByIdRequest request, Session session) throws OwsExceptionReport {
return getSeriesCriteria(request, session).list();
=======
public List<Series> getSeries(GetObservationByIdRequest request, Session session) throws OwsExceptionReport {
... |
<<<<<<<
/** Tests converting row and column numbers to A1 notation. */
@Test
public void testA1Notation() {
String a1 = IOHelper.cellToA1(1, 1);
assertEquals("A1", a1);
a1 = IOHelper.cellToA1(100, 200);
assertEquals("GR100", a1);
a1 = IOHelper.cellToA1(39, 8459);
assertEquals("LMI39", a1... |
<<<<<<<
if (superClass.isAnonymous() && !excludeAnonymous || !superClass.isAnonymous()) {
// Anonymous axioms may have been removed so we don't want to add them back
axioms.add(dataFactory.getOWLSubClassOfAxiom(subClass, superClass));
}
=======
axioms.add(df.getOWLSubClassOfAxiom(sub... |
<<<<<<<
/**
* Given an input string, return a list of the string split on whitespace, while ignoring any
* whitespace in single string quotes.
*
* @param selects String of select options to split
* @return List of split strings
*/
protected static List<String> splitSelects(String selects) {
L... |
<<<<<<<
=======
import java.io.*;
import java.util.Map;
import java.util.Optional;
>>>>>>>
<<<<<<<
=======
import org.apache.commons.io.IOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
>>>>>>> |
<<<<<<<
boolean terminatable = false;
=======
boolean underscorable = false;
>>>>>>>
boolean terminatable = false;
boolean underscorable = false;
<<<<<<<
for (int i = index.get(); i < s.length(); i = index.incrementAndGet()) {
char c = s.charAt(i);
=======
for (int i = 0; i < chars.l... |
<<<<<<<
disabledFeatures.add(Feature.DROP_CONFIRMATION);
disabledFeatures.add(Feature.MINION_STOP_WARNING);
disabledFeatures.add(Feature.HIDE_HEALTH_BAR);
disabledFeatures.add(Feature.MINION_FULL_WARNING);
disabledFeatures.add(Feature.USE_VANILLA_TEXTURE_DEFENCE);
disable... |
<<<<<<<
super(String.class, context, id);
=======
super(context, id);
this.counter = new AtomicInteger(DEFAULT);
>>>>>>>
super(String.class, context, id);
this.counter = new AtomicInteger(DEFAULT); |
<<<<<<<
SETTING_DISABLE_MINION_LOCATION_WARNING(MessageObject.SETTING, "disableMinionLocationWarning"),
=======
SETTING_CHANGE_BAR_COLOR_WITH_POTIONS(MessageObject.SETTING, "changeBarColorForPotions"),
SETTING_CRAFTING_PATTERNS(MessageObject.SETTING, "craftingPatterns"),
SETTING_FISHING_SOUND_INDICATO... |
<<<<<<<
import codes.biscuit.skyblockaddons.gui.ButtonLocation;
import codes.biscuit.skyblockaddons.gui.ButtonSlider;
import codes.biscuit.skyblockaddons.gui.LocationEditGui;
import codes.biscuit.skyblockaddons.gui.SkyblockAddonsGui;
import codes.biscuit.skyblockaddons.utils.*;
=======
import codes.biscuit.skyblockad... |
<<<<<<<
MINION_DISABLE_LOCATION_WARNING(46, Message.SETTING_DISABLE_MINION_LOCATION_WARNING),
=======
CHANGE_BAR_COLOR_FOR_POTIONS(46, Message.SETTING_CHANGE_BAR_COLOR_WITH_POTIONS),
CRAFTING_PATTERNS(47, Message.SETTING_CRAFTING_PATTERNS),
FISHING_SOUND_INDICATOR(48, Message.SETTING_FISHING_SOUND_IND... |
<<<<<<<
SETTING_AVOID_BREAKING_LOG_BEFORE_JUNGLE_AXE_COOLDOWN_ENDS(MessageObject.SETTING, "avoidBreakingLogBeforeJungleAxeCooldownEnds"),
=======
SETTING_CHANGE_BAR_COLOR_WITH_POTIONS(MessageObject.SETTING, "changeBarColorForPotions"),
SETTING_CRAFTING_PATTERNS(MessageObject.SETTING, "craftingPatterns"),
... |
<<<<<<<
Feature.MAKE_ENDERCHESTS_GREEN_IN_END, Feature.SUMMONING_EYE_ALERT, Feature.DONT_RESET_CURSOR_INVENTORY,
Feature.ORGANIZE_ENCHANTMENTS, Feature.REPLACE_ROMAN_NUMERALS_WITH_NUMBERS, Feature.DROP_CONFIRMATION};
=======
Feature.MAKE_ENDERCHESTS_GREEN_IN... |
<<<<<<<
private boolean shouldTriggerFishingIndicator() {
Minecraft mc = Minecraft.getMinecraft();
if (mc.thePlayer != null && mc.thePlayer.fishEntity != null && mc.thePlayer.getHeldItem() != null
&& mc.thePlayer.getHeldItem().getItem().equals(Items.fishing_rod)
&& ... |
<<<<<<<
GlStateManager.enableRescaleNormal();
RenderHelper.enableGUIStandardItemLighting();
mc.getRenderItem().renderItemIntoGUI(buttonLocation == null ? skill.getItem() : EnumUtils.SkillType.FARMING.getItem(),
=======
mc.getRenderItem().renderItemIntoGUI(buttonLocation... |
<<<<<<<
public void initCalculator()
{
initCalculator(context);
}
=======
@Override
public SuntimesCalculatorFactory initFactory(Context context)
{
return new SuntimesCalculatorFactory(context, calculatorMode)
{
public SuntimesCalculator fallbackCalculator(... |
<<<<<<<
if (key.endsWith(WidgetSettings.PREF_KEY_GENERAL_TRACKINGMODE))
{
// the pref activity saves to: com.forrestguice.suntimeswidget_preferences.xml,
// ...but this is a widget setting (belongs in com.forrestguice.suntimeswidget.xml)
WidgetSettings.saveTrackingMo... |
<<<<<<<
Calendar eventTime = (event.isRising() ? moonData.moonriseCalendarToday() : moonData.moonsetCalendarToday());
if (eventTime != null)
{
eventTime.set(Calendar.SECOND, 0);
alarmTime.setTimeInMillis(eventTime.getTimeInMillis() + offset);
}
=======
C... |
<<<<<<<
=======
public static void saveObserverHeightPref(Context context, int appWidgetId, float meters)
{
SharedPreferences.Editor prefs = context.getSharedPreferences(PREFS_WIDGET, 0).edit();
String prefs_prefix = PREF_PREFIX_KEY + appWidgetId + PREF_PREFIX_KEY_GENERAL;
prefs.putF... |
<<<<<<<
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
=======
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
>>>>>>>
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.Collections;
import ja... |
<<<<<<<
WidgetSettings.saveTimezonePref(context, appWidgetId, customTimezone.getID());
// save: solar timemode
WidgetSettings.SolarTimeMode[] solarTimeModes = WidgetSettings.SolarTimeMode.values();
WidgetSettings.SolarTimeMode solarTimeMode = solarTimeModes[spinner_solartime.getSelected... |
<<<<<<<
int[] ids2 = widgetManager.getAppWidgetIds(new ComponentName(context, SuntimesWidget2.class));
for (int id : ids2)
{
AppWidgetProviderInfo info = widgetManager.getAppWidgetInfo(id);
SuntimesEquinoxSolsticeData data = new SuntimesEquinoxSolstice... |
<<<<<<<
import android.widget.ScrollView;
=======
import android.widget.ProgressBar;
>>>>>>>
import android.widget.ScrollView;
import android.widget.ProgressBar; |
<<<<<<<
layout_solartime = (LinearLayout)findViewById(R.id.appwidget_solartime_layout);
label_solartime = (TextView)findViewById(R.id.appwidget_solartime_label);
spinner_solartime = (Spinner)findViewById(R.id.appwidget_solartime);
if (spinner_solartime != null)
{
Arra... |
<<<<<<<
=======
import com.forrestguice.suntimeswidget.calendar.SuntimesCalendarSettings;
import com.forrestguice.suntimeswidget.calendar.SuntimesCalendarTask;
>>>>>>>
<<<<<<<
=======
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults)
{
... |
<<<<<<<
public static final String KEY_UI_CARDPOSITION = "cardPosition";
=======
public static final String KEY_UI_RESETNOTE = "resetNote";
>>>>>>>
public static final String KEY_UI_CARDPOSITION = "cardPosition";
public static final String KEY_UI_RESETNOTE = "resetNote";
<<<<<<<
outState.put... |
<<<<<<<
public static final int[] FEATURES = new int[] { FEATURE_RISESET, FEATURE_SOLSTICE, FEATURE_ALTITUDE, FEATURE_MOON };
=======
public static final int[] FEATURES = new int[] { FEATURE_RISESET, FEATURE_SOLSTICE, FEATURE_GOLDBLUE, FEATURE_ALTITUDE };
>>>>>>>
public static final int[] FEATURES = new ... |
<<<<<<<
import java.sql.SQLException;
import java.util.Optional;
=======
import java.util.List;
>>>>>>>
import java.util.Optional;
<<<<<<<
String apiKey = Optional.ofNullable(requestContext.getUriInfo().getQueryParameters().get("k"))
.flatMap(l -> l.stream().findFirst()).orElse(requestContext.getHeaderString(... |
<<<<<<<
import com.forrestguice.suntimeswidget.themes.SuntimesTheme;
=======
import com.forrestguice.suntimeswidget.settings.AppSettings;
import com.forrestguice.suntimeswidget.settings.WidgetSettings;
>>>>>>>
import com.forrestguice.suntimeswidget.themes.SuntimesTheme;
import com.forrestguice.suntimeswidget.setting... |
<<<<<<<
int FEATURE_MOON = 30; // feature: moonrise, moonset, phase, illumination
=======
int FEATURE_GOLDBLUE = 30; // feature: gold, blue hour times
>>>>>>>
int FEATURE_MOON = 30; // feature: moonrise, moonset, phase, illumination
int FEATURE_GOLDBLUE = 30; // feature: gold, blu... |
<<<<<<<
ThemeDescriptor themeDescriptor = WidgetThemes.valueOf(theme.themeName());
if (themeDescriptor != null)
{
spinner_theme.setSelection(themeDescriptor.ordinal(WidgetThemes.values()));
} else {
Log.e("loadAppearanceSettings", "theme is not installed! " + them... |
<<<<<<<
* @return an AlarmManager interval; e.g. AlarmManager.INTERVAL_DAY
*/
protected long getUpdateInterval()
{
return AlarmManager.INTERVAL_DAY;
}
/**
* @param context
=======
* @param context the context
>>>>>>>
* @return an AlarmManager interval; e.g. AlarmMana... |
<<<<<<<
public static final String PREF_KEY_UI_SHOWGOLDHOUR = "app_ui_showgoldhour";
public static final boolean PREF_DEF_UI_SHOWGOLDHOUR = true;
public static final String PREF_KEY_UI_SHOWBLUEHOUR = "app_ui_showbluehour";
public static final boolean PREF_DEF_UI_SHOWBLUEHOUR = false;
=======
pub... |
<<<<<<<
=======
import java.util.Map;
import java.util.Map.Entry;
import java.util.regex.Pattern;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
>>>>>>>
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
<<<<<<<
public static DDTracer create(TracerConfig config) {
=======
@SuppressWarnings("u... |
<<<<<<<
private final Map<String, List<ArtifactSupport>> rules;
=======
private static InstrumentationChecker INSTANCE;
private final Map<String, List<Map<String, String>>> rules;
>>>>>>>
private static InstrumentationChecker INSTANCE;
private final Map<String, List<ArtifactSupport>> rules;
<<<<<<<
pri... |
<<<<<<<
import com.datadoghq.trace.Codec;
=======
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
>>>>>>>
import java.util.ArrayList;
import java.util.Collections;
import java.u... |
<<<<<<<
null,
this.parent == null ? this.spanType : p.getSpanType(),
true,
=======
this.spanType,
>>>>>>>
this.parent == null ? this.spanType : p.getSpanType(), |
<<<<<<<
private final String traceId;
=======
private final long traceId;
private final Map<String, String> serviceNameMappings;
>>>>>>>
private final String traceId;
private final Map<String, String> serviceNameMappings;
<<<<<<<
PendingTrace(final DDTracer tracer, final String traceId) {
=======
Pe... |
<<<<<<<
import static datadog.trace.api.ConfigDefaults.DEFAULT_ASYNC_PROPAGATING;
=======
import static datadog.trace.util.AgentThreadFactory.AGENT_THREAD_GROUP;
>>>>>>>
import static datadog.trace.api.ConfigDefaults.DEFAULT_ASYNC_PROPAGATING;
import static datadog.trace.util.AgentThreadFactory.AGENT_THREAD_GROUP; |
<<<<<<<
@Getter private final boolean appCustomLogManager;
// If `true` the hostname will be detected and added to the root span's metadata
@Getter private final boolean reportHostName;
=======
>>>>>>>
// If `true` the hostname will be detected and added to the root span's metadata
@Getter private final b... |
<<<<<<<
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
=======
import com.datadoghq.trace.Utils.TracerLogger;
>>>>>>>
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import com.datadoghq.trace.Utils.T... |
<<<<<<<
public final static Object MISSING = new Object();
public final static Object NO_BINDING = new Object();
// TODO move me to Utils
private static String toString(String[] values) {
String toReturn = "";
if (values != null) {
for (String value : values) {
... |
<<<<<<<
import android.os.Handler;
=======
import android.content.pm.PackageManager;
>>>>>>>
import android.content.pm.PackageManager;
import android.os.Handler;
<<<<<<<
if (options == null) {
throw new IllegalArgumentException("GalgoOptions must not be null");
}
=======
checkP... |
<<<<<<<
=======
import org.hibernate.type.Type;
import play.Invoker.InvocationContext;
>>>>>>>
<<<<<<<
=======
import org.apache.commons.lang.*;
import play.db.Configuration;
>>>>>>> |
<<<<<<<
import java.io.FileOutputStream;
=======
import java.io.FileNotFoundException;
>>>>>>>
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
<<<<<<<
import java.io.OutputStream;
=======
import java.nio.channels.Channel;
import java.nio.channels.Channels;
import java.nio.channels.FileChann... |
<<<<<<<
import java.io.OutputStream;
=======
import java.nio.channels.Channel;
import java.nio.channels.Channels;
>>>>>>>
import java.io.OutputStream;
import java.nio.channels.Channel;
import java.nio.channels.Channels; |
<<<<<<<
import play.data.binding.annotations.As;
=======
import play.exceptions.UnexpectedException;
>>>>>>>
import play.data.binding.annotations.As;
import play.exceptions.UnexpectedException;
<<<<<<<
=======
>>>>>>>
<<<<<<<
// Let see if we have a As annotation and a separator. If so, we need to... |
<<<<<<<
import play.libs.MimeTypes;
=======
import play.mvc.results.NoResult;
>>>>>>>
import play.libs.MimeTypes;
import play.mvc.results.NoResult;
<<<<<<<
import play.mvc.results.Ok;
import play.mvc.results.RenderBinary;
import play.mvc.results.RenderText;
import play.utils.Utils;
=======
>>>>>>>
import play.mv... |
<<<<<<<
import org.nuxeo.ecm.core.query.sql.model.DateLiteral;
=======
import org.nuxeo.ecm.core.query.sql.SQLQueryParser;
>>>>>>>
import org.nuxeo.ecm.core.query.sql.SQLQueryParser;
import org.nuxeo.ecm.core.query.sql.model.DateLiteral; |
<<<<<<<
@In(create = true)
protected transient CoreSession documentManager;
=======
@In(create = true, required = false)
protected CoreSession documentManager;
>>>>>>>
@In(create = true, required = false)
protected transient CoreSession documentManager; |
<<<<<<<
=======
import org.springframework.security.web.DefaultSecurityFilterChain;
import org.springframework.security.web.access.channel.ChannelProcessingFilter;
>>>>>>> |
<<<<<<<
protected ProgressMonitor monitor = DefaultProgressMonitor.INSTANCE;
=======
>>>>>>>
<<<<<<<
throw new ClientException("Failed to get children for " +
parent.toString(), e);
}
}
public List<DocumentRef> getChildrenRefs(DocumentRef parentRef,
... |
<<<<<<<
public Collection<ComponentName> getActivatingRegistrations() {
Collection<ComponentName> activating = new ArrayList<ComponentName>();
for (RegistrationInfo ri : registry.values()) {
if (ri.getState() == RegistrationInfo.ACTIVATING) {
activating.add(ri.getName());... |
<<<<<<<
+ MAX_POOL_SIZE);
indexingTpExec = IndexingThreadPoolExecutor.newInstance(MIN_POOL_SIZE,
MAX_POOL_SIZE, THREAD_KEEP_ALIVE, TimeUnit.MILLISECONDS);
=======
+ maxPoolSize);
tpExec = new ThreadPoolExecutor(MIN_POOL_SIZE, maxPoolSize,
... |
<<<<<<<
protected MimetypeRegistry getMimetypeService() {
if (mimetypeService == null) {
try {
mimetypeService = Framework.getService(MimetypeRegistry.class);
} catch (Exception e) {
log.error("Unable to get mimetype service : " + e.getMessage());
... |
<<<<<<<
import com.stormpath.sdk.application.ApplicationAccountStoreMappingList;
import com.stormpath.sdk.application.ApplicationAccountStoreMappingCriteria;
=======
import com.stormpath.sdk.application.ApplicationStatus;
import com.stormpath.sdk.authc.*;
>>>>>>>
import com.stormpath.sdk.application.ApplicationStatu... |
<<<<<<<
MYSQL, //
POSTGRESQL;
};
=======
POSTGRESQL
}
>>>>>>>
MYSQL, //
POSTGRESQL
} |
<<<<<<<
=======
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLStreamHandler;
import java.net.URLStreamHandlerFactory;
import java.util.Collections;
>>>>>>>
import java.util.Collections;
<<<<<<<
=======
@SuppressWarnings( { "ResultOfObjectAllocationIgnored" })
>>>>>>> |
<<<<<<<
* TODO remove this once we work on org.nuxeo.core, v 1.4
*
=======
*
>>>>>>>
*
<<<<<<<
* time
* </p>
*
=======
* time.
*
>>>>>>>
* time.
* </p>
* |
<<<<<<<
whereBuilder = new WhereBuilder(database, model, pathResolver,
dialect, hierTable, hierId, dataHierTable, dataHierId,
docKind == DocKind.PROXY, aliasColumns);
=======
whereBuilder = new WhereBuilder(database, session, dialect,
... |
<<<<<<<
* @author <a href="mailto:td@nuxeo.com">Thierry Delprat</a>
=======
>>>>>>>
* @author <a href="mailto:td@nuxeo.com">Thierry Delprat</a>
<<<<<<<
private String url;
=======
>>>>>>>
private String url;
<<<<<<<
public DocumentBlob(String name, String encoding, String mimeType, String downloa... |
<<<<<<<
import java.util.Set;
import java.util.TreeSet;
=======
import java.util.concurrent.atomic.AtomicInteger;
>>>>>>>
import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.atomic.AtomicInteger;
<<<<<<<
public boolean skipDeleted = true; // do not include trashed documents by
... |
<<<<<<<
DocumentModel doc1 = session.createDocument(session.createDocumentModel(
"/folder1", "doc1", "File"));
Thread.sleep(1000);
DocumentModel doc2 = session.createDocument(session.createDocumentModel(
"/folder2", "doc2", "File"));
=======
DocumentMode... |
<<<<<<<
registries = new HashMap<String, Registrable>();
Manager.initializeProtocols();
=======
>>>>>>>
Manager.initializeProtocols();
<<<<<<<
registries = null;
Manager.resetProtocols();
=======
for (Registrable registry : registries.values()) {
registr... |
<<<<<<<
DocumentModel doc1 = session.createDocument(session.createDocumentModel(
"/folder1", "doc1", "File"));
Thread.sleep(1000);
DocumentModel doc2 = session.createDocument(session.createDocumentModel(
"/folder2", "doc2", "File"));
=======
DocumentMode... |
<<<<<<<
deployContrib("org.nuxeo.theme.core", "OSGI-INF/nxthemes-core-service.xml");
deployContrib("org.nuxeo.theme.core", "OSGI-INF/nxthemes-core-contrib.xml");
deployContrib("fragment-config.xml");
=======
deployContrib("org.nuxeo.theme.core.tests", "nxthemes-core-service.xml");
... |
<<<<<<<
import java.io.IOException;
import java.io.InputStream;
import java.io.Serializable;
=======
>>>>>>>
import java.io.Serializable; |
<<<<<<<
@In(create = true)
private transient CoreSession documentManager;
=======
@In(create = true, required = false)
transient CoreSession documentManager;
>>>>>>>
@In(create = true, required = false)
private transient CoreSession documentManager; |
<<<<<<<
@FindBy(xpath = "//div[@class=\"userActions\"]")
public WebElement userActions;
=======
@FindBy(name = "userServicesForm")
public WebElement userServicesForm;
>>>>>>>
@FindBy(name = "userServicesForm")
public WebElement userServicesForm;
@FindBy(xpath = "//div[@class=\"userActi... |
<<<<<<<
=======
* Sets the user directory name.
*
* @param userDirectoryName the user directory name.
* @throws ClientException
*/
void setUserDirectoryName(String userDirectoryName) throws ClientException;
/**
>>>>>>>
<<<<<<<
=======
* Sets the user email field.
*
... |
<<<<<<<
/**
* Used to find the first parent accessible by a user, ie. the first parent
* where the user has the READ permission.
*/
protected static class AccessibleParentFinder extends UnrestrictedSessionRunner {
protected CoreSession userSession;
public DocumentModel doc = nul... |
<<<<<<<
deployContrib("org.nuxeo.theme.core", "OSGI-INF/nxthemes-core-service.xml");
deployContrib("org.nuxeo.theme.core", "OSGI-INF/nxthemes-core-contrib.xml");
deployContrib("engine-config.xml");
=======
deployContrib("org.nuxeo.theme.core.tests", "nxthemes-core-service.xml");
... |
<<<<<<<
// note that this list is duplicated in DashboardSpaceProvider.java because
// of linkage issues
private static final String[] COLS = new String[] { "firstCol",
"secondCol", "thirdCol", "fourCol" };
private static final String SPACER_CLASS = "x-panel-dd-spacer";
private final C... |
<<<<<<<
import org.nuxeo.functionaltests.waitfor.ElementNotFoundException;
import org.nuxeo.functionaltests.waitfor.FindElementUntil;
=======
import org.nuxeo.functionaltests.pages.UsersGroupsBasePage;
>>>>>>>
import org.nuxeo.functionaltests.waitfor.ElementNotFoundException;
import org.nuxeo.functionaltests.waitfor... |
<<<<<<<
=======
import org.nuxeo.ecm.core.query.QueryFilter;
>>>>>>>
import org.nuxeo.ecm.core.query.QueryFilter;
<<<<<<<
String tableName = table.getPhysicalName();
if (!tableNames.contains(tableName) &&
!tableNames.contains(tableName.toUpperCase(... |
<<<<<<<
import org.apache.shindig.auth.AuthInfo;
=======
>>>>>>>
<<<<<<<
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.common.util.Utf8UrlCoder;
import org.apache.shindig.gadgets.AuthType;
import org.apache.shindig.gadgets.FeedProcessor;
=======
import org.apache.shindig.common.JsonSerialize... |
<<<<<<<
import java.util.List;
=======
import org.nuxeo.functionaltests.Required;
>>>>>>>
import org.nuxeo.functionaltests.Required;
import java.util.List; |
<<<<<<<
import com.stormpath.spring.oauth.OAuth2AuthenticationProcessingFilter;
=======
import com.stormpath.spring.filter.SpringSecurityResolvedAccountFilter;
>>>>>>>
import com.stormpath.spring.oauth.OAuth2AuthenticationProcessingFilter;
import com.stormpath.spring.filter.SpringSecurityResolvedAccountFilter;
<<<<... |
<<<<<<<
@In(create = true)
protected transient CoreSession documentManager;
=======
@In(create = true, required = false)
protected CoreSession documentManager;
>>>>>>>
@In(create = true, required = false)
protected transient CoreSession documentManager; |
<<<<<<<
=======
import java.util.List;
import java.util.Locale;
>>>>>>>
import java.util.Locale;
<<<<<<<
GadgetBean gadgetBean = GadgetFactory.getGadgetBean(createGadget,
getLocale(gwtParams), getServerBase(gwtParams));
gadgetBean.setTitle("");
=======
GadgetBean gadgetBean... |
<<<<<<<
import com.stormpath.sdk.api.ApiAuthenticationResult;
import com.stormpath.sdk.api.ApiKey;
import com.stormpath.sdk.api.ApiKeyList;
import com.stormpath.sdk.api.ApiKeyOptions;
import com.stormpath.sdk.application.*;
=======
import com.stormpath.sdk.api.*;
import com.stormpath.sdk.application.*;
>>>>>>>
impor... |
<<<<<<<
=======
import java.io.IOException;
import java.io.Serializable;
import java.util.Calendar;
import java.util.HashMap;
import java.util.Hashtable;
import java.util.List;
import java.util.Map;
import javax.mail.MessagingException;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
i... |
<<<<<<<
=======
import static org.jboss.seam.annotations.Install.FRAMEWORK;
import static org.jboss.seam.ScopeType.SESSION;
>>>>>>>
import static org.jboss.seam.ScopeType.SESSION;
import static org.jboss.seam.annotations.Install.FRAMEWORK; |
<<<<<<<
=======
*
>>>>>>>
*
<<<<<<<
=======
*
* @throws Exception
>>>>>>>
<<<<<<<
log.error("Error when cleaning CoreSession bound to indexing thread", t);
} finally {
coreSession = null;
=======
log.error(
"Error when cleaning Cor... |
<<<<<<<
=======
import java.util.Random;
>>>>>>>
<<<<<<<
private static final int NOTIFICATION_ID = 1;
=======
>>>>>>>
private static final int NOTIFICATION_ID = 1;
<<<<<<<
* Displays a Mixpanel push notification on the device.
*
* @param context The application context you are track... |
<<<<<<<
setContentIntent(intent);
if (notificationData.largeIcon != NotificationData.NOT_SET) {
builder.setLargeIcon(BitmapFactory.decodeResource(context.getResources(), notificationData.largeIcon));
}
=======
setContentIntent(intent).
setD... |
<<<<<<<
import com.mixpanel.android.abtesting.EditProtocol;
=======
import com.mixpanel.android.abtesting.EditorConnection;
>>>>>>>
import com.mixpanel.android.abtesting.EditProtocol;
import com.mixpanel.android.abtesting.EditorConnection;
<<<<<<<
final OutputStream out = mEditorConnection.getOutputStr... |
<<<<<<<
import android.widget.ImageView;
=======
import android.widget.RelativeLayout;
>>>>>>>
import android.widget.ImageView;
import android.widget.RelativeLayout; |
<<<<<<<
final FadingImageView inAppImageView = (FadingImageView) findViewById(R.id.com_mixpanel_android_notification_image);
=======
final ImageView notifGradient = (ImageView) findViewById(R.id.com_mixpanel_android_notification_gradient);
final ImageView notifImage = (ImageView) findViewById(... |
<<<<<<<
=======
import static com.google.common.base.Preconditions.*;
import com.github.dockerjava.api.async.ResultCallback;
>>>>>>>
import static com.google.common.base.Preconditions.checkNotNull;
<<<<<<<
public EventsCmdImpl(EventsCmd.Exec exec) {
=======
private Filters filters;
private ResultCa... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.