conflict_resolution
stringlengths
27
16k
<<<<<<< auth -> SliceFromConfig.build(settings, auth, config, aliases) ======= auth -> SliceFromConfig.build( settings, new LoggingAuth(auth), config, vertx, aliases ) >>>>>>> auth -> Slice...
<<<<<<< final JButton documentationButton = WidgetFactory.createDefaultButton("Documentation", IconUtils.MENU_DOCUMENTATION); documentationButton.addActionListener(new ComponentReferenceDocumentationActionListener(_componentBuilder .getAnalysisJobBuilder().getConfiguratio...
<<<<<<< import java.io.IOException; import java.io.InputStream; import java.io.UnsupportedEncodingException; import java.lang.reflect.Field; import java.lang.reflect.Type; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.UUID; ...
<<<<<<< ======= import com.artipie.docker.proxy.ClientSlice; import com.artipie.docker.proxy.ProxyDocker; import com.artipie.files.FileProxySlice; >>>>>>> import com.artipie.files.FileProxySlice;
<<<<<<< public static ComponentHandler createComponent(TenantContext tenantContext, String componentName, ComponentConfiguration configuration, RemoteComponentsCon...
<<<<<<< /** * Adds remotes to config. * @param remotes Remotes yaml sequence * @return Itself */ public RepoConfigYaml withRemotes(final YamlSequenceBuilder remotes) { this.builder = this.builder.add("remotes", remotes.build()); return this; } ======= /** * Ad...
<<<<<<< import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.io.File; import java.io.FileInputStream; ======= >>>>>>> import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; <<<<<<< // don't show the preview if no newlines where found (it may try to // treat the whole file a...
<<<<<<< import org.n52.iceland.exception.CodedException; import org.n52.iceland.exception.ows.OwsExceptionReport; import org.n52.iceland.ogc.ows.OWSConstants.ExtendedIndeterminateTime; import org.n52.iceland.util.CollectionHelper; ======= import org.n52.sos.ds.hibernate.dao.observation.AbstractValueDAO; >>>>>>> impo...
<<<<<<< import java.net.URI; ======= import java.io.OutputStream; >>>>>>> <<<<<<< import org.apache.hadoop.conf.Configuration; ======= import org.apache.commons.lang.SerializationUtils; import org.apache.log4j.Logger; import org.apache.metamodel.util.FileHelper; >>>>>>> <<<<<<< import org.datacleaner.result.Ana...
<<<<<<< import org.datacleaner.api.ComponentCategory; import org.datacleaner.api.ComponentSuperCategory; import org.datacleaner.bootstrap.WindowContext; ======= import org.datacleaner.bootstrap.WindowContext; >>>>>>> import org.datacleaner.api.ComponentCategory; import org.datacleaner.api.ComponentSuperCategory; imp...
<<<<<<< private List<SourceRecordByDescriptionIdentifier> _pendingSourceDeletes; private List<String> _pendingGoldenRecordDeletes; ======= >>>>>>> private List<SourceRecordByDescriptionIdentifier> _pendingSourceDeletes; private List<String> _pendingGoldenRecordDeletes; <<<<<<< _pendingSource...
<<<<<<< b.setUI(DarkButtonUI.get()); ======= b.setFocusPainted(false); return b; } public static JButton createPrimaryButton(String text, String imagePath) { return createPrimaryButton(text, getButtonIcon(imagePath)); } public static JButton createPrimaryButt...
<<<<<<< import java.util.Collection; ======= import org.datacleaner.api.AnalyzerResult; >>>>>>> import java.util.Collection; import org.datacleaner.api.AnalyzerResult;
<<<<<<< appendElement(ds, "tenantname", datastore.getTenantName()); appendElement(ds, "https", datastore.isHttps()); appendElement(ds, "acceptunverifiedsslpeers", datastore.isAcceptUnverifiedSslPeers()); ======= appendElement(ds, "https", datastore.https()); appendElement(ds, "...
<<<<<<< import org.datacleaner.guice.DCModule; ======= import org.datacleaner.database.DatabaseDriverDescriptor; import org.datacleaner.guice.InjectorBuilder; >>>>>>> import org.datacleaner.database.DatabaseDriverDescriptor; import org.datacleaner.guice.DCModule;
<<<<<<< import org.datacleaner.descriptors.ProvidedPropertyDescriptor; ======= >>>>>>> import org.datacleaner.descriptors.ProvidedPropertyDescriptor; <<<<<<< private final StringConverter _stringConverter; private final ComponentDescriptor<?> descriptor; private final Map<String, MutableColumn> columns;...
<<<<<<< import org.datacleaner.util.WindowSizePreferences; import org.datacleaner.widgets.DCPersistentSizedPanel; import org.datacleaner.widgets.tabs.CloseableTabbedPane; ======= >>>>>>> import org.datacleaner.util.WindowSizePreferences; import org.datacleaner.widgets.DCPersistentSizedPanel;
<<<<<<< @PostConstruct public void init() { _componentsCache = new ComponentsCache(_tenantContextFactory); } ======= private ComponentsCache _componentsCache = new ComponentsCache(); >>>>>>> @PostConstruct public void init() { _componentsCache = new ComponentsCache(_tenan...
<<<<<<< mPrefs = getSharedPreferences(Constants.PREFERENCES, MODE_PRIVATE); mPostList = (ListView) findViewById(R.id.thread_posts); mTitle = (TextView) findViewById(R.id.title); mNext = (ImageButton) findViewById(R.id.next_page); mReply = (ImageButt...
<<<<<<< import android.support.v4.app.DialogFragment; ======= import android.widget.Toast; import android.support.v4.app.ListFragment; >>>>>>> import android.widget.Toast; import android.support.v4.app.DialogFragment; <<<<<<< private SharedPreferences mPrefs; public static UserCPFragment newInstance(boolea...
<<<<<<< private int threadid;//thread id for this activity, since we will only use this activity with a single thread private ThreadDisplayFragment display;//no need to juggle fragments here private ThreadListAdapter adapt; private LeftNavBar mLeftNavBar; ======= >>>>>>> private LeftNavBar m...
<<<<<<< try { result = AwfulForum.getForums(ForumsIndexActivity.this); } catch (Exception e) { e.printStackTrace(); Log.i(TAG, e.toString()); ======= if (!isCancelled()) { try { result = AwfulForum.get...
<<<<<<< public void onDestroy() { super.onDestroy(); mBookmarkList.setAdapter(null); ======= public void onDetach() { super.onDetach(); setListAdapter(null); >>>>>>> public void onDetach() { super.onDetach(); mBookmarkList.setAdapter(null); <<<<<<< @Ov...
<<<<<<< private SharedPreferences mPrefs; public static ForumDisplayFragment newInstance(int aForum) { ForumDisplayFragment fragment = new ForumDisplayFragment(); // Supply index input as an argument. Bundle args = new Bundle(); args.putInt(Constants.FORUM, aForum); fra...
<<<<<<< private ImageButton mNext; private ImageButton mReply; private ProgressDialog mDialog; ======= private ImageButton mNext; private ImageButton mReply; private ImageButton mRefresh; private TextView mTitle; private ProgressDialog mDialog; >>>>>>> private ImageButton mNext; private...
<<<<<<< boolean avatar = aPrefs.avatarsEnabled != false && post.getAvatar() != null; ======= boolean avatar = aPrefs.canLoadAvatars() && post.getAvatar() != null; if (post.isPreviouslyRead()) { background = ColorPickerPreference.convert...
<<<<<<< private String mThreadId; ======= private AwfulThread mThread; private String mFormCookie; >>>>>>> private String mThreadId; private String mFormCookie; <<<<<<< mFetchTask = new FetchFormKeyTask(); mFetchTask.execute(mThreadId); ======= >>>>>>> <<<<<<< mForm...
<<<<<<< ======= if(mUserId.equals(mThread.getAuthorID())){ RelativeLayout posthead = (RelativeLayout) tmp.findViewById(R.id.posthead); posthead.setBackgroundColor(mPrefs.postOPColor); } >>>>>>> if(mUserId.equals(mThread.getAuthorID())){ RelativeLayout posthead = (RelativeLayout) tmp.findViewById(R.id.po...
<<<<<<< // file doesn't exist or not a .hprof file externalFileHintLabel.setText(INVALID_FILE_MSG); ======= // file doesn't exist externalFileHintLabel.setText(Bundle.CompareSnapshotsHelper_InvalidFileMsg()); >>>>>>> ...
<<<<<<< import com.monke.monkeybook.utils.NetworkUtil; import com.monke.monkeybook.utils.RxUtils; ======= import com.monke.monkeybook.model.analyzeRule.assit.Global; import com.monke.monkeybook.utils.NetworkUtil; >>>>>>> import com.monke.monkeybook.utils.NetworkUtil; <<<<<<< if (StringUtils.isTrimEmpty(...
<<<<<<< import com.aptana.index.core.IFileStoreIndexingParticipant; ======= import com.aptana.editor.js.parsing.ast.JSParseRootNode; import com.aptana.editor.js.sdoc.model.DocumentationBlock; import com.aptana.index.core.IFileIndexingParticipant; >>>>>>> import com.aptana.editor.js.parsing.ast.JSParseRootNode; impor...
<<<<<<< public String SINGLE_QUOTED_STRING_SCOPE = "string.quoted.single.ruby"; //$NON-NLS-1$ public String DOUBLE_QUOTED_STRING_SCOPE = "string.quoted.double.ruby"; //$NON-NLS-1$ public String LINE_COMMENT_SCOPE = "comment.line.number-sign.ruby"; //$NON-NLS-1$ public String BLOCK_COMMENT_SCOPE = "comment.block.doc...
<<<<<<< import com.aptana.core.IScopeReference; ======= import com.aptana.core.util.CollectionsUtil; >>>>>>> import com.aptana.core.IScopeReference; import com.aptana.core.util.CollectionsUtil;
<<<<<<< List<String> args = CollectionsUtil.newList(CONFIG, GET, PREFIX); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ // TODO: should cache this value as config prefix path ? IStatus npmStatus = runNpmConfig(args, password, global, workingDirectory, monitor); if (npmStatus.isOK()) ======= args.add(n...
<<<<<<< ======= import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.events.SelectionAdapter; >>>>>>> import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.events.SelectionAdapter; <<<<<<< searchTe...
<<<<<<< import org.eclipse.jface.text.ITextViewerExtension; ======= import org.eclipse.jface.text.ITextSelection; >>>>>>> import org.eclipse.jface.text.ITextSelection; import org.eclipse.jface.text.ITextViewerExtension; <<<<<<< import org.eclipse.jface.text.source.SourceViewerConfiguration; ======= import org.ecl...
<<<<<<< package com.aptana.terminal.server; import java.io.File; import java.net.URL; import java.util.ArrayList; import java.util.List; import java.util.Map; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; import com.aptana.terminal.Activa...
<<<<<<< import com.aptana.index.core.IndexActivator; ======= import com.aptana.usage.EventLogger; >>>>>>> import com.aptana.usage.EventLogger; import com.aptana.index.core.IndexActivator;
<<<<<<< /** * Items related to zip utils */ String ZIPUTIL = CorePlugin.PLUGIN_ID + "/debug/ziputil"; //$NON-NLS-1$ ======= /** * Items related to firefox-specific configuration */ String FIREFOX = CorePlugin.PLUGIN_ID + "/debug/firefox"; //$NON-NLS-1$ >>>>>>> /** * Items related to zip utils */ ...
<<<<<<< import org.eclipse.core.resources.IResourceDelta; import org.eclipse.core.resources.IResourceDeltaVisitor; ======= import org.eclipse.core.resources.IResourceDeltaVisitor; >>>>>>> import org.eclipse.core.resources.IResourceDelta; import org.eclipse.core.resources.IResourceDeltaVisitor; <<<<<<< ======= imp...
<<<<<<< ftpcp.setHost(getConfig().getProperty("ftp.host", "10.10.1.60")); //$NON-NLS-1$ //$NON-NLS-2$ ftpcp.setLogin(getConfig().getProperty("ftp.username", "ftpuser")); //$NON-NLS-1$ //$NON-NLS-2$ ftpcp.setPassword(getConfig().getProperty("ftp.password", //$NON-NLS-1$ String.valueOf(new char[] { 'l', 'e', 't...
<<<<<<< import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener; import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent; import org.eclipse.core.runtime.preferences.InstanceScope; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface....
<<<<<<< addTranslation(new QualifiedContentType("com.aptana.radrails.contenttype.ruby"), new QualifiedContentType("source.ruby.rails")); ======= addTranslation(new QualifiedContentType("com.aptana.radrails.contenttype.ruby"), new QualifiedContentType("source.ruby")); //$NON-NLS-1$ //$NON-NLS-2$ >>>>>>> addTran...
<<<<<<< ======= public static String CommonEditorPreferencePage_LBL_TabPolicy; >>>>>>> public static String CommonEditorPreferencePage_LBL_TabPolicy; <<<<<<< public static String EditorsPreferencePage_Content_Assist_Auto_Insert; ======= /** * EditorsPreferencePage_Formatting */ >>>>>>> public static S...
<<<<<<< ======= import org.eclipse.jface.layout.TableColumnLayout; >>>>>>> import org.eclipse.jface.layout.TableColumnLayout; <<<<<<< GridData gridData = new GridData(); gridData.heightHint = 200; table.setLayoutData(gridData); TableLayout layout = new TableLayout(); table.setLayout(layout); ======= >>...
<<<<<<< import com.aptana.editor.js.contentassist.index.IJSIndexConstants; import com.aptana.editor.js.contentassist.model.FunctionElement; import com.aptana.editor.js.contentassist.model.ParameterElement; import com.aptana.editor.js.contentassist.model.PropertyElement; import com.aptana.editor.js.inferencing.JSNodeTyp...
<<<<<<< @Override public void send(String phoneNumber, String notification) { Assert.notNull(phoneNumber); log.info(String.format("send sms, the notification is: %s", notification)); SendSmsContentRequest arg = new SendSmsContentRequest(); HashSet<String> phoneSet = new HashSet<>(1); phoneSet.ad...
<<<<<<< ======= import com.aptana.core.resources.TaskTag; import com.aptana.core.util.IOUtil; import com.aptana.core.util.StringUtil; import com.aptana.editor.js.IDebugScopes; import com.aptana.editor.js.IJSConstants; >>>>>>> import com.aptana.editor.js.IDebugScopes; <<<<<<< URI location = context.getURI(); ==...
<<<<<<< ======= import javafx.scene.Node; import javafx.scene.input.MouseEvent; import javafx.stage.Stage; >>>>>>> import javafx.scene.input.MouseEvent;
<<<<<<< private static final Logger logger = LogManager.getLogger(ModCollection.class); ======= /** * All the AIs to initialize. */ >>>>>>> private static final Logger logger = LogManager.getLogger(ModCollection.class); /** * All the AIs to initialize. */
<<<<<<< private final Predicate<Entity> isB0T = e -> ctype.has(e) && ctype.get(e).getCreatureType().equals("B0T"); ======= private final Predicate<Entity> isCreature = entity -> entity.hasComponent(CreatureTypeComponent.class); >>>>>>> private final Predicate<Entity> isB0T = e -> ctype.has(e) && ctype.get(e).getC...
<<<<<<< public class Zone implements IdEntity { ======= public class Zone { public final LuaValue data = LuaValue.tableOf(); >>>>>>> public class Zone implements IdEntity { public final LuaTable data = new ExtLuaTable(this::onChange); <<<<<<< public final LuaTable data = new ExtLuaTable(this::onChange); =======...
<<<<<<< ======= import com.odoo.addons.partners.Partners; import com.odoo.support.OModule; >>>>>>> <<<<<<< // OModule library = new OModule(Library.class).setDefault(); ======= OModule partners = new OModule(Partners.class).setDefault(); >>>>>>> // OModule partners = new OModule(Partners.class).setDefault();
<<<<<<< ======= import com.odoo.addons.partners.model.ResCountryState; import com.odoo.addons.partners.model.ResPartnerCategory; >>>>>>> <<<<<<< ======= // Extra Demo Module Columns OColumn date = new OColumn("Date", ODateTime.class) .setParsePattern(ODate.DEFAULT_FORMAT); @Odoo.hasDomainFilter OColumn st...
<<<<<<< scope = new AppScope((MainActivity) MainActivity.context); ======= scope = new AppScope(MainActivity.userContext, (MainActivity) MainActivity.context); getActionBar().setHomeButtonEnabled(true); getActionBar().setDisplayHomeAsUpEnabled(true); >>>>>>> scope = new AppScope((MainActivity) MainActi...
<<<<<<< ======= import com.odoo.addons.partners.PartnersCursorLoader; import com.odoo.support.OModule; >>>>>>> <<<<<<< // OModule partners = new OModule(Partners.class).setDefault(); ======= OModule partners = new OModule(PartnersCursorLoader.class).setDefault(); >>>>>>> // OModule partners = new OModule(Part...
<<<<<<< import com.openerp.support.OEUser; import com.openerp.support.menu.OEMenu; import com.openerp.util.HTMLHelper; ======= >>>>>>> import com.openerp.support.OEUser; import com.openerp.util.HTMLHelper; <<<<<<< handleArguments((Bundle) getArguments()); ======= >>>>>>>
<<<<<<< public Set doDemarshall(final EJArray o, final MarshallingSession ctx) { ======= public Set[] getEmptyArray() { return EMPTY_ARRAY; } @Override public Set doDemarshall(EJArray o, MarshallingSession ctx) { >>>>>>> public Set[] getEmptyArray() { return EMPTY_ARRAY; } @Override p...
<<<<<<< import com.dianrong.common.uniauth.client.config.UniauthSecurityConfig; ======= import com.dianrong.common.uniauth.client.config.UniauthSecurityConfig; >>>>>>> import com.dianrong.common.uniauth.client.config.UniauthSecurityConfig; <<<<<<< * 自定义spring security 配置. * ======= * 自定义spring security 配置. ...
<<<<<<< import org.jboss.errai.ioc.rebind.ioc.codegen.Statement; ======= import org.jboss.errai.ioc.rebind.ioc.codegen.meta.MetaClassFactory; >>>>>>> import org.jboss.errai.ioc.rebind.ioc.codegen.Statement; import org.jboss.errai.ioc.rebind.ioc.codegen.meta.MetaClassFactory;
<<<<<<< return callback.callback(null, new DefModifiers(Modifier.Abstract), throwsDeclaration); ======= return callback.callback(null, null, modifiers, throwsDeclaration); >>>>>>> return callback.callback(null, null, new DefModifiers(Modifier.Abstract), throwsDeclaration); <<<<<<< return callback.ca...
<<<<<<< final MetaClass targetType = GenUtil.getPrimitiveWrapper(mapping.getType()); final MetaClass compType = targetType.isArray() ? targetType.getOuterComponentType().asBoxed() : targetType.asBoxed(); if (!targetType.isInterface() &&!targetType.isEnum() && !context.canMarshal(compType.getFullyQual...
<<<<<<< @SuppressWarnings("unchecked") ======= @Override >>>>>>> @SuppressWarnings("unchecked") <<<<<<< public Object demarshall(final EJValue a0, final MarshallingSession a1) { ======= @Override public Object demarshall(EJValue a0, MarshallingSession a1) { >>>>>>> public Object demarshall(final EJ...
<<<<<<< * * @param clazz the class to import, must not be null ======= * * @param clazz * the class to import, must not be null. If it is an array type (of any number of dimensions), its non-array * component type will be imported. >>>>>>> * * @param clazz * t...
<<<<<<< public void addDefinition(final MappingDefinition definition) { MAPPING_DEFINITIONS.put(definition.getMappingClass().getFullyQualifiedName(), definition); ======= public void addDefinition(MappingDefinition definition) { putDefinitionIfAbsent(definition.getMappingClass().getFullyQualifiedName(), ...
<<<<<<< import com.dianrong.common.uniauth.sharerw.message.EmailSender; import com.google.code.kaptcha.Constants; import com.google.code.kaptcha.Producer; import com.google.code.kaptcha.impl.WaterRipple; import com.google.code.kaptcha.util.Config; ======= import com.dianrong.platform.challenge.domain.ChallengeResult;...
<<<<<<< @Override public OTEntity getEntity(final Integer id) { return entityMap.get(id); ======= public OTEntity getEntity(final int id) { return entityMap.get(id); >>>>>>> @Override public OTEntity getEntity(final int id) { return entityMap.get(id); <<<<<<< @Override public void addEnti...
<<<<<<< import org.jboss.errai.config.util.ClassScanner; ======= import org.jboss.errai.codegen.meta.MetaClassFactory; >>>>>>> import org.jboss.errai.codegen.meta.MetaClassFactory; import org.jboss.errai.config.util.ClassScanner; <<<<<<< final MetaClass compType = type.getOuterComponentType().asBoxed(); ==...
<<<<<<< final Object o = message.get(clazz, CDIProtocol.OBJECT_REF); ======= final Object o = message.get(Object.class, CDIProtocol.OBJECT_REF); >>>>>>> final Object o = message.get(Object.class, CDIProtocol.OBJECT_REF); <<<<<<< ...
<<<<<<< .newObject(new JavaReflectionClass(String.class)); ======= .newObject(Integer.class); >>>>>>> .newObject(String.class); <<<<<<< .newObject(new JavaReflectionClass(Object.class)); String foreachWithListOfStrings = StatementBuilder.create() ...
<<<<<<< import org.openmrs.Obs; ======= import org.openmrs.Encounter; import org.openmrs.Patient; >>>>>>> import org.openmrs.Obs; import org.openmrs.Patient; <<<<<<< Disjunction orClause = Restrictions.disjunction(); orClause.add(ge("dateCreated", date)); if (includeVoided) { ...
<<<<<<< import javax.annotation.Nullable; import javax.validation.constraints.Null; ======= import javax.annotation.Nullable; >>>>>>> import javax.annotation.Nullable; <<<<<<< public static @Nullable User getUserFromProvider(@Nullable Provider provider) { if (provider == null) { return null...
<<<<<<< ======= private static final String EBOLA_STATUS_PROGRAM_NAME = "Ebola status program"; private static final String EBOLA_STATUS_PROGRAM_UUID = "849c86fa-6f3d-11e4-b2f4-040ccecfdba4"; private static final String EBOLA_STATUS_PROGRAM_CONCEPT_UUID = "8c00e1b5-6f35-11e4-a3fa-040ccecfdba4"; privat...
<<<<<<< @Override public void beforeFlush(HttpServletResponse response, BufferedServletResponseWrapper wrapper, String mimeTypeMagic) throws IOException { ======= public void beforeFlush(HttpServletResponse response, BufferedServletResponseWrapper wrapper) throws IOExce...
<<<<<<< import android.os.Handler; ======= import android.preference.PreferenceManager; >>>>>>> import android.os.Handler; import android.preference.PreferenceManager; <<<<<<< public class MainActivity extends BaseActivity implements OnDateSetListener, OnTimeSetListener { ======= public class MainActivity extend...
<<<<<<< ======= import android.widget.Toast; import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.filefilter.FileFilterUtils; import org.apache.commons.io.filefilter.RegexFileFilter; import org.apache.commons.io.filefilter.TrueFileFilter; import java.io.Fi...
<<<<<<< import com.dianrong.common.uniauth.common.bean.dto.DomainDto; import com.dianrong.common.uniauth.common.bean.dto.GroupDto; import com.dianrong.common.uniauth.common.bean.dto.RoleCodeDto; import com.dianrong.common.uniauth.common.bean.dto.RoleDto; import com.dianrong.common.uniauth.common.bean.dto.StakeholderDto...
<<<<<<< protected SharedPreferences prefs; private final String DB_PATH_REGEX = ".*it\\.feio\\.android\\.omninotes.*\\/databases\\/test_omni-notes.*"; ======= private final static String DB_PATH_REGEX = ".*it\\.feio\\.android\\.omninotes.*\\/databases\\/test_omni-notes.*"; private final static String...
<<<<<<< /******************************************************************************* * Copyright 2014 Federico Iosue (federico.iosue@gmail.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the ...
<<<<<<< import org.apache.commons.lang.StringUtils; import java.io.File; import java.io.IOException; import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; import java.util.Collections; import java.util.List; ======= >>>>>>> import java.io.File; import j...
<<<<<<< import at.orz.arangodb.entity.AdminLogEntity; import at.orz.arangodb.entity.ArangoUnixTime; import at.orz.arangodb.entity.ArangoVersion; import at.orz.arangodb.entity.BooleanResultEntity; import at.orz.arangodb.entity.CollectionEntity; import at.orz.arangodb.entity.CollectionKeyOption; import at.orz.arangodb.en...
<<<<<<< ======= >>>>>>>
<<<<<<< /** * Must be invoked in {@code Activity.onRequestPermissionsResult} * <p> * The method will find the pending requests and emit the response to the * matching observables. */ ======= >>>>>>>
<<<<<<< // Allow an existing file to be selected under MODE_NEW_FILE public static final String KEY_ALLOW_EXISTING_FILE = "KEY_ALLOW_EXISTING_FILE"; ======= // If file can be selected by clicking only and checkboxes are not visible public static final String KEY_SINGLE_CLICK = "KEY_SINGLE_CLICK"; >>>...
<<<<<<< Call<ResponseBody> responseDatetime(@Header("scenario") String scenario); ======= Response responseDatetime(@Header("scenario") String scenario) throws ServiceException; @POST("/header/response/prim/datetime") void responseDatetimeAsync(@Header("scenario") String scenario, Ser...
<<<<<<< import com.microsoft.azure.management.resources.fluentcore.utils.Utils; import com.microsoft.rest.ServiceCall; import com.microsoft.rest.ServiceCallback; ======= import com.microsoft.azure.management.resources.implementation.ResourceManager; >>>>>>> import com.microsoft.azure.management.resources.fluentcore....
<<<<<<< boolean allowExistingFile, ======= boolean singleClick, >>>>>>> boolean allowExistingFile, ...
<<<<<<< import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.n52.iceland.coding.encode.EncoderKey; import org.n52.iceland.exception.ows.NoApplicableCodeException; import org.n52.iceland.exception.ows.OwsExceptionReport; import org.n52.iceland.exception.ows.concrete.UnsupportedEncoderInputException; impo...
<<<<<<< assertEquals("com.microsoft.rest.v2.SwaggerMethodParserTests$TestInterface2.testMethod2", methodParser.fullyQualifiedMethodName()); assertEquals(null, methodParser.httpMethod()); ======= assertEquals("com.microsoft.rest.v2.SwaggerMethodParserTests.TestInterface2.testMethod2", methodPar...
<<<<<<< import com.microsoft.azure.management.resources.fluentcore.utils.Utils; import com.microsoft.rest.ServiceCall; import com.microsoft.rest.ServiceCallback; ======= import com.microsoft.azure.management.resources.implementation.ResourceManager; >>>>>>> import com.microsoft.azure.management.resources.fluentcore....
<<<<<<< Completable deallocateAsync(); ======= @Beta Completable deallocateAsync() throws CloudException, IOException, InterruptedException; >>>>>>> @Beta Completable deallocateAsync(); <<<<<<< ServiceFuture<Void> deallocateAsync(ServiceCallback<Void> callback); ======= @Beta Servi...
<<<<<<< import com.microsoft.azure.credentials.ApplicationTokenCredentials; ======= import com.microsoft.azure.management.compute.KnownWindowsVirtualMachineImage; >>>>>>> import com.microsoft.azure.credentials.ApplicationTokenCredentials; import com.microsoft.azure.management.compute.KnownWindowsVirtualMachineImage;
<<<<<<< if (line.startsWith("@") && player.isInGroup(line.substring(1))) return true; if (line.equalsIgnoreCase(user)) ======= if (line.equalsIgnoreCase(user)) { >>>>>>> if (line.startsWith("@") && player.isInGroup(line.substring(1))...
<<<<<<< void cancel(String resourceGroupName, String deploymentName) throws IOException, CloudException; /** * Filters deployments by a resource group. * * @param resourceGroup the resource group to filter by * @return the instance for accessing deployments in a resource group */ I...
<<<<<<< final Class<?> returnType = methodParser.returnType(); if (returnType.equals(Void.TYPE) || methodParser.httpMethod().equalsIgnoreCase("HEAD")) { ======= if (returnType.equals(Void.TYPE) || !response.hasBody() || methodDetails.httpMethod().equalsIgnoreCase("HEAD")) { >>>>>...
<<<<<<< import com.microsoft.azure.serializer.AzureJacksonMapperAdapter; import com.microsoft.rest.RestClient; import com.microsoft.rest.serializer.JacksonMapperAdapter; import okhttp3.OkHttpClient; ======= import com.microsoft.azure.RestClient; >>>>>>> import com.microsoft.azure.serializer.AzureJacksonMapperAdapter...
<<<<<<< import com.microsoft.windowsazure.services.media.implementation.content.AssetType; import com.microsoft.windowsazure.services.media.models.AssetInfo; ======= import com.microsoft.windowsazure.services.media.models.AssetInfo; import com.microsoft.windowsazure.services.media.models.CreateAssetOptions; import co...
<<<<<<< /** Currently not a documented return type. */ TRAVEL_AGENCY("travel_agency"), ======= /** Currently not a documented return type. */ BEAUTY_SALON("beauty_salon"), /** Currently not a documented return type. */ HAIR_CARE("hair_care"), /** Currently not a documented return type. */ SPA("sp...
<<<<<<< import com.microsoft.azure.management.network.NetworkSecurityGroups; ======= import com.microsoft.azure.management.network.NetworkInterfaces; >>>>>>> import com.microsoft.azure.management.network.NetworkSecurityGroups; import com.microsoft.azure.management.network.NetworkInterfaces;
<<<<<<< } } @Override public void execute() throws Exception { DAGNode<TaskItem<T>> nextNode = dag.getNext(); if (nextNode == null) { return; } if (dag.isRootNode(nextNode)) { executeRootTask(nextNode.data()); } else { nex...