conflict_resolution
stringlengths
27
16k
<<<<<<< /* * Swagger Petstore * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * * OpenAPI spec version: 1.0.0 * Contact: apiteam@swagger.io * * NOTE: This class is auto generated by the swagger code gen...
<<<<<<< startKeepAliveService(); new Thread(new Runnable() { ======= Thread t = new Thread(new Runnable() { >>>>>>> new Thread(new Runnable() {
<<<<<<< if (Config.OTHERPROFILES) pluginsList.add(SimpleProfilePlugin.getPlugin()); if (Config.OTHERPROFILES) pluginsList.add(LocalProfilePlugin.INSTANCE); ======= if (!Config.NSCLIENT) pluginsList.add(SimpleProfilePlugin.getPlugin()); if (!Config.NSCLIENT) pluginsList....
<<<<<<< private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM); ======= private static final int NOTIFICATION_ID = 31345; private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM); >>>>>>> private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM); private...
<<<<<<< if (batteryLevel == 1) { mUploaderBattery.setTextColor(dividerBatteryOkColor); ======= if (rawData.batteryLevel == 1) { mUploaderBattery.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_uploaderBattery)); >>>>>>> if (rawData.batteryLeve...
<<<<<<< final String rscId, final String begin, final String end) throws ParseException, PermissionException; public ResourceMeasurementBatchResponse getAggregatedMetricData(ApiMessageContext apiMessageContext, final ResourceMeasurementRequests hqMsmtReqs, final String begin, final String end) ...
<<<<<<< public class NSProfileFragment extends SubscriberFragment implements AdapterView.OnItemSelectedListener { private static NSProfilePlugin nsProfilePlugin = new NSProfilePlugin(); public static NSProfilePlugin getPlugin() { return nsProfilePlugin; } private Spinner profileSpinner; =====...
<<<<<<< import info.nightscout.androidaps.utils.T; ======= import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.CompositeDisposable; >>>>>>> import info.nightscout.androidaps.utils.T; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.Compos...
<<<<<<< if (batteryLevel == 1) { mUploaderBattery.setTextColor(ContextCompat.getColor(getApplicationContext(), dividerMatchesBg ? R.color.dark_midColor : R.color.dark_uploaderBattery)); ======= if (rawData.batteryLevel == 1) { mUploaderBattery.setTextColor(C...
<<<<<<< import info.nightscout.androidaps.plugins.IobCobCalculator.AutosensData; import info.nightscout.androidaps.plugins.IobCobCalculator.IobCobCalculatorPlugin; ======= import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin; >>>>>>> import info.nightscout.androidaps.plugins.IobCobCalculator.A...
<<<<<<< GenericAAPS("Generic AAPS", "AndroidAPS", "VirutalPump", 0.1d, null, // new DoseSettings(0.05d, 30, 8*60, 0.05d), // ======= GenericAAPS("Generic AAPS", 0.1d, null, // new DoseSettings(0.05d, 30, 8 * 60, 0.05d), // >>>>>>> GenericAAPS("Generic AAPS", "AndroidAPS", "Virutal...
<<<<<<< private final PodStateManager podStateManager; private OmnipodUtil omnipodUtil; private AAPSLogger aapsLogger; private RxBusWrapper rxBus; private ResourceHelper resourceHelper; private HasAndroidInjector injector; private ActivePluginProvider activePlugin; private OmnipodPumpSta...
<<<<<<< if (statuslightsLayout != null) { if (SP.getBoolean(R.string.key_show_statuslights, false)) { CareportalEvent careportalEvent; NSSettingsStatus nsSettings = new NSSettingsStatus().getInstance(); double iageUrgent = nsSettings.getExtendedWarnVal...
<<<<<<< AndroidPermission.notifyForSMSPermissions(this, smsCommunicatorPlugin); ======= AndroidPermission.notifyForSMSPermissions(this); AndroidPermission.notifyForSystemWindowPermissions(this); >>>>>>> AndroidPermission.notifyForSMSPermissions(this, smsCommunicatorPlu...
<<<<<<< ======= import java.sql.Connection; >>>>>>> import java.sql.Connection;
<<<<<<< import org.hyperic.hq.api.model.ConfigurationOption; import org.hyperic.hq.api.model.ConfigurationTemplate; import org.hyperic.hq.api.model.Resource; ======= import org.hyperic.hq.api.model.ResourceModel; >>>>>>> import org.hyperic.hq.api.model.ConfigurationOption; import org.hyperic.hq.api.model.Configurati...
<<<<<<< ======= import org.junit.Ignore; import org.junit.Test; >>>>>>> import org.junit.Ignore; import org.junit.Test; <<<<<<< //@Test public void testLocale() { Locale l = new Locale("en", "IE"); Locale.setDefault(l); Date date = new Date(); System.out.println("Date:...
<<<<<<< import info.nightscout.androidaps.plugins.common.SubscriberFragment; import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin; import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions; import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction; ======= impor...
<<<<<<< import info.nightscout.androidaps.plugins.OpenAPSSMB.OpenAPSSMBPlugin; import info.nightscout.androidaps.plugins.InsulinOrefCurves.InsulinOrefFreePeakPlugin; ======= import info.nightscout.androidaps.plugins.Insulin.InsulinOrefFreePeakPlugin; >>>>>>> import info.nightscout.androidaps.plugins.OpenAPSSMB.OpenA...
<<<<<<< if (Config.VIRTUALPUMP) pluginsList.add(VirtualPumpPlugin.getInstance()); if (Config.LOOPENABLED) pluginsList.add(LoopPlugin.getPlugin()); if (Config.OPENAPSENABLED) pluginsList.add(OpenAPSMAPlugin.getPlugin()); if (Config.OPENAPSENABLED) pluginsList.add(OpenAPSAM...
<<<<<<< apsModeView.setTextColor(MainApp.gc(R.color.ribbonTextWarning)); } else if (loopPlugin.isEnabled(PluginType.LOOP) && loopPlugin.isDisconnected()) { apsModeView.setBackgroundColor(MainApp.gc(R.color.ribbonCritical)); ======= apsModeView.setTextColor(C...
<<<<<<< unregisterActivityLifecycleCallbacks(TS.INSTANCE); ======= if (mWakeLock != null && mWakeLock.isHeld()) mWakeLock.release(); >>>>>>> unregisterActivityLifecycleCallbacks(TS.INSTANCE); if (mWakeLock != null && mWakeLock.isHeld()) mWakeLock.release();
<<<<<<< private final AAPSLogger aapsLogger; private final RxBusWrapper rxBus; private final ResourceHelper resourceHelper; private final ConstraintChecker constraintChecker; private final TreatmentsPlugin treatmentsPlugin; private final SP sp; private final CommandQueueProvider commandQueue...
<<<<<<< public static ConfigBuilderPlugin configBuilderPlugin; public static ProfileFunctions profileFunctions; ======= public static ConstraintChecker constraintChecker; >>>>>>> public static ConfigBuilderPlugin configBuilderPlugin; public static ProfileFunctions profileFunctions; public sta...
<<<<<<< /* No usable settings yet if (Config.COMBO) { addPreferencesFromResourceIfEnabled(ComboPlugin.getPlugin(), PluginBase.PUMP); } */ addPreferencesFromResourceIfEnabled(VirtualPumpPlugin.getPlugin(), PluginBase.PUM...
<<<<<<< .subscribe(event -> updatePumpStatus(event.getStatus(resourceHelper)), exception -> FabricPrivacy.getInstance().logException(exception) ======= .subscribe(event -> updatePumpStatus(event), FabricPrivacy::logException >>>>>>> ...
<<<<<<< ======= private void refreshCustomActionsList() { RxBus.INSTANCE.send(new EventCustomActionsChanged()); } >>>>>>>
<<<<<<< import org.hyperic.hq.product.server.session.ProductManagerImpl; import org.hyperic.hq.product.shared.ProductManager; ======= import org.hyperic.hq.product.shared.ProductManagerLocal; >>>>>>> import org.hyperic.hq.product.shared.ProductManager; <<<<<<< protected static MeasurementPluginManager _mpm = nu...
<<<<<<< import info.nightscout.androidaps.plugins.source.GlimpPlugin; ======= import info.nightscout.androidaps.plugins.source.SourceGlimpPlugin; import info.nightscout.androidaps.plugins.treatments.TreatmentService; import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin; >>>>>>> import info.nightscou...
<<<<<<< ======= import info.nightscout.androidaps.data.Profile; >>>>>>> import info.nightscout.androidaps.data.Profile; <<<<<<< import info.nightscout.androidaps.plugins.bus.RxBus; import info.nightscout.androidaps.plugins.constraints.safety.SafetyPlugin; import info.nightscout.androidaps.plugins.general.automation...
<<<<<<< import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus; ======= import info.nightscout.androidaps.plugins.pump.common.utils.LocationHelper; import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin; >>>>>>> import info.nightscout.androidaps.plugins.pump.medtron...
<<<<<<< final boolean predictionsAvailable = finalLastRun != null && finalLastRun.request.hasPredictions; if (predictionsAvailable) { showPredictionView.setVisibility(View.VISIBLE); getActivity().findViewById(R.id.overview_showprediction_label).setVisibility(View.VISIBLE); =====...
<<<<<<< public static final int WRONGBASALSTEP = 23; ======= public static final int BOLUS_DELIVERY_ERROR = 24; >>>>>>> public static final int WRONGBASALSTEP = 23; public static final int BOLUS_DELIVERY_ERROR = 24;
<<<<<<< import info.nightscout.androidaps.plugins.IobCobCalculator.events.BasalData; import info.nightscout.androidaps.plugins.Loop.APSResult; ======= import info.nightscout.androidaps.plugins.IobCobCalculator.BasalData; import info.nightscout.androidaps.plugins.OpenAPSAMA.DetermineBasalResultAMA; >>>>>>> import inf...
<<<<<<< import info.nightscout.androidaps.utils.buildHelper.BuildHelper; import info.nightscout.androidaps.utils.resources.ResourceHelper; import info.nightscout.androidaps.utils.sharedPreferences.SP; import info.nightscout.androidaps.utils.wizard.BolusWizard; import info.nightscout.androidaps.utils.wizard.QuickWizard;...
<<<<<<< import static org.hyperic.plugin.vrealize.automation.VRAUtils.getFqdn; ======= >>>>>>> import static org.hyperic.plugin.vrealize.automation.VRAUtils.getFqdn; <<<<<<< String databaseServerFqdn = getFqdn(jdbcURL); ======= String databaseServerFqdn = getDatabaseFqdn(jdbcURL); >>>>>>>...
<<<<<<< returnData = communicationManager.initPod((PodInitActionType) parameters[0], (PodInitReceiver) parameters[1]); ======= returnData = communicationManager.pairAndPrime(); >>>>>>> returnData = communicationManager.initPod(); // TODO returnData = com...
<<<<<<< Iob aIOB = insulinInterface.iobCalcForTreatment(tempBolusPart, time, profile.getDia()); result.basaliob += aIOB.iobContrib; result.activity += aIOB.activityContrib; Double dia_ago = time - profile.getDia() * 60 * 60 * 1000; if (date...
<<<<<<< ======= @Override public double getReservoirLevel() { return reservoirInUnits; } @Override public int getBatteryLevel() { return batteryPercent; } >>>>>>> @Override public double getReservoirLevel() { return reservoirInUnits; } @Override public int getBatteryLevel() { retu...
<<<<<<< import info.nightscout.androidaps.plugins.Actions.ActionsFragment; import info.nightscout.androidaps.plugins.Careportal.CareportalPlugin; import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin; import info.nightscout.androidaps.plugins.ConstraintsObjectives.ObjectivesPlugin; import info.nig...
<<<<<<< @Inject AAPSLogger aapsLogger; @Inject Context context; @Inject MedtronicPumpPlugin medtronicPumpPlugin; @Inject SP sp; ======= //@Inject AAPSLogger aapsLogger; //@Inject Context context; @Inject MedtronicPumpPlugin medtronicPumpPlugin; //@Inject SP sp; >>>>>>> //@Inject A...
<<<<<<< if (!sp.getBoolean(R.string.key_setupwizard_processed, false)) { ======= if (!SP.getBoolean(R.string.key_setupwizard_processed, false) && !isRunningRealPumpTest()) { >>>>>>> if (!sp.getBoolean(R.string.key_setupwizard_processed, false) && !isRunningRealPumpTest()) {
<<<<<<< import info.nightscout.androidaps.plugins.PumpCombo.ComboPlugin; ======= import info.nightscout.androidaps.plugins.InsulinOrefCurves.InsulinOrefFreePeakPlugin; >>>>>>> import info.nightscout.androidaps.plugins.PumpCombo.ComboPlugin; import info.nightscout.androidaps.plugins.InsulinOrefCurves.InsulinOrefFreeP...
<<<<<<< import android.widget.LinearLayout; ======= import android.widget.EditText; >>>>>>> import android.widget.EditText; import android.widget.LinearLayout; <<<<<<< if (carbsAfterConstraints > 0) { if (duration == 0) { createCarb...
<<<<<<< package io.oasp.gastronomy.restaurant.salesmanagement.dataaccess.impl.dao; import io.oasp.gastronomy.restaurant.general.common.AbstractSpringIntegrationTest; import io.oasp.gastronomy.restaurant.general.common.api.datatype.Money; import io.oasp.gastronomy.restaurant.salesmanagement.dataaccess.api.BillEntity; i...
<<<<<<< public void setMessage(String message, final int messageKind) { ======= public void setMessage(final String message, final int messageKind) { >>>>>>> public void setMessage(String message, final int messageKind) { <<<<<<< ======= public void removeMessages(final int messageKind) { ...
<<<<<<< /* (non-Javadoc) * @see org.eclipse.jface.wizard.Wizard#performFinish() */ @Override public boolean performFinish() { try { getContainer().run(false, false, new IRunnableWithProgress() { @Override public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedExcept...
<<<<<<< * Copyright (C) 2012-2014 Bonitasoft S.A. * Bonitasoft, 32 rue Gustave Eiffel - 38000 Grenoble ======= * Copyright (C) 2012 BonitaSoft S.A. * BonitaSoft, 32 rue Gustave Eiffel - 38000 Grenoble * >>>>>>> * Copyright (C) 2012-2014 Bonitasoft S.A. * Bonitasoft, 32 rue Gustave Eiffel - 38000 Grenoble <<<...
<<<<<<< @Override protected void hookRootFigure() { super.hookRootFigure(); org.eclipse.swt.widgets.Control c = getControl(); if(c instanceof FigureCanvas){ c.getParent().addDisposeListener(new DisposeListener() { @Override public void widgetDisposed(DisposeEvent e) { System.out.println("I'...
<<<<<<< import org.bonitasoft.studio.model.process.builders.ActivityBuilder; ======= import org.bonitasoft.studio.model.process.builders.ActorFilterBuilder; >>>>>>> import org.bonitasoft.studio.model.process.builders.ActorFilterBuilder; import org.bonitasoft.studio.model.process.builders.ActivityBuilder; <<<<<<< ...
<<<<<<< import org.bonitasoft.studio.common.emf.tools.ExpressionHelper; import org.bonitasoft.studio.common.emf.tools.ModelHelper; ======= >>>>>>> import org.bonitasoft.studio.common.emf.tools.ExpressionHelper; <<<<<<< ======= final List<Expression> dependenciesList = createDependenciesList(simpleExpressi...
<<<<<<< import org.bonitasoft.studio.pagedesigner.core.bar.BarResourceCreationException; import org.bonitasoft.studio.pagedesigner.core.bos.WebFormBOSArchiveFileStoreProvider; import org.bonitasoft.studio.preferences.BonitaStudioPreferencesPlugin; ======= import org.bonitasoft.studio.preferences.BonitaStudioPreferenc...
<<<<<<< DocumentTypeMigrationIT.class, ======= TestTokenDispatcher.class, >>>>>>> TestTokenDispatcher.class, DocumentTypeMigrationIT.class,
<<<<<<< ======= @Override public void postStartup() { try { IConfigurationElement[] elements = BonitaStudioExtensionRegistryManager.getInstance().getConfigurationElements("org.bonitasoft.studio.common.poststartup"); //$NON-NLS-1$ IPostStartupContribution contrib = null; for (IConfigurationElement elem :...
<<<<<<< import org.bonitasoft.studio.tests.attachment.TestRunWithDocument; import org.bonitasoft.studio.tests.contract.ContractIT; ======= >>>>>>> import org.bonitasoft.studio.tests.contract.ContractIT; <<<<<<< TestProcessDependencies.class, ContractIT.class ======= TestProcessDependencies...
<<<<<<< import org.bonitasoft.studio.refactoring.core.RefactorDataOperation; ======= import org.bonitasoft.studio.swt.AbstractSWTTestCase; >>>>>>> import org.bonitasoft.studio.refactoring.core.RefactorDataOperation; import org.bonitasoft.studio.swt.AbstractSWTTestCase;
<<<<<<< * ======= >>>>>>> <<<<<<< * ======= >>>>>>> <<<<<<< * ======= >>>>>>> <<<<<<< ======= import org.bonitasoft.studio.model.process.Task; import org.eclipse.core.databinding.UpdateValueStrategy; import org.eclipse.core.databinding.conversion.Converter; import org.eclipse.core.databinding.observabl...
<<<<<<< ======= @Override protected void bindValue() { final IViewerObservableValue observeSingleSelection = ViewersObservables.observeSingleSelection(explorer.getRightTableViewer()); context.bindValue(observeSingleSelection, EMFObservables.observeValue(implementation, ConnectorImplementationPackage.L...
<<<<<<< @Test public void should_find_correct_file_store_if_two_files_have_the_same_name() { FileStoreFinder finder = spy(FileStoreFinder.class); IFile file = mock(IFile.class); IFolder parent = mock(IFolder.class); when(parent.getName()).thenReturn(ORGANIZATION_FOLDER_NAME); ...
<<<<<<< public static final String SWTBOT_ID_CONSTRAINT_ERROR_MESSAGE_TEXTEDITOR = "SWTBOT_ID_CONSTRAINT_ERROR_MESSAGE_TEXTEDITOR"; ======= public static final String SWTBOT_ID_MIGRATION_REPORT_TABLE = "org.bonitasoft.studio.importer.bar.reportTable"; >>>>>>> public static final String SWTBOT_ID_MIGR...
<<<<<<< @Override public boolean isPageComplete() { return super.isPageComplete() || userSingleSelectionObservable.getValue() == null; } ======= private boolean isNotUserSelected() { return userSingleSelectionObservable == null || userSingleSelectionObservable.getValue() == null; ...
<<<<<<< public BotContractInputRow selectRow(final SWTGefBot bot, final int row) { return new BotContractInputRow(bot, row); } public BotContractInputRow selectActiveRow(final SWTGefBot bot) { final SWTBotTree treeWithId = bot.treeWithId(SWTBotConstants.SWTBOT_ID_CONTRACT_INPUT_TREE); ...
<<<<<<< ======= revealEditPart(editPart); PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor().setFocus(); >>>>>>> revealEditPart(editPart);
<<<<<<< private ExpressionHelper() { } public static Expression createExpressionFromEnumType(final EnumType type){ ======= public static Expression createExpressionFromEnumType(final EnumType type) { >>>>>>> private ExpressionHelper() { } public static Expression createExpressionFrom...
<<<<<<< * ======= >>>>>>> <<<<<<< * ======= >>>>>>> <<<<<<< * ======= >>>>>>> <<<<<<< * ======= >>>>>>> * * @param bot * @param taskName * @param newDiagramName */ public static void changeDiagramName(final SWTGefBot bot, final String newDiagramName) { ...
<<<<<<< import org.bonitasoft.studio.model.process.MultiInstantiation; import org.bonitasoft.studio.model.process.ProcessPackage; ======= import org.bonitasoft.studio.model.process.MultiInstanceType; import org.bonitasoft.studio.model.process.MultiInstantiable; >>>>>>> import org.bonitasoft.studio.model.process.Mult...
<<<<<<< import org.bonitasoft.studio.model.process.DateType; import org.bonitasoft.studio.model.process.DoubleType; ======= import org.bonitasoft.studio.model.process.Document; >>>>>>> import org.bonitasoft.studio.model.process.DateType; import org.bonitasoft.studio.model.process.Document; import org.bonitasoft.stud...
<<<<<<< import org.hyperic.hq.appdef.shared.AppdefEntityNotFoundException; import org.hyperic.hq.appdef.shared.ConfigFetchException; ======= import org.hyperic.hq.api.transfer.mapping.UnknownEndpointException; >>>>>>> import org.hyperic.hq.appdef.shared.AppdefEntityNotFoundException; import org.hyperic.hq.appdef.sha...
<<<<<<< ======= private String performGroovyRefactoring(final String script) { final ProvidedGroovyRepositoryStore store = RepositoryManager.getInstance().getRepositoryStore(ProvidedGroovyRepositoryStore.class); final GroovyFileStore tmpGroovyFileStore = store.createRepositoryFileStore("script" + ...
<<<<<<< import org.bonitasoft.studio.model.process.diagram.edit.parts.SequenceFlowNameEditPart; import org.eclipse.draw2d.Figure; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.EditPart; import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart; import org.eclipse.gmf.runtime.notation....
<<<<<<< ======= import org.bonitasoft.studio.tests.attachment.TestRunWithDocument; import org.bonitasoft.studio.tests.data.DataWizardIT; >>>>>>> import org.bonitasoft.studio.tests.data.DataWizardIT;
<<<<<<< import org.bonitasoft.studio.swtbot.framework.expression.BotExpressionEditorDialog; import org.bonitasoft.studio.swtbot.framework.expression.BotScriptExpressionEditor; ======= import org.eclipse.jface.dialogs.IDialogConstants; >>>>>>> import org.bonitasoft.studio.swtbot.framework.expression.BotExpressionEdit...
<<<<<<< import org.physical_web.physicalweb.BeaconConfigHelper; import org.uribeacon.beacon.UriBeacon; ======= >>>>>>> import org.uribeacon.beacon.UriBeacon; <<<<<<< private final ScanCallback mScanCallback = new ScanCallback() { @Override public void onScanResult(int callbackType, ScanResult scanResult) ...
<<<<<<< Iterable<byte[]> keys = new IndexIterable(indice); Iterable<KeyValue<T>> results = mgr.findAllImpl2(mainMetaClass, keys, meta.getQuery(), batchSize); ======= Iterable<byte[]> keys = new IterableIndex(indice); Iterable<KeyValue<T>> results = mgr.findAllImpl2(metaClass, keys, meta.getQuery(), batchSize)...
<<<<<<< bindings.addBehaviourMap( "store", storeController.getBehaviourMap() ); bindings.addInputTriggerMap( "store", storeController.getInputTriggerMap() ); bdv.getViewerFrame().setDefaultCloseOperation( WindowConstants.DO_NOTHING_ON_CLOSE ); // TODO I hate this, but we need to prevent the ViewerFrame's ...
<<<<<<< ======= import net.imglib2.cache.Cache; import net.imglib2.cache.CacheLoader; import net.imglib2.cache.Invalidate; >>>>>>> import net.imglib2.cache.Cache; import net.imglib2.cache.CacheLoader; import net.imglib2.cache.Invalidate; <<<<<<< import net.imglib2.util.ValuePair; import org.janelia.saalfeldlab.fx.O...
<<<<<<< import java.lang.reflect.Type; import java.util.Optional; import org.janelia.saalfeldlab.paintera.meshes.MeshSettings; import org.janelia.saalfeldlab.paintera.serialization.PainteraSerialization; import org.scijava.plugin.Plugin; ======= >>>>>>> import java.lang.reflect.Type; import java.util.Optional; im...
<<<<<<< public class MainActivity extends BaseActivity { ======= public class MainActivity extends BaseActivity { >>>>>>> public class MainActivity extends BaseActivity { <<<<<<< private BGABadgeLinearLayout meIconView; ======= private static int notificationLength; private NotificationService noti...
<<<<<<< ======= final InterruptibleFunction<Long, Interval[]>[] blockLoaders = IntStream .range(0, source.getNumMipmapLevels()) .mapToObj(level -> InterruptibleFunction.fromFunction( ThrowingFunction.unchecked((ThrowingFunction<Long, Interval[], Exception>) id -> lookup.read(new LabelBlockLookupKey(level, i...
<<<<<<< ======= import eu.unicate.retroauth.annotations.Authenticated; import eu.unicate.retroauth.annotations.Authentication; import retrofit.http.Body; >>>>>>> import retrofit.http.Body;
<<<<<<< import com.google.gson.JsonIOException; import com.google.gson.JsonSyntaxException; import bdv.util.BlockedInterval; import bdv.util.dvid.DatasetBlk; import bdv.util.dvid.DatasetBlkLabel; import bdv.util.dvid.Node; import bdv.util.dvid.Repository; ======= >>>>>>> import com.google.gson.JsonIOException; impo...
<<<<<<< import javafx.beans.property.SimpleIntegerProperty; ======= import javafx.beans.property.SimpleObjectProperty; import javafx.scene.paint.Color; import javafx.scene.transform.Affine; import org.janelia.saalfeldlab.paintera.viewer3d.Viewer3DFX; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import ja...
<<<<<<< import org.janelia.saalfeldlab.fx.ObservableWithListenersList; import org.janelia.saalfeldlab.fx.util.InvokeOnJavaFXApplicationThread; import org.janelia.saalfeldlab.labels.Label; import org.janelia.saalfeldlab.paintera.cache.Invalidate; import org.janelia.saalfeldlab.paintera.cache.InvalidateAll; import org.ja...
<<<<<<< import org.janelia.saalfeldlab.fx.ui.NumberField; import org.janelia.saalfeldlab.fx.ui.ObjectField.SubmitOn; import org.janelia.saalfeldlab.util.fx.UIUtils; import javafx.beans.property.IntegerProperty; import javafx.geometry.HPos; ======= import javafx.geometry.Insets; >>>>>>> import org.janelia.saalfeldla...
<<<<<<< import net.imglib2.converter.ARGBColorConverter.InvertingImp1; import net.imglib2.converter.ARGBCompositeColorConverter; ======= >>>>>>> <<<<<<< import org.janelia.saalfeldlab.paintera.data.mask.Masks; import org.janelia.saalfeldlab.paintera.data.mask.persist.PersistCanvas; import org.janelia.saalfeldlab.pa...
<<<<<<< import java.lang.invoke.MethodHandles; import java.util.Arrays; import java.util.concurrent.ExecutorService; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.LongFunction; import java.util.function.ToLongFunction; import org.janelia.saalfeldlab.fx.event.Delegate...
<<<<<<< ======= private final double centerX = 0; private final double centerY = 0; final private static double step = 1.0;// Math.PI / 180; >>>>>>> <<<<<<< public Viewer3DFX( final double width, final double height, final Interval interval ) ======= private static final Point3D xNormal = new Point3D( 1, ...
<<<<<<< ======= public synchronized void updateCompleteBoundingBox( final float[] boundingBox ) { assert completeBoundingBox.length == boundingBox.length; completeBoundingBox = maxBoundingBox( completeBoundingBox, boundingBox ); for ( final NeuronRendererListener listener : listeners ) listener.updateCa...
<<<<<<< import net.imglib2.RandomAccessibleInterval; ======= import net.imglib2.realtransform.AffineTransform3D; >>>>>>> import net.imglib2.RandomAccessibleInterval; import net.imglib2.realtransform.AffineTransform3D; <<<<<<< // if one of the neighbors chunks exists, creates it ======= // if one of the neigh...
<<<<<<< ======= for ( int i = 0; i < rawDataLoaders.length; ++i ) rawDataLoaders[ i ].setCache( imgLoader.getCacheControl() ); >>>>>>> <<<<<<< ======= for ( final SetCache setCache : labelLoaders ) setCache.setCache( imgLoader.getCacheControl() ); >>>>>>>
<<<<<<< import org.janelia.saalfeldlab.paintera.viewer3d.ViewFrustum; import org.janelia.saalfeldlab.util.concurrent.HashPriorityQueueBasedTaskExecutor; ======= import org.janelia.saalfeldlab.paintera.state.label.ConnectomicsLabelState; >>>>>>> import org.janelia.saalfeldlab.paintera.viewer3d.ViewFrustum; import org...
<<<<<<< import javafx.beans.InvalidationListener; import javafx.beans.property.*; ======= import javafx.beans.binding.Bindings; import javafx.beans.binding.ObjectBinding; import javafx.beans.property.BooleanProperty; import javafx.beans.property.DoubleProperty; import javafx.beans.property.IntegerProperty; import jav...
<<<<<<< final PriorityExecutorService<MeshWorkerPriority> workers, final String projectDirectory) throws IOException, ReflectionException { ======= final ExecutorService workers, final Supplier<String> projectDirectory) throws IOException, ReflectionException { >>>>>>> final PriorityExecutorService<Me...
<<<<<<< import java.io.File; import java.io.IOException; import java.lang.invoke.MethodHandles; import java.util.Optional; import java.util.function.Predicate; import javax.imageio.ImageIO; import org.janelia.saalfeldlab.fx.ObservableWithListenersList; import org.janelia.saalfeldlab.fx.event.MouseDragFX; import org.j...
<<<<<<< import com.amcolabs.quizapp.widgets.CustomProgressBar; ======= import com.amcolabs.quizapp.widgets.GothamButtonView; >>>>>>> import com.amcolabs.quizapp.widgets.CustomProgressBar; import com.amcolabs.quizapp.widgets.GothamButtonView;
<<<<<<< import javafx.beans.property.IntegerProperty; import javafx.beans.property.ObjectProperty; ======= import javafx.beans.property.ObjectProperty; >>>>>>> import javafx.beans.property.IntegerProperty; import javafx.beans.property.ObjectProperty; <<<<<<< import javafx.beans.property.SimpleIntegerProperty; impor...
<<<<<<< WinOrLoseController resultScreen = (WinOrLoseController) quizApp.loadAppController(WinOrLoseController.class); resultScreen.loadResultScreen(quiz,currentUsers,userAnswersStack); ======= // WinOrLoseController resultScreen = (WinOrLoseController) quizApp.loadAppController(WinOrLoseController.class); // r...
<<<<<<< // TODO meshCache has access to ShapeKey.scaleIndex(). Instead of passing an array of // TODO caches, pass a single cache instead and use ShapeKey.scaleIndex() inside the cache. ======= private SceneUpdateParameters sceneUpdateParameters; >>>>>>> private SceneUpdateParameters sceneUpdateParameters; //...
<<<<<<< import horse.wtf.nzyme.notifications.FieldNames; import horse.wtf.nzyme.notifications.Notification; ======= import horse.wtf.nzyme.dot11.Dot11MetaInformation; import horse.wtf.nzyme.graylog.GraylogFieldNames; import horse.wtf.nzyme.graylog.Notification; >>>>>>> import horse.wtf.nzyme.dot11.Dot11MetaInformati...
<<<<<<< import java.util.regex.Pattern; ======= /** * Naming convention for Wavefront. * * @author Jon Schneider * @since 1.0.0 */ >>>>>>> import java.util.regex.Pattern; /** * Naming convention for Wavefront. * * @author Jon Schneider * @since 1.0.0 */