conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
import com.kickstarter.models.Activity;
=======
import android.util.Pair;
import com.kickstarter.libs.RefTag;
>>>>>>>
import com.kickstarter.models.Activity;
import android.util.Pair;
import com.kickstarter.libs.RefTag;
<<<<<<<
Observable<Project> showProject();
Observable<Void> showSignupLogin();
O... |
<<<<<<<
import com.todoroo.astrid.data.User;
import com.todoroo.astrid.files.FileMetadata;
=======
>>>>>>>
import com.todoroo.astrid.data.User;
<<<<<<<
private static final StringProperty TAGS = new StringProperty(null, "group_concat(" + TaskListFragment.TAGS_METADATA_JOIN + "." + TaskToTagMetadata.TAG_NAME.nam... |
<<<<<<<
public void onPrepareOptionsMenu (Menu menu) {
if(actFmPreferenceService.isLoggedIn() && !RemoteModel.NO_UUID.equals(uuid) && menu.findItem(MENU_COMMENTS_REFRESH_ID) == null) {
MenuItem item = menu.add(Menu.NONE, MENU_COMMENTS_REFRESH_ID, Menu.NONE,
R.string.ENA_refre... |
<<<<<<<
if (requestCode == ACTIVITY_SETTINGS
&& resultCode == EditPreferences.RESULT_CODE_THEME_CHANGED) {
getActivity().finish();
getActivity().startActivity(getActivity().getIntent());
=======
if (requestCode == ACTIVITY_SETTINGS) {
if (resultCode ... |
<<<<<<<
preference = screen.findPreference(getString(R.string.p_forums));
preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference p) {
showForums();
return true;
}
... |
<<<<<<<
View settingsContainer = getView().findViewById(R.id.settingsContainer);
settingsContainer.setVisibility(View.VISIBLE);
View settingsButton = getView().findViewById(R.id.settings);
settingsButton.setOnClickListener(settingsListener);
View membersEdit = getView().findVie... |
<<<<<<<
scrollView = (ScrollView) getView().findViewById(R.id.edit_scroll);
=======
setContentView(R.layout.task_edit_activity);
scrollView = (ScrollView) findViewById(R.id.edit_scroll);
>>>>>>>
scrollView = (ScrollView) getView().findViewById(R.id.edit_scroll);
<<<<<<<
contr... |
<<<<<<<
=======
// dithering
getWindow().setFormat(PixelFormat.RGBA_8888);
getWindow().addFlags(WindowManager.LayoutParams.FLAG_DITHER);
syncResultCallback = new ProgressBarSyncResultCallback(this,
R.id.progressBar, new Runnable() {
@Override
p... |
<<<<<<<
=======
import org.json.JSONObject;
>>>>>>>
import org.json.JSONObject;
<<<<<<<
import org.json.JSONObject;
=======
>>>>>>>
<<<<<<<
JSONObject propertiesJson = GraphUtil.toJsonProperties(properties);
=======
JSONObject propertiesJson = GraphUtil.toJson(properties);
>>>>>>>
J... |
<<<<<<<
=======
import com.todoroo.astrid.reminders.ReminderService;
import com.todoroo.astrid.rmilk.MilkBackgroundService;
import com.todoroo.astrid.rmilk.MilkUtilities;
>>>>>>>
import com.todoroo.astrid.reminders.ReminderService; |
<<<<<<<
import com.todoroo.astrid.utility.Constants;
import com.twmacinta.util.MD5;
=======
>>>>>>>
import com.todoroo.astrid.utility.Constants; |
<<<<<<<
LinearLayout moreControls = (LinearLayout) findViewById(R.id.more_controls);
=======
LinearLayout whenControls = (LinearLayout) whenDialogView.findViewById(R.id.when_controls);
LinearLayout whenHeader = (LinearLayout) getView().findViewById(R.id.when_header);
LinearLayout moreC... |
<<<<<<<
=======
import com.todoroo.astrid.producteev.api.ApiUtilities;
import com.todoroo.astrid.rmilk.data.MilkNote;
>>>>>>>
import com.todoroo.astrid.producteev.api.ApiUtilities; |
<<<<<<<
new StartupService().onStartupApplication(getActivity());
=======
new StartupService().onStartupApplication(this);
ThemeService.applyTheme(this);
ViewGroup parent = (ViewGroup) getLayoutInflater().inflate(R.layout.task_list_activity, null);
parent.addView(getListBody(pa... |
<<<<<<<
if (!task.containsNonNullValue(Task.UUID)) {
updates = updateDao.query(Query.select(Update.PROPERTIES).where(Update.TASK_LOCAL.eq(task.getId())));
=======
if (!task.containsNonNullValue(Task.REMOTE_ID)) {
updates = updateDao.query(Query.select(Update.PROPERTIES).where(U... |
<<<<<<<
=======
import static org.junit.Assert.assertEquals;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.junit.Assert;
>>>>>>>
<<<<<<<
import java.io.Serializable;
import java.lang.reflect.TypeVariable;
import java.uti... |
<<<<<<<
@Override
public List<Trace> findTracesByDuration(String serviceId, Date startTime, int durationMin, int durationMax, int num){
Map<String, Object> map = new HashMap<String, Object>();
map.put("serviceId", serviceId);
map.put("startTime", startTime);
map.put("num", num);
... |
<<<<<<<
import android.provider.MediaStore;
=======
import android.provider.DocumentsContract;
import android.provider.MediaStore;
>>>>>>>
import android.provider.DocumentsContract;
import android.provider.MediaStore;
<<<<<<<
public static String getUriPath(Context context, Uri uri) throws URISyntaxExcepti... |
<<<<<<<
public void initIndex(List<Blog> blogList) {
this.deleteAllIndex(); //清除所有索引
=======
public void initIndex(String collection, List<Blog> blogList) {
this.deleteAllIndex(collection); //清除所有索引
>>>>>>>
public void initIndex(String collection, List<Blog> blogList) {
this... |
<<<<<<<
remap.put(SysConf.NAME, file.getPicName());
remap.put(SysConf.UID, file.getUid());
=======
remap.put("name", file.getPicName());
remap.put("uid", file.getUid());
remap.put("file_old_name", f... |
<<<<<<<
import org.apache.log4j.Logger;
import javax.crypto.spec.SecretKeySpec;
import javax.xml.bind.DatatypeConverter;
import java.security.Key;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
=======
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.crypto.spec.SecretKe... |
<<<<<<<
import gnu.trove.list.TFloatList;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.util.Date;
import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import org.slf4j.Logger;
import org.slf4j.Lo... |
<<<<<<<
public static final StringLumifyProperty ONTOLOGY_TITLE = new StringLumifyProperty("http://lumify.io#ontologyTitle");
=======
public static final BooleanLumifyProperty SEARCHABLE = new BooleanLumifyProperty("http://lumify.io#searchable");
public static final TextLumifyProperty ONTOLOGY_TITLE = ne... |
<<<<<<<
jsonObject.getString("_conceptType"), "", "", user);
Vertex graphVertex = graph.getVertex(graphVertexId, authorizations);
=======
jsonObject.getString("_conceptType"), "", "", user, visibility);
Vertex graphVertex = graph.getVertex(graphVertexId,... |
<<<<<<<
public abstract String getTitleFormula();
=======
public Collection<OntologyProperty> getProperties() {
return properties;
}
>>>>>>>
public abstract String getTitleFormula();
public Collection<OntologyProperty> getProperties() {
return properties;
} |
<<<<<<<
import static com.google.common.truth.Truth.assertThat;
=======
import java.util.LinkedHashSet;
import java.util.Set;
>>>>>>>
import static com.google.common.truth.Truth.assertThat;
import java.util.LinkedHashSet;
import java.util.Set;
<<<<<<<
=======
import com.github.rinde.rinsim.core.SimulatorAPI;
... |
<<<<<<<
TickListener {
=======
TickListener, RandomUser {
>>>>>>>
TickListener {
<<<<<<<
private final RandomGenerator randomGenerator;
=======
private final BiMap<CommUser, CommDevice> unregisteredUsersDevices;
private Optional<RandomGenerator> randomGenerator;
>>>>>>>
private final RandomGenera... |
<<<<<<<
public Collection<String> readTimeBucket(String path)throws InterruptedException {
String[] servers = cluster.getServers();
int serverCount = servers.length;
=======
public Collection<ContentKey> readTimeBucket(String path)throws InterruptedException {
List<String> servers = cl... |
<<<<<<<
import static com.altamiracorp.lumify.core.model.properties.EntityLumifyProperties.GEO_LOCATION;
=======
>>>>>>>
<<<<<<<
import java.util.Date;
import java.util.Iterator;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.json.JSONException;
import org.j... |
<<<<<<<
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
=======
import lombok.extern.slf4j.Slf4j;
import org.junit.BeforeClass;
import org.junit.Test;
>>>>>>>
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;... |
<<<<<<<
public ClientApiWorkspaceDiff handle(String workspaceId, User user) {
Workspace workspace = workspaceRepository.findById(workspaceId, true, user);
=======
public ClientApiWorkspaceDiff handle(String workspaceId, User user, Locale locale, String timeZone) {
Workspace workspace = workspa... |
<<<<<<<
protected String getValidationFormula(OWLOntology o, OWLEntity owlEntity) {
return getAnnotationValueByUri(o, owlEntity, LumifyProperties.VALIDATION_FORMULA.getPropertyName());
}
protected String getDisplayFormula(OWLOntology o, OWLEntity owlEntity) {
return getAnnotationValueByUri(... |
<<<<<<<
import org.junit.jupiter.api.parallel.Execution;
import org.junit.jupiter.api.parallel.ExecutionMode;
=======
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.mockito.junit.jupiter.MockitoSettings;
import org.mockito.qua... |
<<<<<<<
void testChangeStorageLoss() {
HubProperties.setProperty("hub.protect.channels", "true");
=======
public void testChangeStorageLoss() throws Exception {
PropertyLoader.getInstance().setProperty("hub.protect.channels", "true");
>>>>>>>
void testChangeStorageLoss() {
Propert... |
<<<<<<<
<<<<<<< HEAD
import com.flightstats.hub.model.*;
=======
import com.flightstats.hub.metrics.NewRelicIgnoreTransaction;
import com.flightstats.hub.model.BulkContent;
import com.flightstats.hub.model.ChannelConfig;
import com.flightstats.hub.model.Content;
import com.flightstats.hub.model.ContentKey;
import com.f... |
<<<<<<<
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
=======
import org.junit.Before;
import org.junit.Test;
>>>>>>>
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
<<<<<<<
@BeforeEach
void se... |
<<<<<<<
public Collection<String> readTimeBucket(String path)throws InterruptedException {
String[] servers = cluster.getServers();
int serverCount = servers.length;
=======
public Collection<ContentKey> readTimeBucket(String path)throws InterruptedException {
List<String> servers = cl... |
<<<<<<<
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
=======
import lombok.extern.slf4j.Slf4j;
import org.junit.BeforeClass;
import org.junit.Test;
>>>>>>>
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;... |
<<<<<<<
verify(httpSession).setAttribute(CurrentUser.CURRENT_USER_REQ_ATTR_NAME, user);
=======
verify(httpSession).setAttribute(AuthenticationProvider.CURRENT_USER_REQ_ATTR_NAME, user.getUserId());
>>>>>>>
verify(httpSession).setAttribute(CurrentUser.CURRENT_USER_REQ_ATTR_NAME, user.getUserI... |
<<<<<<<
void testBatchWebhookCreation() {
String appUrl = HubProperties.getAppUrl();
String appEnv = HubProperties.getAppEnv();
=======
public void testBatchWebhookCreation() {
final String appUrl = "http://localhost:9080/";
final String appEnv = "hub-dev";
>>>>>>>
void t... |
<<<<<<<
@Timed(name = "all-groups.post")
@ExceptionMetered
private ClientResponse getClientResponse(ObjectNode response) {
logger.debug("calling {} {}", group.getCallbackUrl(), group.getName());
return client.resource(group.getCallbackUrl())
.type(MediaType.APPLICATION_JSON_T... |
<<<<<<<
class DistributedLockRunnerTest {
=======
@Slf4j
public class DistributedLockRunnerTest {
>>>>>>>
@Slf4j
class DistributedLockRunnerTest {
<<<<<<<
@BeforeAll
static void setupCurator() throws Exception {
ZooKeeperState zooKeeperState = new ZooKeeperState();
CuratorFramework curator ... |
<<<<<<<
import org.junit.jupiter.api.Test;
import com.flightstats.hub.config.AppProperty;
import com.flightstats.hub.config.PropertyLoader;
=======
import com.flightstats.hub.config.AppProperties;
import com.flightstats.hub.config.PropertiesLoader;
import org.junit.Test;
>>>>>>>
import org.junit.jupiter.api.Test;
im... |
<<<<<<<
channelValidator.validate(configuration, false, oldConfig);
if (isNull(oldConfig) && configuration.isHistorical()) {
lastContentPath.initialize(configuration.getName(), ContentKey.NONE, HISTORICAL_LAST_UPDATED);
}
channelConfigDao.updateChannel(con... |
<<<<<<<
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
=======
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
>>>>>>>
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jup... |
<<<<<<<
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
=======
import org.junit.BeforeClass;
import org.junit.Test;
>>>>>>>
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
<<<<<<<
class CuratorClusterTest... |
<<<<<<<
public static long getLargePayload() {
return HubProperties.getProperty("app.large.payload.MB", 40) * 1024 * 1024;
}
=======
public static int getCallbackTimeoutMin() {
return HubProperties.getProperty("webhook.callbackTimeoutSeconds.min", 1);
}
public static int getCallb... |
<<<<<<<
void testStartingKey() {
Webhook withDefaultsA = this.webhook.withDefaults();
Webhook withDefaultsB = this.webhook.withDefaults();
=======
public void testStartingKey() {
Webhook withDefaultsA = this.webhook.withDefaults(CALLBACK_TIMEOUT_DEFAULT_IN_SEC);
Webhook withDef... |
<<<<<<<
import com.flightstats.hub.clients.callback.CallbackClientFactory;
import com.flightstats.hub.clients.callback.CallbackResourceClient;
=======
import com.flightstats.hub.client.CallbackClientFactory;
import com.flightstats.hub.client.CallbackResourceClient;
>>>>>>>
import com.flightstats.hub.clients.callback... |
<<<<<<<
void testChangeStorageLoss() {
PropertyLoader.getInstance().setProperty("hub.protect.channels", "true");
=======
public void testChangeStorageLoss() throws Exception {
PropertiesLoader.getInstance().setProperty("hub.protect.channels", "true");
>>>>>>>
void testChangeStorageLoss() ... |
<<<<<<<
import java.util.Collection;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
import java.util.concurrent.*;
=======
import java.util.*;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.c... |
<<<<<<<
import javafx.collections.ObservableSet;
import javafx.event.ActionEvent;
=======
>>>>>>>
import javafx.event.ActionEvent; |
<<<<<<<
context.register(BaseConfig.class, UiConfig.class, ServiceConfig.class, TaskConfig.class, CacheConfig.class, LuceneConfig.class);
=======
context.getBeanFactory().registerSingleton("stage", stage);
context.register(BaseConfig.class, UiConfig.class, ServiceConfig.class, TaskConfig.class, CacheConfi... |
<<<<<<<
public ChatUser createOrGetChatUser(User user) {
ChatUser chatUser = getChatUser(user.getNick());
if (chatUser != null) {
return chatUser;
=======
public void onConnected() {
sendMessageInBackground(
"NICKSERV",
format("REGISTER %s %s", md5Hex(userService.getPassword()), ... |
<<<<<<<
import com.faforever.client.preferences.ForgedAlliancePrefs;
import com.faforever.client.preferences.Preferences;
import com.faforever.client.preferences.PreferencesService;
=======
import com.faforever.client.patch.GameUpdateService;
>>>>>>>
import com.faforever.client.patch.GameUpdateService;
import com.fa... |
<<<<<<<
import com.faforever.client.legacy.domain.ModInfo;
=======
import com.faforever.client.legacy.domain.Notice;
>>>>>>>
import com.faforever.client.legacy.domain.ModInfo;
<<<<<<<
=======
import com.faforever.client.login.LoginFailedException;
import com.faforever.client.preferences.LoginPrefs;
>>>>>>>
impor... |
<<<<<<<
import com.faforever.client.fx.SceneFactory;
import com.faforever.client.fx.WindowDecorator;
=======
import com.faforever.client.chat.PlayerInfoBean;
>>>>>>>
<<<<<<<
import com.faforever.client.legacy.io.QDataOutputStream;
import com.faforever.client.map.MapPreviewLargeController;
=======
import com.fafor... |
<<<<<<<
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private final Timer timer;
private Collection<OnGameTypeInfoListener> onModInfoMessageListeners;
private OnPlayerInfoListener onPlayerInfoListener;
private Collection<OnGameInfoListener> onGameInfoList... |
<<<<<<<
=======
}
}
private void initGameTypeComboBox() {
gameService.addOnGameTypeInfoListener(change -> {
change.getValueAdded();
gameTypeComboBox.getItems().add(change.getValueAdded());
CreateGameController.this.selectLastOrDefaultGameType();
>>>>>>> |
<<<<<<<
import com.faforever.client.legacy.domain.GameLaunchInfo;
import com.faforever.client.rankedmatch.OnRankedMatchNotificationListener;
import com.faforever.client.util.Callback;
=======
>>>>>>>
import com.faforever.client.legacy.domain.GameLaunchInfo;
import com.faforever.client.rankedmatch.OnRankedMatchNotifi... |
<<<<<<<
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.springframework.beans.factory.annotation.Autowired;
=======
>>>>>>>
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.springframework.beans.factory.annotation.Autowire... |
<<<<<<<
import com.faforever.client.legacy.gson.FactionSerializer;
=======
import com.faforever.client.legacy.gson.ClientMessageTypeTypeAdapter;
>>>>>>>
import com.faforever.client.legacy.gson.FactionSerializer;
import com.faforever.client.legacy.gson.ClientMessageTypeTypeAdapter; |
<<<<<<<
import javax.annotation.PreDestroy;
=======
import javax.annotation.Resource;
>>>>>>>
import javax.annotation.PreDestroy;
import javax.annotation.Resource; |
<<<<<<<
import com.faforever.client.rankedmatch.Accept1v1MatchMessage;
import com.faforever.client.rankedmatch.OnRankedMatchNotificationListener;
import com.faforever.client.rankedmatch.RankedMatchNotification;
import com.faforever.client.rankedmatch.SearchRanked1v1Message;
import com.faforever.client.rankedmatch.StopS... |
<<<<<<<
=======
private CompletableFuture<Path> downloadReplayToTemporaryDirectory(int replayId) {
ReplayDownloadTask task = applicationContext.getBean(ReplayDownloadTask.class);
task.setReplayId(replayId);
return taskService.submitTask(task);
}
>>>>>>>
private CompletableFuture<Path> downloadRepl... |
<<<<<<<
import com.faforever.client.legacy.domain.GameState;
import com.faforever.client.legacy.domain.PlayerInfo;
=======
import com.faforever.client.legacy.domain.Player;
>>>>>>>
import com.faforever.client.legacy.domain.GameState;
import com.faforever.client.legacy.domain.PlayerInfo;
import com.faforever.client.l... |
<<<<<<<
private Collection<OnGameInfoListener> onGameInfoListeners;
private Collection<OnGameTypeInfoListener> onGameTypeInfoListeners;
private Collection<OnJoinChannelsRequestListener> onJoinChannelsRequestListeners;
private Collection<OnGameLaunchInfoListener> onGameLaunchListeners;
private Collection<OnRan... |
<<<<<<<
import com.faforever.client.legacy.GameStatus;
import com.faforever.client.legacy.domain.GameState;
import com.faforever.client.legacy.domain.PlayerInfo;
=======
import com.faforever.client.legacy.domain.Player;
>>>>>>>
import com.faforever.client.legacy.GameStatus;
import com.faforever.client.legacy.domain.... |
<<<<<<<
hosterLabel.textProperty().bind(gameInfoBean.hostProperty());
gameModeLabel.textProperty().bind(gameInfoBean.featuredModProperty());
mapLabel.textProperty().bind(gameInfoBean.mapTechnicalNameProperty());
=======
hostLabel.textProperty().bind(gameInfoBean.hostProperty());
mapLabel.textPrope... |
<<<<<<<
import org.mockito.Mock;
=======
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
>>>>>>>
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
<<<<<<<
@Mock
LobbyServerAccessor lobbyServerAccessor;
@Mock
UserService userService;
=======
@Mock
UserService userService;
... |
<<<<<<<
=======
public void displayAfterLogOut() {
setShowLoginProgress(false);
stage.show();
JavaFxUtil.centerOnScreen(stage);
}
@FXML
void loginButtonClicked(ActionEvent actionEvent) {
try {
String username = usernameInput.getText();
String password = passwordInput.getText();
... |
<<<<<<<
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
=======
import static com.faforever.client.test.AbstractPlainJavaTest.assertEquals;
import static com.faforever.client.test.AbstractPlainJavaTest.assertNull;
import static org.mockito.Matchers.any;
>>>>>>>
import static o... |
<<<<<<<
chatConnectedLatch.countDown();
pircBotX.sendIRC().joinChannel(defaultChannelName);
=======
ircConnectedLatch.countDown();
joinChannel(defaultChannelName);
>>>>>>>
chatConnectedLatch.countDown();
joinChannel(defaultChannelName); |
<<<<<<<
public void outSelect(SQLSession session, QueryEnvironment env, boolean uniqueViolation) throws SQLException, SQLHandledException {
compile(new CompileOptions<V>(session.syntax)).outSelect(session, env, uniqueViolation);
=======
public void outSelect(SQLSession session, QueryEnvironment env) t... |
<<<<<<<
LAP result = addExportPropertyAProp(LocalizedString.NONAME, type, resultInterfaces.size(), idSet, exprTypes, orders, targetProp,
whereProperty != null, hasListOption, separator, noHeader, charset, attr, resultParams.toArray());
=======
ImOrderSet<String> exportIdSet = SetFact.E... |
<<<<<<<
if(windowType == null)
windowType = WindowFormType.FLOAT;
=======
if(windowType == null) {
if (!inputObjects.isEmpty())
windowType = WindowFormType.DIALOG;
else
windowType = WindowFormType.FLOAT;
}
>>>>>>>
if(... |
<<<<<<<
InputStream inputStream = fileData.getInputStream();
ftpClient.changeWorkingDirectory(remoteFile);
=======
InputStream inputStream = new FileInputStream(file);
>>>>>>>
InputStream inputStream = fileData.getInputStream(); |
<<<<<<<
package lsfusion.server.logics.reflection;
import lsfusion.interop.action.MessageClientAction;
import lsfusion.server.classes.ValueClass;
import lsfusion.server.data.SQLHandledException;
import lsfusion.server.data.SQLSession;
import lsfusion.server.logics.DataObject;
import lsfusion.server.logics.ObjectValue;... |
<<<<<<<
package lsfusion.interop;
import lsfusion.base.NavigatorInfo;
import lsfusion.interop.action.ReportPath;
import lsfusion.interop.event.IDaemonTask;
import lsfusion.interop.form.screen.ExternalScreen;
import lsfusion.interop.form.screen.ExternalScreenParameters;
import lsfusion.interop.navigator.RemoteNavigator... |
<<<<<<<
import lsfusion.server.logics.property.CalcProperty;
import lsfusion.server.logics.property.PropertyInterface;
=======
import lsfusion.server.logics.property.ActionProperty;
>>>>>>>
import lsfusion.server.logics.property.ActionProperty;
import lsfusion.server.logics.property.CalcProperty;
import lsfusion.ser... |
<<<<<<<
=======
// checkBounds() instead of assertBounds(), because getChars works with "long" series of bytes
>>>>>>>
<<<<<<<
final long cumBaseOffset = state.getCumBaseOffset();
long address = cumBaseOffset + offsetBytes;
final long addressLimit = address + utf8LengthBytes;
=======
if (dst ... |
<<<<<<<
=======
import com.google.protobuf.ByteString;
import org.testng.annotations.Test;
import java.io.IOException;
import java.nio.CharBuffer;
import java.nio.charset.StandardCharsets;
>>>>>>>
import com.google.protobuf.ByteString;
import org.testng.annotations.Test;
import java.io.IOException;
import java.nio... |
<<<<<<<
ExternalUtils.ExternalResponse response = ExternalUtils.processRequest(remoteLogics, request.getRequestURI().getPath(),
request.getRequestURI().getRawQuery(), request.getRequestBody(), new HashMap<String, String[]>(), getContentType(request));
=======
St... |
<<<<<<<
package lsfusion.server.logics.scripted;
import lsfusion.base.col.interfaces.immutable.ImMap;
import lsfusion.interop.action.MessageClientAction;
import lsfusion.server.data.SQLHandledException;
import lsfusion.server.logics.DataObject;
import lsfusion.server.logics.ObjectValue;
import lsfusion.server.logics.i... |
<<<<<<<
boolean disableAggregations = context.getBL().reflectionLM.disableAggregationsTableColumn.read(context, tableColumnObject) != null;
if(!disableAggregations) {
try (DataSession dataSession = context.createSession()) {
ServiceDBActionProperty.run(context, new RunService... |
<<<<<<<
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
=======
>>>>>>>
import java.util.Map; |
<<<<<<<
import lsfusion.base.RawFileData;
import lsfusion.interop.action.MessageClientAction;
import lsfusion.server.ServerLoggers;
import lsfusion.server.logics.property.ExecutionContext;
=======
>>>>>>>
<<<<<<<
if (readResult.errorCode == 0) {
String error = null;
=======
... |
<<<<<<<
this.classView = entity.classView;
this.pageSize = entity.getDefaultPageSize();
=======
// текущее состояние
if (this.curClassView != entity.initClassView) {
this.curClassView = entity.initClassView;
this.updated |= UPDATED_CLASSVIEW;
}
... |
<<<<<<<
addScriptedJProp(getArithProp("+"), Arrays.asList(connectionString, new LCPWithParams(addCProp(StringClass.text, LocalizedString.create(request, false))))),
null, null, BaseUtils.add(params, actionLCP), context, toPropertyUsageList);
=======
addScriptedJProp(get... |
<<<<<<<
=======
import lsfusion.base.RawFileData;
import lsfusion.base.col.ListFact;
import lsfusion.base.col.interfaces.immutable.ImMap;
>>>>>>>
import lsfusion.base.RawFileData;
import lsfusion.base.col.ListFact;
import lsfusion.base.col.interfaces.immutable.ImMap;
<<<<<<<
public ImportXLSIterator(ImOrderMap<... |
<<<<<<<
import java.util.HashMap;
=======
import java.util.List;
import java.util.Map;
>>>>>>>
import java.util.HashMap;
import java.util.List;
import java.util.Map;
<<<<<<<
request.getRequestURI(), query, request.getInputStream(), new HashMap<String, String[]>(), contentType, headerNames, heade... |
<<<<<<<
public LAPWithParams addScriptedExternalLSFActionProp(LCPWithParams connectionString, LCPWithParams actionLCP, boolean eval, boolean action, List<LCPWithParams> params, List<TypedParameter> context, List<PropertyUsage> toPropertyUsageList) throws ScriptingErrorLog.SemanticErrorException {
String req... |
<<<<<<<
InputStream inputStream = fileData.getInputStream();
=======
InputStream inputStream = new FileInputStream(file);
ftpClient.changeWorkingDirectory(remoteFile);
>>>>>>>
InputStream inputStream = fileData.getInputStream();
... |
<<<<<<<
=======
checkFormsTable(oldDBStructure);
>>>>>>>
<<<<<<<
=======
if(oldDBStructure.version < NavElementDBVersion)
DataSession.recalculateTableClasses(reflectionLM.navigatorElementTable, sql, LM.baseClass);
if(newDBStructure.version >= 28 ... |
<<<<<<<
if (paramClass != null && !SignatureMatcher.isClassesSoftCompatible(paramClass.getResolveSet(), signature.get(i))) {
errLog.emitWrongPropertyParameterError(parser, paramName, paramClass.getParsedName(), signature.get(i).toString());
=======
if (paramClass !=... |
<<<<<<<
public ImMap<ObjectInstance, DataObject> updateKeys(SQLSession sql, QueryEnvironment env, final Modifier modifier, IncrementChangeProps environmentIncrement, ExecutionEnvironment execEnv, BaseClass baseClass, boolean hidden, final boolean refresh, MFormChanges result, MSet<PropertyDrawInstance> mChangedDraw... |
<<<<<<<
private String getRecognitionErrorText(ScriptParser parser, String errorType, String msg, RecognitionException e) {
String path = parser.getCurrentScriptPath(moduleName, e.line, "\n\t\t\t");
=======
public String getRecognitionErrorText(ScriptParser parser, String errorType, String msg, Recogn... |
<<<<<<<
}
if (readResult.errorCode == 0) {
targetProp.change(readResult.fileBytes, context);
=======
if (readResult.errorCode == 0) {
if(isDynamicFormatFileClass)
targetProp.change((FileData)readResult.fileBytes, context);... |
<<<<<<<
this.cameraOptions.flight.mousePressed(mc, this.cameraOptions.flight.x + 1, this.cameraOptions.flight.y + 1);
=======
this.cameraOptions.flight.mousePressed(this.mc, this.cameraOptions.flight.xPosition + 1, this.cameraOptions.flight.yPosition + 1);
>>>>>>>
this.cameraOptio... |
<<<<<<<
package lsfusion.gwt.form.server.form.handlers;
import lsfusion.gwt.base.server.dispatch.BaseFormBoundActionHandler;
import lsfusion.gwt.form.server.FormDispatchServlet;
import lsfusion.gwt.form.server.FormSessionManager;
import lsfusion.gwt.form.server.FormSessionObject;
import lsfusion.interop.RemoteLogicsIn... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.