conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.apache.sling.api.resource.Resource;
import com.cognifide.slice.api.provider.ModelProvider;
public class MockModelProvider implements ModelProvider {
private final Map<ClassPathPair, Object> modelStore;
public MockModelProvider() {
modelStore = new HashMap<MockModelProvider.ClassPathPair, Object>();
}
public <T> MockModelProvider add(Class<T> type, String path, T model) {
modelStore.put(new ClassPathPair(type, path), model);
return this;
}
@SuppressWarnings("unchecked")
@Override
public <T> T get(Class<T> type, String path) {
ClassPathPair key = new ClassPathPair(type, path);
if (modelStore.containsKey(key)) {
return (T) modelStore.get(key);
}
return null;
}
@Override
public <T> T get(Class<T> type, Resource resource) {
// TODO
return null;
}
@Override
public Object get(String className, String path) throws ClassNotFoundException {
// TODO
return null;
}
@Override
public <T> List<T> getList(Class<T> type, Iterator<String> paths) {
List<T> result = new ArrayList<T>();
while (paths.hasNext()) {
String path = paths.next();
T model = get(type, path);
if (model != null) {
result.add(model);
}
}
return result;
}
@Override
public <T> List<T> getList(Class<T> type, String[] paths) {
List<T> result = new ArrayList<T>();
for (String path : paths) {
T model = get(type, path);
if (model != null) {
result.add(model);
}
}
return result;
}
@Override
public <T> List<T> getListFromResources(Class<T> type, Iterator<Resource> resources) {
List<T> result = new ArrayList<T>();
while (resources.hasNext()) {
Resource resource = resources.next();
result.add(get(type, resource));
}
return result;
}
private class ClassPathPair {
private Class<?> type;
private String path;
public ClassPathPair(Class<?> type, String path) {
super();
this.type = type;
this.path = path;
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + getOuterType().hashCode();
result = prime * result + ((path == null) ? 0 : path.hashCode());
result = prime * result + ((type == null) ? 0 : type.hashCode());
return result;
}
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
ClassPathPair other = (ClassPathPair) obj;
if (!getOuterType().equals(other.getOuterType()))
return false;
if (path == null) {
if (other.path != null)
return false;
} else if (!path.equals(other.path))
return false;
if (type == null) {
if (other.type != null)
return false;
} else if (!type.equals(other.type))
return false;
return true;
}
private MockModelProvider getOuterType() {
return MockModelProvider.this;
}
}
}
=======
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.apache.sling.api.resource.Resource;
import com.cognifide.slice.api.provider.ModelProvider;
import org.apache.sling.api.resource.ResourceResolver;
import com.google.inject.Key;
public class MockModelProvider implements ModelProvider {
private final Map<ClassPathPair, Object> modelStore;
public MockModelProvider() {
modelStore = new HashMap<MockModelProvider.ClassPathPair, Object>();
}
public <T> MockModelProvider add(Class<T> type, String path, T model) {
modelStore.put(new ClassPathPair(type, path), model);
return this;
}
@SuppressWarnings("unchecked")
@Override
public <T> T get(Class<T> type, String path) {
ClassPathPair key = new ClassPathPair(type, path);
if (modelStore.containsKey(key)) {
return (T) modelStore.get(key);
}
return null;
}
@Override
public <T> T get(Class<T> type, Resource resource) {
// TODO
return null;
}
@Override
public <T> T get(Key<T> key, Resource resource) {
// TODO
return null;
}
@Override
public <T> T get(Key<T> key, String path) {
// TODO
return null;
}
@Override
public Object get(String className, String path) throws ClassNotFoundException {
// TODO
return null;
}
@Override
public Object get(String className, Resource resource) throws ClassNotFoundException {
// TODO
return null;
}
@Override
public <T> List<T> getList(Class<T> type, Iterator<String> paths) {
List<T> result = new ArrayList<T>();
while (paths.hasNext()) {
String path = paths.next();
T model = get(type, path);
if (model != null) {
result.add(model);
}
}
return result;
}
@Override
public <T> List<T> getList(Class<T> type, String[] paths) {
List<T> result = new ArrayList<T>();
for (String path : paths) {
T model = get(type, path);
if (model != null) {
result.add(model);
}
}
return result;
}
@Override
@SuppressWarnings("null")
public <T> List<T> getChildModels(Class<T> type, String path) {
ResourceResolver resolver = null;
return getChildModels(type, resolver.getResource(path));
}
@Override
public <T> List<T> getChildModels(Class<T> type, Resource resource) {
final ArrayList<T> result = new ArrayList<T>();
if (resource != null) {
Iterator<Resource> listChildren = resource.listChildren();
while (listChildren.hasNext()) {
Resource childResource = listChildren.next();
result.add(get(type, childResource));
}
}
return result;
}
private class ClassPathPair {
private Class<?> type;
private String path;
public ClassPathPair(Class<?> type, String path) {
super();
this.type = type;
this.path = path;
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + getOuterType().hashCode();
result = prime * result + ((path == null) ? 0 : path.hashCode());
result = prime * result + ((type == null) ? 0 : type.hashCode());
return result;
}
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
ClassPathPair other = (ClassPathPair) obj;
if (!getOuterType().equals(other.getOuterType()))
return false;
if (path == null) {
if (other.path != null)
return false;
} else if (!path.equals(other.path))
return false;
if (type == null) {
if (other.type != null)
return false;
} else if (!type.equals(other.type))
return false;
return true;
}
private MockModelProvider getOuterType() {
return MockModelProvider.this;
}
}
}
>>>>>>>
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.apache.sling.api.resource.Resource;
import com.cognifide.slice.api.provider.ModelProvider;
import org.apache.sling.api.resource.ResourceResolver;
import com.google.inject.Key;
public class MockModelProvider implements ModelProvider {
private final Map<ClassPathPair, Object> modelStore;
public MockModelProvider() {
modelStore = new HashMap<MockModelProvider.ClassPathPair, Object>();
}
public <T> MockModelProvider add(Class<T> type, String path, T model) {
modelStore.put(new ClassPathPair(type, path), model);
return this;
}
@SuppressWarnings("unchecked")
@Override
public <T> T get(Class<T> type, String path) {
ClassPathPair key = new ClassPathPair(type, path);
if (modelStore.containsKey(key)) {
return (T) modelStore.get(key);
}
return null;
}
@Override
public <T> T get(Class<T> type, Resource resource) {
// TODO
return null;
}
@Override
public <T> T get(Key<T> key, Resource resource) {
// TODO
return null;
}
@Override
public <T> T get(Key<T> key, String path) {
// TODO
return null;
}
@Override
public Object get(String className, String path) throws ClassNotFoundException {
// TODO
return null;
}
@Override
public Object get(String className, Resource resource) throws ClassNotFoundException {
// TODO
return null;
}
@Override
public <T> List<T> getList(Class<T> type, Iterator<String> paths) {
List<T> result = new ArrayList<T>();
while (paths.hasNext()) {
String path = paths.next();
T model = get(type, path);
if (model != null) {
result.add(model);
}
}
return result;
}
@Override
public <T> List<T> getList(Class<T> type, String[] paths) {
List<T> result = new ArrayList<T>();
for (String path : paths) {
T model = get(type, path);
if (model != null) {
result.add(model);
}
}
return result;
}
@Override
@SuppressWarnings("null")
public <T> List<T> getChildModels(Class<T> type, String path) {
ResourceResolver resolver = null;
return getChildModels(type, resolver.getResource(path));
}
@Override
public <T> List<T> getChildModels(Class<T> type, Resource resource) {
final ArrayList<T> result = new ArrayList<T>();
if (resource != null) {
Iterator<Resource> listChildren = resource.listChildren();
while (listChildren.hasNext()) {
Resource childResource = listChildren.next();
result.add(get(type, childResource));
}
}
return result;
}
@Override
public <T> List<T> getListFromResources(Class<T> type, Iterator<Resource> resources) {
List<T> result = new ArrayList<T>();
while (resources.hasNext()) {
Resource resource = resources.next();
result.add(get(type, resource));
}
return result;
}
private class ClassPathPair {
private Class<?> type;
private String path;
public ClassPathPair(Class<?> type, String path) {
super();
this.type = type;
this.path = path;
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + getOuterType().hashCode();
result = prime * result + ((path == null) ? 0 : path.hashCode());
result = prime * result + ((type == null) ? 0 : type.hashCode());
return result;
}
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
ClassPathPair other = (ClassPathPair) obj;
if (!getOuterType().equals(other.getOuterType()))
return false;
if (path == null) {
if (other.path != null)
return false;
} else if (!path.equals(other.path))
return false;
if (type == null) {
if (other.type != null)
return false;
} else if (!type.equals(other.type))
return false;
return true;
}
private MockModelProvider getOuterType() {
return MockModelProvider.this;
}
}
} |
<<<<<<<
import org.ops4j.peaberry.Peaberry;
=======
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
>>>>>>>
import org.ops4j.peaberry.Peaberry;
import org.osgi.framework.Bundle;
<<<<<<<
public SliceModule(final ContextScope contextScope) {
super(contextScope);
=======
private final String injectorName;
private final Bundle bundle;
public SliceModule(String injectorName, ContextScope contextScope, Bundle bundle) {
super(contextScope);
this.bundle = bundle;
this.injectorName = injectorName;
>>>>>>>
private final Bundle bundle;
public SliceModule(ContextScope contextScope, Bundle bundle) {
super(contextScope);
this.bundle = bundle;
<<<<<<<
@Provides
@InjectorName
public String getInjectorName(InjectorsRepository repository, Injector injector) {
return repository.getInjectorName(injector);
}
=======
@Provides
@Singleton
public Bundle getBundle() {
return bundle;
}
>>>>>>>
@Provides
@InjectorName
public String getInjectorName(InjectorsRepository repository, Injector injector) {
return repository.getInjectorName(injector);
}
@Singleton
public Bundle getBundle() {
return bundle;
} |
<<<<<<<
extends RepositoryItemAbstract {
public static class DataType {
private final String name;
private final String key;
private final Class cls;
private final Object defValue;
private final Object[] options;
private final String[] optionsNames;
public DataType(String key, String name, Class cls, Object defValue, Object[] options, String[] optionsNames) {
this.key = key;
this.name = name;
this.cls = cls;
this.defValue = defValue;
this.options = options;
this.optionsNames = optionsNames;
if (defValue != null && !cls.isAssignableFrom(defValue.getClass())) {
throw new IllegalArgumentException("default value paratemeter must of class " + cls.getCanonicalName());
}
if (options != null) {
for (Object option : options) {
if (option != null && !cls.isAssignableFrom(option.getClass())) {
throw new IllegalArgumentException("option values must of class " + cls.getCanonicalName());
}
}
if (optionsNames != null && options.length != optionsNames.length) {
throw new IllegalArgumentException("if passed options name must be specified for each option");
}
}
}
public DataType(String key, String name, Class cls, Object defValue, Object[] options) {
this(key, name, cls, defValue, options, null);
}
public DataType(String key, String name, Class cls, Object defValue) {
this(key, name, cls, defValue, null, null);
}
public String getName() {
return name;
}
public String getKey() {
return key;
}
public Class getCls() {
return cls;
}
public <T> T getDefValue() {
return (T) defValue;
}
public <T> T[] getOptions() {
return (T[]) options;
}
public String[] getOptionsNames() {
return optionsNames;
}
}
=======
extends RepositoryItemAbstract
implements Comparable<VHostItem> {
>>>>>>>
extends RepositoryItemAbstract
implements Comparable<VHostItem> {
public static class DataType {
private final String name;
private final String key;
private final Class cls;
private final Object defValue;
private final Object[] options;
private final String[] optionsNames;
public DataType(String key, String name, Class cls, Object defValue, Object[] options, String[] optionsNames) {
this.key = key;
this.name = name;
this.cls = cls;
this.defValue = defValue;
this.options = options;
this.optionsNames = optionsNames;
if (defValue != null && !cls.isAssignableFrom(defValue.getClass())) {
throw new IllegalArgumentException("default value paratemeter must of class " + cls.getCanonicalName());
}
if (options != null) {
for (Object option : options) {
if (option != null && !cls.isAssignableFrom(option.getClass())) {
throw new IllegalArgumentException("option values must of class " + cls.getCanonicalName());
}
}
if (optionsNames != null && options.length != optionsNames.length) {
throw new IllegalArgumentException("if passed options name must be specified for each option");
}
}
}
public DataType(String key, String name, Class cls, Object defValue, Object[] options) {
this(key, name, cls, defValue, options, null);
}
public DataType(String key, String name, Class cls, Object defValue) {
this(key, name, cls, defValue, null, null);
}
public String getName() {
return name;
}
public String getKey() {
return key;
}
public Class getCls() {
return cls;
}
public <T> T getDefValue() {
return (T) defValue;
}
public <T> T[] getOptions() {
return (T[]) options;
}
public String[] getOptionsNames() {
return optionsNames;
}
} |
<<<<<<<
public ServerComponent getMsgRcvInstance(String name) throws
ClassNotFoundException, InstantiationException, IllegalAccessException {
String cls_name = (String) props.get(MSG_RECEIVERS_PROP_KEY + name + ".class");
ServerComponent cls = null;
cls = ModulesManagerImpl.getInstance().getServerComponent(cls_name);
if (cls == null && (!XMPPServer.isOSGi() || COMPONENT_CLASSES.containsKey(cls_name)
|| COMP_CLUS_MAP.containsKey(cls_name)) || EXT_COMP_CLASS_NAME.equals(cls_name)) {
cls = (ServerComponent) this.getClass().getClassLoader().loadClass(cls_name).newInstance();
}
return cls;
}
public boolean componentClassEquals(String cls_name, Class<? extends ServerComponent> currCls) {
Class<? extends ServerComponent> cls = null;
try {
cls = ModulesManagerImpl.getInstance().getServerComponentClass(cls_name);
if (cls == null && (!XMPPServer.isOSGi() || COMPONENT_CLASSES.containsKey(cls_name)
|| COMP_CLUS_MAP.containsKey(cls_name)) || EXT_COMP_CLASS_NAME.equals(cls_name)) {
cls = (Class<? extends ServerComponent>) this.getClass().getClassLoader().loadClass(cls_name);
}
}
catch (Exception ex) {}
return cls != null && currCls.equals(cls);
}
/**
* Method description
*
*
* @return
*/
public String[] getMsgRcvActiveNames() {
String[] names = (String[]) props.get(MSG_RECEIVERS_NAMES_PROP_KEY);
List<String> availableNames = new ArrayList<String>();
for (String name : names) {
if (hasClassForServerComponent(name)
&& (props.get(MSG_RECEIVERS_PROP_KEY + name + ".active") != null
&& (Boolean) props.get(MSG_RECEIVERS_PROP_KEY + name + ".active"))) {
availableNames.add(name);
}
}
names = availableNames.toArray(new String[availableNames.size()]);
if (log.isLoggable(Level.FINE)) {
log.log(Level.FINE, "active message receivers = {0}", Arrays.toString(names));
}
return names;
}
/**
* Method description
*
*
* @return
*/
public String[] getMsgRcvInactiveNames() {
String[] names = (String[]) props.get(MSG_RECEIVERS_NAMES_PROP_KEY);
ArrayList<String> al = new ArrayList<String>();
for (String name : names) {
if (props.get(MSG_RECEIVERS_PROP_KEY + name + ".active") == null
|| !(Boolean) props.get(MSG_RECEIVERS_PROP_KEY + name + ".active")) {
al.add(name);
}
if (hasClassForServerComponent(name)) {
al.add(name);
}
} // end of for (String name: names)
names = al.toArray(new String[al.size()]);
if (log.isLoggable(Level.FINE)) {
log.log(Level.FINE, "inactive message receivers = {0}", Arrays.toString(names));
}
return names;
}
=======
public ServerComponent getMsgRcvInstance(String name)
throws ClassNotFoundException, InstantiationException, IllegalAccessException {
String cls_name = (String) props.get(MSG_RECEIVERS_PROP_KEY + name + ".class");
ServerComponent cls = null;
cls = ModulesManagerImpl.getInstance().getServerComponent(cls_name);
if (cls == null) {
cls = (ServerComponent) Class.forName(cls_name).newInstance();
}
return cls;
}
//~--- methods --------------------------------------------------------------
/**
* Method description
*
*
* @param cls_name
* @param currCls
*
* @return
*/
@SuppressWarnings("unchecked")
public boolean componentClassEquals(String cls_name,
Class<? extends ServerComponent> currCls) {
Class<? extends ServerComponent> cls = null;
try {
cls = ModulesManagerImpl.getInstance().getServerComponentClass(cls_name);
if (cls == null) {
cls = (Class<? extends ServerComponent>) Class.forName(cls_name);
}
} catch (Exception ex) {}
return (cls != null) && currCls.equals(cls);
}
//~--- get methods ----------------------------------------------------------
/**
* Method description
*
*
* @return
*/
public String[] getMsgRcvActiveNames() {
String[] names = (String[]) props.get(MSG_RECEIVERS_NAMES_PROP_KEY);
List<String> availableNames = new ArrayList<String>();
for (String name : names) {
if (hasClassForServerComponent(name) &&
((props.get(MSG_RECEIVERS_PROP_KEY + name + ".active") != null) &&
(Boolean) props.get(MSG_RECEIVERS_PROP_KEY + name + ".active"))) {
availableNames.add(name);
}
}
names = availableNames.toArray(new String[availableNames.size()]);
if (log.isLoggable(Level.FINE)) {
log.log(Level.FINE, "active message receivers = {0}", Arrays.toString(names));
}
return names;
}
/**
* Method description
*
*
* @return
*/
public String[] getMsgRcvInactiveNames() {
String[] names = (String[]) props.get(MSG_RECEIVERS_NAMES_PROP_KEY);
ArrayList<String> al = new ArrayList<String>();
for (String name : names) {
if ((props.get(MSG_RECEIVERS_PROP_KEY + name + ".active") == null) ||
!(Boolean) props.get(MSG_RECEIVERS_PROP_KEY + name + ".active")) {
al.add(name);
}
if (hasClassForServerComponent(name)) {
al.add(name);
}
} // end of for (String name: names)
names = al.toArray(new String[al.size()]);
if (log.isLoggable(Level.FINE)) {
log.log(Level.FINE, "inactive message receivers = {0}", Arrays.toString(names));
}
return names;
}
>>>>>>>
public ServerComponent getMsgRcvInstance(String name)
throws ClassNotFoundException, InstantiationException, IllegalAccessException {
String cls_name = (String) props.get(MSG_RECEIVERS_PROP_KEY + name + ".class");
ServerComponent cls = null;
cls = ModulesManagerImpl.getInstance().getServerComponent(cls_name);
if (cls == null && (!XMPPServer.isOSGi() || COMPONENT_CLASSES.containsKey(cls_name)
|| COMP_CLUS_MAP.containsKey(cls_name)) || EXT_COMP_CLASS_NAME.equals(cls_name)) {
cls = (ServerComponent) this.getClass().getClassLoader().loadClass(cls_name).newInstance();
}
return cls;
}
//~--- methods --------------------------------------------------------------
/**
* Method description
*
*
* @param cls_name
* @param currCls
*
* @return
*/
@SuppressWarnings("unchecked")
public boolean componentClassEquals(String cls_name,
Class<? extends ServerComponent> currCls) {
Class<? extends ServerComponent> cls = null;
try {
cls = ModulesManagerImpl.getInstance().getServerComponentClass(cls_name);
if (cls == null && (!XMPPServer.isOSGi() || COMPONENT_CLASSES.containsKey(cls_name)
|| COMP_CLUS_MAP.containsKey(cls_name)) || EXT_COMP_CLASS_NAME.equals(cls_name)) {
cls = (Class<? extends ServerComponent>) this.getClass().getClassLoader().loadClass(cls_name);
}
} catch (Exception ex) {}
return (cls != null) && currCls.equals(cls);
}
//~--- get methods ----------------------------------------------------------
/**
* Method description
*
*
* @return
*/
public String[] getMsgRcvActiveNames() {
String[] names = (String[]) props.get(MSG_RECEIVERS_NAMES_PROP_KEY);
List<String> availableNames = new ArrayList<String>();
for (String name : names) {
if (hasClassForServerComponent(name) &&
((props.get(MSG_RECEIVERS_PROP_KEY + name + ".active") != null) &&
(Boolean) props.get(MSG_RECEIVERS_PROP_KEY + name + ".active"))) {
availableNames.add(name);
}
}
names = availableNames.toArray(new String[availableNames.size()]);
if (log.isLoggable(Level.FINE)) {
log.log(Level.FINE, "active message receivers = {0}", Arrays.toString(names));
}
return names;
}
/**
* Method description
*
*
* @return
*/
public String[] getMsgRcvInactiveNames() {
String[] names = (String[]) props.get(MSG_RECEIVERS_NAMES_PROP_KEY);
ArrayList<String> al = new ArrayList<String>();
for (String name : names) {
if ((props.get(MSG_RECEIVERS_PROP_KEY + name + ".active") == null) ||
!(Boolean) props.get(MSG_RECEIVERS_PROP_KEY + name + ".active")) {
al.add(name);
}
if (hasClassForServerComponent(name)) {
al.add(name);
}
} // end of for (String name: names)
names = al.toArray(new String[al.size()]);
if (log.isLoggable(Level.FINE)) {
log.log(Level.FINE, "inactive message receivers = {0}", Arrays.toString(names));
}
return names;
} |
<<<<<<<
import tigase.kernel.beans.Bean;
import tigase.kernel.beans.BeanSelector;
import tigase.kernel.core.Kernel;
=======
import tigase.conf.Configurable;
import tigase.conf.ConfigurationException;
import tigase.disteventbus.EventBusFactory;
import tigase.disteventbus.EventHandler;
>>>>>>>
import tigase.eventbus.EventListener;
import tigase.kernel.beans.Bean;
import tigase.kernel.beans.BeanSelector;
import tigase.kernel.core.Kernel;
<<<<<<<
import tigase.server.bosh.BoshConnectionManager;
=======
import tigase.server.XMPPServer;
import tigase.server.bosh.BoshConnectionManager;
>>>>>>>
import tigase.server.bosh.BoshConnectionManager;
<<<<<<<
=======
import tigase.util.TimerTask;
import tigase.xml.Element;
>>>>>>>
import tigase.util.TimerTask;
<<<<<<<
//~--- JDK imports ------------------------------------------------------------
=======
import static tigase.cluster.ClusterConnectionManager.CLUSTER_INITIATED_EVENT;
>>>>>>> |
<<<<<<<
=======
import java.lang.management.GarbageCollectorMXBean;
import java.lang.management.ManagementFactory;
import java.lang.management.MemoryPoolMXBean;
import java.lang.management.MemoryUsage;
import java.text.DecimalFormat;
import java.text.NumberFormat;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentSkipListSet;
import java.util.logging.Level;
import java.util.logging.Logger;
>>>>>>>
<<<<<<<
@Inject
private Set<ServerComponent> componentsAll;
public void setComponentsAll(Set<ServerComponent> components) {
if (components == null)
return;
HashSet<ServerComponent> removeComponents = new HashSet<>(this.components.values());
removeComponents.removeAll(components);
for (ServerComponent comp : removeComponents) {
if (comp instanceof ComponentRegistrator) {
removeRegistrator((ComponentRegistrator) comp);
} else if (comp instanceof MessageReceiver) {
removeRouter((MessageReceiver) comp);
} else {
removeComponent(comp);
}
if (comp instanceof ConnectionManager)
connectionManagerNames.remove(comp.getName());
comp.release();
}
HashSet<ServerComponent> newComponents = new HashSet<>(components);
newComponents.removeAll(this.components.values());
for (ServerComponent comp : newComponents) {
try {
if (comp instanceof MessageReceiver) {
MessageReceiver mr = (MessageReceiver) comp;
mr.setParent(this);
mr.start();
}
if (comp instanceof ConnectionManager)
connectionManagerNames.add(comp.getName());
if (comp instanceof ComponentRegistrator) {
addRegistrator((ComponentRegistrator) comp);
} else if (comp instanceof MessageReceiver) {
addRouter((MessageReceiver) comp);
} else {
addComponent(comp);
}
} catch (ConfigurationException ex) {
// TODO - most likely this will no longer happen as configuration will not be done in this method
log.log(Level.WARNING, "component " + comp.getName() + " was not configured properly", ex);
}
}
}
=======
private static final String JVM_STATS_GC_STATISTICS = "JVM/GC-statistics";
private static final String JVM_STATS_HEAP_TOTAL = "JVM/HEAP Total ";
private static final String JVM_STATS_HEAP_POOLS = "JVM/MemoryPools/HeapMemory/";
>>>>>>>
@Inject
private Set<ServerComponent> componentsAll;
public void setComponentsAll(Set<ServerComponent> components) {
if (components == null)
return;
HashSet<ServerComponent> removeComponents = new HashSet<>(this.components.values());
removeComponents.removeAll(components);
for (ServerComponent comp : removeComponents) {
if (comp instanceof ComponentRegistrator) {
removeRegistrator((ComponentRegistrator) comp);
} else if (comp instanceof MessageReceiver) {
removeRouter((MessageReceiver) comp);
} else {
removeComponent(comp);
}
if (comp instanceof ConnectionManager)
connectionManagerNames.remove(comp.getName());
comp.release();
}
HashSet<ServerComponent> newComponents = new HashSet<>(components);
newComponents.removeAll(this.components.values());
for (ServerComponent comp : newComponents) {
try {
if (comp instanceof MessageReceiver) {
MessageReceiver mr = (MessageReceiver) comp;
mr.setParent(this);
mr.start();
}
if (comp instanceof ConnectionManager)
connectionManagerNames.add(comp.getName());
if (comp instanceof ComponentRegistrator) {
addRegistrator((ComponentRegistrator) comp);
} else if (comp instanceof MessageReceiver) {
addRouter((MessageReceiver) comp);
} else {
addComponent(comp);
}
} catch (ConfigurationException ex) {
// TODO - most likely this will no longer happen as configuration will not be done in this method
log.log(Level.WARNING, "component " + comp.getName() + " was not configured properly", ex);
}
}
} |
<<<<<<<
public abstract void removeShutdownHook(ShutdownHook hook);
=======
public String getOldGenName() {
return (oldMemPool != null ? oldMemPool.getName() : "n/a");
}
>>>>>>>
public abstract void removeShutdownHook(ShutdownHook hook);
public String getOldGenName() {
return (oldMemPool != null ? oldMemPool.getName() : "n/a");
} |
<<<<<<<
//~--- non-JDK imports --------------------------------------------------------
=======
import tigase.annotations.TigaseDeprecatedComponent;
import tigase.auth.mechanisms.AbstractSaslSCRAM;
>>>>>>>
//~--- non-JDK imports --------------------------------------------------------
import tigase.auth.mechanisms.AbstractSaslSCRAM; |
<<<<<<<
//~--- non-JDK imports --------------------------------------------------------
=======
>>>>>>>
<<<<<<<
import tigase.kernel.beans.Bean;
import tigase.kernel.beans.BeanSelector;
import tigase.kernel.core.Kernel;
=======
import tigase.conf.Configurable;
import tigase.conf.ConfigurationException;
import tigase.disteventbus.EventBusFactory;
import tigase.disteventbus.EventHandler;
>>>>>>>
import tigase.eventbus.EventListener;
import tigase.kernel.beans.Bean;
import tigase.kernel.beans.BeanSelector;
import tigase.kernel.core.Kernel;
<<<<<<<
=======
import tigase.util.TimerTask;
import tigase.xml.Element;
>>>>>>>
import tigase.util.TimerTask;
<<<<<<<
//~--- JDK imports ------------------------------------------------------------
=======
import static tigase.cluster.ClusterConnectionManager.CLUSTER_INITIATED_EVENT;
>>>>>>> |
<<<<<<<
import java.io.IOException;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Queue;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.zip.Deflater;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
=======
import java.io.IOException;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Queue;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.zip.Deflater;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
import tigase.conf.ConfigurationException;
>>>>>>>
import java.io.IOException;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Queue;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.zip.Deflater;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
import tigase.conf.ConfigurationException;
<<<<<<<
import tigase.vhosts.VHostItem;
=======
>>>>>>>
import tigase.vhosts.VHostItem; |
<<<<<<<
import tigase.disteventbus.impl.LocalEventBus;
import tigase.disteventbus.impl.LocalEventBus.LocalEventBusListener;
import tigase.kernel.beans.Bean;
import tigase.kernel.beans.Initializable;
import tigase.kernel.beans.Inject;
import tigase.kernel.beans.UnregisterAware;
=======
import tigase.disteventbus.impl.LocalEventBus;
>>>>>>>
import tigase.disteventbus.impl.LocalEventBus;
import tigase.kernel.beans.Bean;
import tigase.kernel.beans.Initializable;
import tigase.kernel.beans.Inject;
import tigase.kernel.beans.UnregisterAware;
<<<<<<<
private static final Criteria CRIT = new ElemPathCriteria(new String[] { "iq", "pubsub", "unsubscribe" },
new String[] { null, "http://jabber.org/protocol/pubsub", null });
=======
>>>>>>>
<<<<<<<
@Inject
private EventBusComponent component;
private final LocalEventBusListener eventBusListener = new LocalEventBusListener() {
@Override
public void onAddHandler(String name, String xmlns, EventHandler handler) {
}
@Override
public void onFire(String name, String xmlns, Element event) {
}
=======
private final String[] NAME_PATH = new String[] { LocalEventBus.HANDLER_REMOVED_EVENT_NAME, "name" };
private final String[] XMLNS_PATH = new String[] { LocalEventBus.HANDLER_REMOVED_EVENT_NAME, "xmlns" };
>>>>>>>
private final String[] NAME_PATH = new String[] { LocalEventBus.HANDLER_REMOVED_EVENT_NAME, "name" };
private final String[] XMLNS_PATH = new String[] { LocalEventBus.HANDLER_REMOVED_EVENT_NAME, "xmlns" };
<<<<<<<
Element iq = new Element("iq", new String[] { "from", "to", "type", "id" },
new String[] { component.getComponentId().toString(), to, "set", nextStanzaID() });
=======
Element iq = new Element("iq", new String[] { "from", "to", "type", "id" },
new String[] { context.getComponentID().toString(), to, "set", nextStanzaID() });
>>>>>>>
Element iq = new Element("iq", new String[] { "from", "to", "type", "id" },
new String[] { component.getComponentId().toString(), to, "set", nextStanzaID() });
<<<<<<<
=======
@Override
public void unregisterModule() {
context.getEventBusInstance().removeHandler(LocalEventBus.HANDLER_REMOVED_EVENT_NAME,
LocalEventBus.EVENTBUS_INTERNAL_EVENTS_XMLNS, eventBusHandlerRemovedHandler);
super.unregisterModule();
}
>>>>>>> |
<<<<<<<
=======
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;
>>>>>>>
import java.util.logging.Level;
<<<<<<<
public class EventBusComponent extends AbstractKernelBasedComponent implements ClusteredComponentIfc {
=======
public class EventBusComponent extends AbstractComponent<EventBusContext>implements ClusteredComponentIfc {
>>>>>>>
public class EventBusComponent extends AbstractKernelBasedComponent implements ClusteredComponentIfc {
<<<<<<<
=======
private static final String THREADS_KEY = "threads";
private static long counter = 0;
private final AffiliationStore affiliationStore = new AffiliationStore();
private final Map<String, ListenerScript> listenersScripts = new ConcurrentHashMap<String, ListenerScript>();
/**
* For cluster nodes.
*/
private final SubscriptionStore subscriptionStore = new SubscriptionStore();
private ScriptEngineManager scriptEngineManager = new ScriptEngineManager();
private ListenerScriptRegistrar scriptsRegistrar;
>>>>>>>
<<<<<<<
Module module = kernel.getInstance(SubscribeModule.ID);
=======
if (log.isLoggable(Level.FINE))
log.fine("Cluster node " + jid + " added to Affiliation Store");
context.getAffiliationStore().putAffiliation(jid, Affiliation.owner);
Module module = modulesManager.getModule(SubscribeModule.ID);
>>>>>>>
if (log.isLoggable(Level.FINE))
log.fine("Cluster node " + jid + " added to Affiliation Store");
kernel.getInstance(AffiliationStore.class).putAffiliation(jid, Affiliation.owner);
Module module = kernel.getInstance(SubscribeModule.ID); |
<<<<<<<
import org.ops4j.pax.exam.ProbeInvokerFactory;
import org.ops4j.pax.exam.util.ServiceLookup;
=======
import org.ops4j.pax.exam.raw.extender.ProbeInvokerFactory;
>>>>>>>
import org.ops4j.pax.exam.ProbeInvokerFactory; |
<<<<<<<
import javax.annotation.Nonnull;
=======
import java.io.Serializable;
>>>>>>>
import javax.annotation.Nonnull;
import java.io.Serializable; |
<<<<<<<
/*
* Copyright 2017-2020 original authors
*
* 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 License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
=======
>>>>>>> |
<<<<<<<
=======
import io.micronaut.security.config.SecurityConfiguration;
import io.micronaut.security.handlers.RejectionHandler;
>>>>>>>
import io.micronaut.security.config.SecurityConfiguration;
<<<<<<<
=======
* @param rejectionHandler Bean which handles routes which need to be rejected
* @param securityFilterOrderProvider filter order provider
* @deprecated Use {@link #SecurityFilter(Collection, Collection, SecurityConfiguration, SecurityFilterOrderProvider)} instead
*/
@Deprecated
public SecurityFilter(Collection<SecurityRule> securityRules,
Collection<AuthenticationFetcher> authenticationFetchers,
RejectionHandler rejectionHandler,
@Nullable SecurityFilterOrderProvider securityFilterOrderProvider) {
this.securityRules = securityRules;
this.authenticationFetchers = authenticationFetchers;
this.order = securityFilterOrderProvider != null ? securityFilterOrderProvider.getOrder() : 0;
this.securityConfiguration = null;
}
/**
* @param securityRules The list of rules that will allow or reject the request
* @param authenticationFetchers List of {@link AuthenticationFetcher} beans in the context.
* @param securityConfiguration The security configuration
* @param securityFilterOrderProvider filter order provider
>>>>>>>
<<<<<<<
Collection<AuthenticationFetcher> authenticationFetchers) {
=======
Collection<AuthenticationFetcher> authenticationFetchers,
SecurityConfiguration securityConfiguration,
@Nullable SecurityFilterOrderProvider securityFilterOrderProvider) {
>>>>>>>
Collection<AuthenticationFetcher> authenticationFetchers,
SecurityConfiguration securityConfiguration) {
<<<<<<<
=======
this.securityConfiguration = securityConfiguration;
this.order = securityFilterOrderProvider != null ? securityFilterOrderProvider.getOrder() : 0;
>>>>>>>
this.securityConfiguration = securityConfiguration; |
<<<<<<<
=======
* @param tokenWriter bean responsible of writing the token to the target request
* @param tokenPropagationConfiguration JWT Propagation configuration
* @param outgoingHttpRequestProcessor Utility to decide whether to process the request
* @deprecated Use {@link #TokenPropagationHttpClientFilter(TokenPropagationConfiguration, OutgoingHttpRequestProcessor, TokenPropagator)} instead
*/
@Deprecated
public TokenPropagationHttpClientFilter(TokenWriter tokenWriter,
TokenPropagationConfiguration tokenPropagationConfiguration,
OutgoingHttpRequestProcessor outgoingHttpRequestProcessor) {
this.tokenWriter = tokenWriter;
this.tokenPropagationConfiguration = tokenPropagationConfiguration;
this.outgoingHttpRequestProcessor = outgoingHttpRequestProcessor;
this.tokenPropagator = null;
}
/**
>>>>>>> |
<<<<<<<
import io.reactivex.BackpressureStrategy;
=======
import io.micronaut.security.config.AuthenticationStrategy;
import io.micronaut.security.config.SecurityConfiguration;
>>>>>>>
import io.reactivex.BackpressureStrategy;
import io.micronaut.security.config.AuthenticationStrategy;
import io.micronaut.security.config.SecurityConfiguration;
<<<<<<<
=======
import java.util.Iterator;
import java.util.List;
>>>>>>>
import java.util.List; |
<<<<<<<
Range seekRange = getDocumentRange("123.345.456");
String query = "EVENT_FIELD2 == 'b'";
event_test(seekRange, query, false, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
=======
Range seekRange = getDocumentRange("row", "dataType1", "123.345.456");
event_test(seekRange, "EVENT_FIELD2 == 'b'", false, null, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
>>>>>>>
Range seekRange = getDocumentRange("123.345.456");
String query = "EVENT_FIELD2 == 'b'";
event_test(seekRange, query, false, null, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
<<<<<<<
Range seekRange = getShardRange();
String query = "EVENT_FIELD2 == 'b'";
event_test(seekRange, query, false, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
=======
Range seekRange = getDocumentRange("row", "dataType1", null);
event_test(seekRange, "EVENT_FIELD2 == 'b'", false, null, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
>>>>>>>
Range seekRange = getShardRange();
String query = "EVENT_FIELD2 == 'b'";
event_test(seekRange, query, false, null, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
<<<<<<<
Range seekRange = getDocumentRange("123.345.456");
String query = "EVENT_FIELD2 == 'b'";
event_test(seekRange, query, false, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
=======
Range seekRange = getDocumentRange("row", "dataType1", "123.345.456");
event_test(seekRange, "EVENT_FIELD2 == 'b'", false, null, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
>>>>>>>
Range seekRange = getDocumentRange("123.345.456");
String query = "EVENT_FIELD2 == 'b'";
event_test(seekRange, query, false, null, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
<<<<<<<
Range seekRange = getShardRange();
String query = "EVENT_FIELD2 == 'b'";
event_test(seekRange, query, false, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
=======
Range seekRange = getDocumentRange("row", "dataType1", null);
event_test(seekRange, "EVENT_FIELD2 == 'b'", false, null, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
>>>>>>>
Range seekRange = getShardRange();
String query = "EVENT_FIELD2 == 'b'";
event_test(seekRange, query, false, null, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
<<<<<<<
Range seekRange = getDocumentRange("123.345.456");
String query = "EVENT_FIELD2 == 'a'";
event_test(seekRange, query, true, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
=======
Range seekRange = getDocumentRange("row", "dataType1", "123.345.456");
event_test(seekRange, "EVENT_FIELD2 == 'a'", true, null, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
>>>>>>>
Range seekRange = getDocumentRange("123.345.456");
String query = "EVENT_FIELD2 == 'a'";
event_test(seekRange, query, true, null, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
<<<<<<<
Range seekRange = getShardRange();
String query = "EVENT_FIELD2 == 'a'";
event_test(seekRange, query, true, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
=======
Range seekRange = getDocumentRange("row", "dataType1", null);
event_test(seekRange, "EVENT_FIELD2 == 'a'", true, null, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
>>>>>>>
Range seekRange = getShardRange();
String query = "EVENT_FIELD2 == 'a'";
event_test(seekRange, query, true, null, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
<<<<<<<
Range seekRange = getDocumentRange("123.345.456");
String query = "EVENT_FIELD2 == 'b'";
event_test(seekRange, query, false, addEvent(11, "123.345.457"), Collections.EMPTY_LIST);
=======
Range seekRange = getDocumentRange("row", "dataType1", "123.345.456");
event_test(seekRange, "EVENT_FIELD2 == 'b'", false, null, addEvent(11, "123.345.457"), Collections.EMPTY_LIST);
>>>>>>>
Range seekRange = getDocumentRange("123.345.456");
String query = "EVENT_FIELD2 == 'b'";
event_test(seekRange, query, false, null, addEvent(11, "123.345.457"), Collections.EMPTY_LIST);
<<<<<<<
Range seekRange = getShardRange();
String query = "EVENT_FIELD2 == 'b'";
event_test(seekRange, query, false, addEvent(11, "123.345.457"), Arrays.asList(getBaseExpectedEvent("123.345.457")));
=======
Range seekRange = getDocumentRange("row", "dataType1", null);
event_test(seekRange, "EVENT_FIELD2 == 'b'", false, null, addEvent(11, "123.345.457"), Arrays.asList(getBaseExpectedEvent("123.345.457")));
>>>>>>>
Range seekRange = getShardRange();
String query = "EVENT_FIELD2 == 'b'";
event_test(seekRange, query, false, null, addEvent(11, "123.345.457"), Arrays.asList(getBaseExpectedEvent("123.345.457")));
<<<<<<<
Range seekRange = getDocumentRange("123.345.456");
String query = "EVENT_FIELD2 =~ 'b.*'";
event_test(seekRange, query, false, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
=======
Range seekRange = getDocumentRange("row", "dataType1", "123.345.456");
event_test(seekRange, "EVENT_FIELD2 =~ 'b.*'", false, null, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
>>>>>>>
Range seekRange = getDocumentRange("123.345.456");
String query = "EVENT_FIELD2 =~ 'b.*'";
event_test(seekRange, query, false, null, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
<<<<<<<
Range seekRange = getShardRange();
String query = "EVENT_FIELD2 =~ 'b.*'";
event_test(seekRange, query, false, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
=======
Range seekRange = getDocumentRange("row", "dataType1", null);
event_test(seekRange, "EVENT_FIELD2 =~ 'b.*'", false, null, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
>>>>>>>
Range seekRange = getShardRange();
String query = "EVENT_FIELD2 =~ 'b.*'";
event_test(seekRange, query, false, null, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
<<<<<<<
Range seekRange = getDocumentRange("123.345.456");
String query = "EVENT_FIELD2 =~ 'a.*'";
event_test(seekRange, query, true, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
=======
Range seekRange = getDocumentRange("row", "dataType1", "123.345.456");
event_test(seekRange, "EVENT_FIELD2 =~ 'a.*'", true, null, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
>>>>>>>
Range seekRange = getDocumentRange("123.345.456");
String query = "EVENT_FIELD2 =~ 'a.*'";
event_test(seekRange, query, true, null, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
<<<<<<<
Range seekRange = getShardRange();
String query = "EVENT_FIELD2 =~ 'a.*'";
event_test(seekRange, query, true, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
=======
Range seekRange = getDocumentRange("row", "dataType1", null);
event_test(seekRange, "EVENT_FIELD2 =~ 'a.*'", true, null, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
>>>>>>>
Range seekRange = getShardRange();
String query = "EVENT_FIELD2 =~ 'a.*'";
event_test(seekRange, query, true, null, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
<<<<<<<
Range seekRange = getDocumentRange("123.345.456");
String query = "EVENT_FIELD2 =~ 'b.*'";
event_test(seekRange, query, false, addEvent(11, "123.345.457"), Collections.EMPTY_LIST);
=======
Range seekRange = getDocumentRange("row", "dataType1", "123.345.456");
event_test(seekRange, "EVENT_FIELD2 =~ 'b.*'", false, null, addEvent(11, "123.345.457"), Collections.EMPTY_LIST);
>>>>>>>
Range seekRange = getDocumentRange("123.345.456");
String query = "EVENT_FIELD2 =~ 'b.*'";
event_test(seekRange, query, false, null, addEvent(11, "123.345.457"), Collections.EMPTY_LIST);
<<<<<<<
Range seekRange = getShardRange();
String query = "EVENT_FIELD2 =~ 'b.*'";
event_test(seekRange, query, false, addEvent(11, "123.345.457"), Arrays.asList(getBaseExpectedEvent("123.345.457")));
=======
Range seekRange = getDocumentRange("row", "dataType1", null);
event_test(seekRange, "EVENT_FIELD2 =~ 'b.*'", false, null, addEvent(11, "123.345.457"), Arrays.asList(getBaseExpectedEvent("123.345.457")));
>>>>>>>
Range seekRange = getShardRange();
String query = "EVENT_FIELD2 =~ 'b.*'";
event_test(seekRange, query, false, null, addEvent(11, "123.345.457"), Arrays.asList(getBaseExpectedEvent("123.345.457")));
<<<<<<<
Range seekRange = getDocumentRange("123.345.456");
String query = "EVENT_FIELD2 =~ '.*b'";
event_test(seekRange, query, false, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
=======
Range seekRange = getDocumentRange("row", "dataType1", "123.345.456");
event_test(seekRange, "EVENT_FIELD2 =~ '.*b'", false, null, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
>>>>>>>
Range seekRange = getDocumentRange("123.345.456");
String query = "EVENT_FIELD2 =~ '.*b'";
event_test(seekRange, query, false, null, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
<<<<<<<
Range seekRange = getShardRange();
String query = "EVENT_FIELD2 =~ '.*b'";
event_test(seekRange, query, false, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
=======
Range seekRange = getDocumentRange("row", "dataType1", null);
event_test(seekRange, "EVENT_FIELD2 =~ '.*b'", false, null, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
>>>>>>>
Range seekRange = getShardRange();
String query = "EVENT_FIELD2 =~ '.*b'";
event_test(seekRange, query, false, null, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
<<<<<<<
Range seekRange = getDocumentRange("123.345.456");
String query = "EVENT_FIELD2 =~ '.*a'";
event_test(seekRange, query, true, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
=======
Range seekRange = getDocumentRange("row", "dataType1", "123.345.456");
event_test(seekRange, "EVENT_FIELD2 =~ '.*a'", true, null, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
>>>>>>>
Range seekRange = getDocumentRange("123.345.456");
String query = "EVENT_FIELD2 =~ '.*a'";
event_test(seekRange, query, true, null, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
<<<<<<<
Range seekRange = getShardRange();
String query = "EVENT_FIELD2 =~ '.*a'";
event_test(seekRange, query, true, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
=======
Range seekRange = getDocumentRange("row", "dataType1", null);
event_test(seekRange, "EVENT_FIELD2 =~ '.*a'", true, null, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
>>>>>>>
Range seekRange = getShardRange();
String query = "EVENT_FIELD2 =~ '.*a'";
event_test(seekRange, query, true, null, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
<<<<<<<
Range seekRange = getDocumentRange("123.345.456");
String query = "EVENT_FIELD2 =~ '.*b'";
event_test(seekRange, query, false, addEvent(11, "123.345.457"), Collections.EMPTY_LIST);
=======
Range seekRange = getDocumentRange("row", "dataType1", "123.345.456");
event_test(seekRange, "EVENT_FIELD2 =~ '.*b'", false, null, addEvent(11, "123.345.457"), Collections.EMPTY_LIST);
>>>>>>>
Range seekRange = getDocumentRange("123.345.456");
String query = "EVENT_FIELD2 =~ '.*b'";
event_test(seekRange, query, false, null, addEvent(11, "123.345.457"), Collections.EMPTY_LIST);
<<<<<<<
Range seekRange = getShardRange();
String query = "EVENT_FIELD2 =~ '.*b'";
event_test(seekRange, query, false, addEvent(11, "123.345.457"), Arrays.asList(getBaseExpectedEvent("123.345.457")));
=======
Range seekRange = getDocumentRange("row", "dataType1", null);
event_test(seekRange, "EVENT_FIELD2 =~ '.*b'", false, null, addEvent(11, "123.345.457"), Arrays.asList(getBaseExpectedEvent("123.345.457")));
>>>>>>>
Range seekRange = getShardRange();
String query = "EVENT_FIELD2 =~ '.*b'";
event_test(seekRange, query, false, null, addEvent(11, "123.345.457"), Arrays.asList(getBaseExpectedEvent("123.345.457"))); |
<<<<<<<
import org.apache.commons.jexl2.parser.ASTJexlScript;
=======
import datawave.query.language.parser.jexl.LuceneToJexlQueryParser;
>>>>>>>
import datawave.query.language.parser.jexl.LuceneToJexlQueryParser;
import org.apache.commons.jexl2.parser.ASTJexlScript;
<<<<<<<
import org.apache.commons.jexl2.parser.ParseException;
=======
import org.apache.commons.jexl2.parser.Parser;
import org.apache.commons.lang.StringUtils;
import org.junit.Assert;
>>>>>>>
import org.apache.commons.jexl2.parser.ParseException;
import org.apache.commons.jexl2.parser.Parser;
import org.apache.commons.lang.StringUtils;
import org.junit.Assert;
<<<<<<<
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
=======
import java.io.StringReader;
>>>>>>>
import java.io.StringReader; |
<<<<<<<
try (AccumuloClient client = Accumulo.newClient().to(instance, zookeepers).as(username, password).build()) {
TypeMetadataHelper typeMetadataHelper = this.typeMetadataHelperFactory.createTypeMetadataHelper(client, metadataTableName,
allMetadataAuths, false);
typeMetadataWriter.writeTypeMetadataMap(typeMetadataHelper.getTypeMetadataMap(this.allMetadataAuths), metadataTableName);
}
=======
ZooKeeperInstance instance = new ZooKeeperInstance(ClientConfiguration.loadDefault().withInstance(this.instance)
.withZkHosts(this.zookeepers));
Connector connector = instance.getConnector(this.username, new PasswordToken(this.password));
TypeMetadataHelper typeMetadataHelper = this.typeMetadataHelperFactory.createTypeMetadataHelper(connector, metadataTableName,
allMetadataAuths, false);
>>>>>>>
try (AccumuloClient client = Accumulo.newClient().to(instance, zookeepers).as(username, password).build()) {
TypeMetadataHelper typeMetadataHelper = this.typeMetadataHelperFactory.createTypeMetadataHelper(client, metadataTableName,
allMetadataAuths, false);
} |
<<<<<<<
/*
* Copyright (C) 2012-2019 52°North Initiative for Geospatial Open Source
=======
/**
* Copyright (C) 2012-2020 52°North Initiative for Geospatial Open Source
>>>>>>>
/*
* Copyright (C) 2012-2020 52°North Initiative for Geospatial Open Source |
<<<<<<<
import static com.google.errorprone.matchers.Matchers.allOf;
import static com.google.errorprone.matchers.Matchers.argument;
import static com.google.errorprone.matchers.Matchers.methodSelect;
import static com.google.errorprone.matchers.Matchers.staticMethod;
=======
import static com.google.errorprone.BugPattern.Category.GUAVA;
import static com.google.errorprone.BugPattern.MaturityLevel.ON_BY_DEFAULT;
import static com.google.errorprone.BugPattern.SeverityLevel.WARNING;
import static com.google.errorprone.matchers.Matchers.allOf;
import static com.google.errorprone.matchers.Matchers.argument;
import static com.google.errorprone.matchers.Matchers.methodSelect;
import static com.google.errorprone.matchers.Matchers.staticMethod;
import com.google.errorprone.BugPattern;
import com.google.errorprone.RefactoringVisitorState;
>>>>>>>
import static com.google.errorprone.BugPattern.Category.GUAVA;
import static com.google.errorprone.BugPattern.MaturityLevel.ON_BY_DEFAULT;
import static com.google.errorprone.BugPattern.SeverityLevel.WARNING;
import static com.google.errorprone.matchers.Matchers.allOf;
import static com.google.errorprone.matchers.Matchers.argument;
import static com.google.errorprone.matchers.Matchers.methodSelect;
import static com.google.errorprone.matchers.Matchers.staticMethod;
import com.google.errorprone.BugPattern; |
<<<<<<<
import static com.google.errorprone.matchers.Matchers.allOf;
import static com.google.errorprone.matchers.Matchers.hasElementWithValue;
import static com.google.errorprone.matchers.Matchers.isType;
import static com.google.errorprone.matchers.Matchers.stringLiteral;
=======
import com.google.errorprone.BugPattern;
import com.google.errorprone.BugPattern.Category;
import com.google.errorprone.BugPattern.MaturityLevel;
import com.google.errorprone.RefactoringVisitorState;
>>>>>>>
import static com.google.errorprone.BugPattern.Category.APPLICATION_SPECIFIC;
import static com.google.errorprone.BugPattern.MaturityLevel.EXPERIMENTAL;
import static com.google.errorprone.BugPattern.SeverityLevel.WARNING;
import static com.google.errorprone.matchers.Matchers.allOf;
import static com.google.errorprone.matchers.Matchers.hasElementWithValue;
import static com.google.errorprone.matchers.Matchers.isType;
import static com.google.errorprone.matchers.Matchers.stringLiteral;
import com.google.errorprone.BugPattern;
<<<<<<<
=======
import static com.google.errorprone.BugPattern.Category.APPLICATION_SPECIFIC;
import static com.google.errorprone.BugPattern.Category.JDK;
import static com.google.errorprone.BugPattern.MaturityLevel.EXPERIMENTAL;
import static com.google.errorprone.BugPattern.MaturityLevel.ON_BY_DEFAULT;
import static com.google.errorprone.BugPattern.SeverityLevel.WARNING;
import static com.google.errorprone.matchers.Matchers.*;
>>>>>>> |
<<<<<<<
import com.sun.source.tree.VariableTree;
import com.sun.source.util.TreePath;
=======
>>>>>>>
import com.sun.source.tree.VariableTree;
import com.sun.source.util.TreePath; |
<<<<<<<
private void parseIssueStoryDetails() {
Collections.sort(storyDetailMap, IssueStoryComparators.ISSUE_STORY_DETAIL_COMPARATOR);
pullRequestStory.details = storyDetailMap;
if (getOnResultCallback() != null) {
getOnResultCallback().onResponseOk(pullRequestStory, null);
}
}
=======
@Override
protected PullRequestStory executeServiceSync(RestAdapter restAdapter) {
PullRequestStoryService pullRequestStoryService = restAdapter.create(PullRequestStoryService.class);
IssueStoryService issueStoryService = restAdapter.create(IssueStoryService.class);
PullRequestsService pullRequestsService = restAdapter.create(PullRequestsService.class);
pullRequestStory = new PullRequestStory();
storyDetailMap = new HashMap<>();
int page = 1;
boolean hasMore = true;
pullRequestStory.pullRequest = pullRequestStoryService.detail(issueInfo.repoInfo.owner, issueInfo.repoInfo.name, issueInfo.num);
while(hasMore){
List<Label> issueLabels = issueStoryService.labels(issueInfo.repoInfo.owner, issueInfo.repoInfo.name, issueInfo.num, page);
hasMore = pullRequestStory.pullRequest.labels.addAll(issueLabels);
page++;
}
page = 1;
while(true){
List<GithubComment> issueComments = issueStoryService.comments(issueInfo.repoInfo.owner, issueInfo.repoInfo.name, issueInfo.num, page);
hasMore = issueComments != null && !issueComments.isEmpty();
if (!hasMore) break;
for (GithubComment comment : issueComments) {
long time = getMilisFromDate(comment.created_at);
List<IssueStoryDetail> details = storyDetailMap.get(time);
if (details == null) {
details = new ArrayList<>();
storyDetailMap.put(time, details);
}
details.add(new IssueStoryComment(comment));
}
page++;
}
page = 1;
while(true){
List<IssueEvent> issueEvents = issueStoryService.events(issueInfo.repoInfo.owner, issueInfo.repoInfo.name, issueInfo.num, page);
hasMore = issueEvents != null && !issueEvents.isEmpty();
if (!hasMore) break;
for (IssueEvent event : issueEvents) {
if (validEvent(event.event)) {
long time = getMilisFromDate(event.created_at);
List<IssueStoryDetail> details = storyDetailMap.get(time);
if (details == null) {
details = new ArrayList<>();
storyDetailMap.put(time, details);
}
details.add(new IssueStoryEvent(event));
}
}
page++;
}
page = 1;
while(true){
List<Commit> commits = pullRequestsService.commits(issueInfo.repoInfo.owner, issueInfo.repoInfo.name, issueInfo.num, page);
hasMore = commits != null && !commits.isEmpty();
if (!hasMore) break;
for (Commit commit : commits) {
if (commit.committer != null) {
String date = commit.commit.committer.date;
if (date != null) {
long time = getMilisFromDate(date);
List<IssueStoryDetail> commitsDetails = storyDetailMap.get(time);
if (commitsDetails == null) {
commitsDetails = new ArrayList<>();
storyDetailMap.put(time, commitsDetails);
}
commitsDetails.add(new IssueStoryCommit(commit));
}
}
}
page++;
}
return parseIssueStoryDetails();
}
>>>>>>>
@Override
protected PullRequestStory executeServiceSync(RestAdapter restAdapter) {
PullRequestStoryService pullRequestStoryService = restAdapter.create(PullRequestStoryService.class);
IssueStoryService issueStoryService = restAdapter.create(IssueStoryService.class);
PullRequestsService pullRequestsService = restAdapter.create(PullRequestsService.class);
pullRequestStory = new PullRequestStory();
storyDetailMap = new HashMap<>();
int page = 1;
boolean hasMore = true;
pullRequestStory.pullRequest = pullRequestStoryService.detail(issueInfo.repoInfo.owner, issueInfo.repoInfo.name, issueInfo.num);
while(hasMore){
List<Label> issueLabels = issueStoryService.labels(issueInfo.repoInfo.owner, issueInfo.repoInfo.name, issueInfo.num, page);
hasMore = pullRequestStory.pullRequest.labels.addAll(issueLabels);
page++;
}
page = 1;
while(true){
List<GithubComment> issueComments = issueStoryService.comments(issueInfo.repoInfo.owner, issueInfo.repoInfo.name, issueInfo.num, page);
hasMore = issueComments != null && !issueComments.isEmpty();
if (!hasMore) break;
for (GithubComment comment : issueComments) {
long time = getMilisFromDate(comment.created_at);
List<IssueStoryDetail> details = storyDetailMap.get(time);
if (details == null) {
details = new ArrayList<>();
storyDetailMap.put(time, details);
}
details.add(new IssueStoryComment(comment));
}
page++;
}
page = 1;
while(true){
List<IssueEvent> issueEvents = issueStoryService.events(issueInfo.repoInfo.owner, issueInfo.repoInfo.name, issueInfo.num, page);
hasMore = issueEvents != null && !issueEvents.isEmpty();
if (!hasMore) break;
for (IssueEvent event : issueEvents) {
if (validEvent(event.event)) {
long time = getMilisFromDate(event.created_at);
List<IssueStoryDetail> details = storyDetailMap.get(time);
if (details == null) {
details = new ArrayList<>();
storyDetailMap.put(time, details);
}
details.add(new IssueStoryEvent(event));
}
}
page++;
}
page = 1;
while(true){
List<Commit> commits = pullRequestsService.commits(issueInfo.repoInfo.owner, issueInfo.repoInfo.name, issueInfo.num, page);
hasMore = commits != null && !commits.isEmpty();
if (!hasMore) break;
for (Commit commit : commits) {
if (commit.committer != null) {
String date = commit.commit.committer.date;
if (date != null) {
long time = getMilisFromDate(date);
List<IssueStoryDetail> commitsDetails = storyDetailMap.get(time);
if (commitsDetails == null) {
commitsDetails = new ArrayList<>();
storyDetailMap.put(time, commitsDetails);
}
commitsDetails.add(new IssueStoryCommit(commit));
}
}
}
page++;
}
return parseIssueStoryDetails();
}
private void parseIssueStoryDetails() {
Collections.sort(storyDetailMap, IssueStoryComparators.ISSUE_STORY_DETAIL_COMPARATOR);
pullRequestStory.details = storyDetailMap;
if (getOnResultCallback() != null) {
getOnResultCallback().onResponseOk(pullRequestStory, null);
}
}
<<<<<<<
@Override
public String getAcceptHeader() {
return "application/vnd.github.v3.full+json";
}
=======
private boolean validEvent(String event) {
return !(event.equals("mentioned") ||
event.equals("subscribed") ||
event.equals("unsubscribed"));
}
@Override
public String getAcceptHeader() {
return "application/vnd.github.v3.full+json";
}
private PullRequestStory parseIssueStoryDetails() {
List<Long> times = new ArrayList<>(storyDetailMap.keySet());
Collections.sort(times);
List<Pair<Long, IssueStoryDetail>> details = new ArrayList<>();
for (Long time : times) {
List<IssueStoryDetail> detailsRow = storyDetailMap.get(time);
for (IssueStoryDetail issueStoryDetail : detailsRow) {
details.add(new Pair<>(time, issueStoryDetail));
}
}
pullRequestStory.details = details;
if (getOnResultCallback() != null) {
getOnResultCallback().onResponseOk(pullRequestStory, null);
}
return pullRequestStory;
}
>>>>>>>
@Override
public String getAcceptHeader() {
return "application/vnd.github.v3.full+json";
} |
<<<<<<<
unregisterActivityLifecycleCallbacks(TS.INSTANCE);
=======
if (mWakeLock != null && mWakeLock.isHeld())
mWakeLock.release();
>>>>>>>
unregisterActivityLifecycleCallbacks(TS.INSTANCE);
if (mWakeLock != null && mWakeLock.isHeld())
mWakeLock.release(); |
<<<<<<<
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", "VirutalPump", 0.1d, null, //
new DoseSettings(0.05d, 30, 8 * 60, 0.05d), //
<<<<<<<
Cellnovo1("Cellnovo", "Cellnovo", "Cellnovo", 0.05d, null, //
new DoseSettings(0.05d, 30, 24*60, 1d, null),
=======
Cellnovo1("Cellnovo", 0.05d, null, //
new DoseSettings(0.05d, 30, 24 * 60, 1d, null),
>>>>>>>
Cellnovo1("Cellnovo", "Cellnovo", "Cellnovo", 0.05d, null, //
new DoseSettings(0.05d, 30, 24 * 60, 1d, null),
<<<<<<<
AccuChekCombo("Accu-Chek Combo", "Roche", "Combo", 0.1d, null, //
new DoseSettings(0.1d, 15, 12*60, 0.1d), //
=======
AccuChekCombo("Accu-Chek Combo", 0.1d, null, //
new DoseSettings(0.1d, 15, 12 * 60, 0.1d), //
>>>>>>>
AccuChekCombo("Accu-Chek Combo", "Roche", "Combo", 0.1d, null, //
new DoseSettings(0.1d, 15, 12 * 60, 0.1d), //
<<<<<<<
AccuChekSpirit("Accu-Chek Spirit", "Roche", "Spirit", 0.1d, null, //
new DoseSettings(0.1d, 15, 12*60, 0.1d), //
=======
AccuChekSpirit("Accu-Chek Spirit", 0.1d, null, //
new DoseSettings(0.1d, 15, 12 * 60, 0.1d), //
>>>>>>>
AccuChekSpirit("Accu-Chek Spirit", "Roche", "Spirit", 0.1d, null, //
new DoseSettings(0.1d, 15, 12 * 60, 0.1d), //
<<<<<<<
AccuChekInsight("Accu-Chek Insight", "Roche", "Insight", 0.05d, DoseStepSize.InsightBolus, //
new DoseSettings(0.05d, 15, 24*60, 0.05d), //
=======
AccuChekInsight("Accu-Chek Insight", 0.05d, DoseStepSize.InsightBolus, //
new DoseSettings(0.05d, 15, 24 * 60, 0.05d), //
>>>>>>>
AccuChekInsight("Accu-Chek Insight", "Roche", "Insight", 0.05d, DoseStepSize.InsightBolus, //
new DoseSettings(0.05d, 15, 24 * 60, 0.05d), //
<<<<<<<
AccuChekInsightBluetooth("Accu-Chek Insight", "Roche", "Insight", 0.01d, null, //
new DoseSettings(0.01d, 15, 24*60, 0.05d), //
=======
AccuChekInsightBluetooth("Accu-Chek Insight", 0.01d, null, //
new DoseSettings(0.01d, 15, 24 * 60, 0.05d), //
>>>>>>>
AccuChekInsightBluetooth("Accu-Chek Insight", "Roche", "Insight", 0.01d, null, //
new DoseSettings(0.01d, 15, 24 * 60, 0.05d), //
<<<<<<<
AnimasVibe("Animas Vibe","Animas", "Vibe", 0.05d, null, // AnimasBolus?
new DoseSettings(0.05d, 30, 12*60, 0.05d), //
=======
AnimasVibe("Animas Vibe", 0.05d, null, // AnimasBolus?
new DoseSettings(0.05d, 30, 12 * 60, 0.05d), //
>>>>>>>
AnimasVibe("Animas Vibe","Animas", "Vibe", 0.05d, null, // AnimasBolus?
new DoseSettings(0.05d, 30, 12 * 60, 0.05d), //
<<<<<<<
DanaR("DanaR", "SOOIL", "DanaR", 0.05d, null, //
new DoseSettings(0.05d, 30, 8*60, 0.05d), //
=======
DanaR("DanaR", 0.05d, null, //
new DoseSettings(0.05d, 30, 8 * 60, 0.05d), //
>>>>>>>
DanaR("DanaR", "SOOIL", "DanaR", 0.05d, null, //
new DoseSettings(0.05d, 30, 8 * 60, 0.05d), //
<<<<<<<
DanaRKorean("DanaR Korean", "SOOIL", "DanaRKorean", 0.05d, null, //
new DoseSettings(0.05d, 30, 8*60, 0.05d), //
=======
DanaRKorean("DanaR Korean", 0.05d, null, //
new DoseSettings(0.05d, 30, 8 * 60, 0.05d), //
>>>>>>>
DanaRKorean("DanaR Korean", "SOOIL", "DanaRKorean", 0.05d, null, //
new DoseSettings(0.05d, 30, 8 * 60, 0.05d), //
<<<<<<<
DanaRS("DanaRS", "SOOIL", "DanaRS", 0.05d, null, //
new DoseSettings(0.05d, 30, 8*60, 0.05d), //
=======
DanaRS("DanaRS", 0.05d, null, //
new DoseSettings(0.05d, 30, 8 * 60, 0.05d), //
>>>>>>>
DanaRS("DanaRS", "SOOIL", "DanaRS", 0.05d, null, //
new DoseSettings(0.05d, 30, 8 * 60, 0.05d), //
<<<<<<<
Insulet_Omnipod("Insulet Omnipod", "Insulet", "Omnipod", 0.05d, null, //
new DoseSettings(0.05d, 30, 8*60, 0.05d), //
=======
Insulet_Omnipod("Insulet Omnipod", 0.05d, null, //
new DoseSettings(0.05d, 30, 8 * 60, 0.05d), //
>>>>>>>
Insulet_Omnipod("Insulet Omnipod", "Insulet", "Omnipod", 0.05d, null, //
new DoseSettings(0.05d, 30, 8 * 60, 0.05d), //
<<<<<<<
Medtronic_512_712("Medtronic 512/712", "Medtronic", "512/712", 0.05d, null, //
new DoseSettings(0.05d, 30, 8*60, 0.05d), //
=======
Medtronic_512_712("Medtronic 512/712", 0.05d, null, //
new DoseSettings(0.05d, 30, 8 * 60, 0.05d), //
>>>>>>>
Medtronic_512_712("Medtronic 512/712", "Medtronic", "512/712", 0.05d, null, //
new DoseSettings(0.05d, 30, 8 * 60, 0.05d), //
<<<<<<<
Medtronic_523_723_Revel("Medtronic 523/723 (Revel)", "Medtronic", "523/723 (Revel)", 0.05d, null, //
new DoseSettings(0.05d, 30, 8*60, 0.05d), //
=======
Medtronic_523_723_Revel("Medtronic 523/723 (Revel)", 0.05d, null, //
new DoseSettings(0.05d, 30, 8 * 60, 0.05d), //
>>>>>>>
Medtronic_523_723_Revel("Medtronic 523/723 (Revel)", "Medtronic", "523/723 (Revel)", 0.05d, null, //
new DoseSettings(0.05d, 30, 8 * 60, 0.05d), //
<<<<<<<
Medtronic_640G("Medtronic 640G", "Medtronic", "640G", 0.025d, null, //
new DoseSettings(0.05d, 30, 8*60, 0.05d), //
=======
Medtronic_640G("Medtronic 640G", 0.025d, null, //
new DoseSettings(0.05d, 30, 8 * 60, 0.05d), //
>>>>>>>
Medtronic_640G("Medtronic 640G", "Medtronic", "640G", 0.025d, null, //
new DoseSettings(0.05d, 30, 8 * 60, 0.05d), //
<<<<<<<
TandemTSlim("Tandem t:slim", "Tandem", "t:slim", 0.01d, null, //
new DoseSettings(0.01d,15, 8*60, 0.4d),
=======
TandemTSlim("Tandem t:slim", 0.01d, null, //
new DoseSettings(0.01d, 15, 8 * 60, 0.4d),
>>>>>>>
TandemTSlim("Tandem t:slim", "Tandem", "t:slim", 0.01d, null, //
new DoseSettings(0.01d, 15, 8 * 60, 0.4d),
<<<<<<<
PumpType(String description, String model, PumpType parent)
{
=======
PumpType(String description, PumpType parent) {
>>>>>>>
PumpType(String description, String model, PumpType parent)
{
<<<<<<<
PumpType(String description, String model, PumpType parent, PumpCapability pumpCapability)
{
=======
PumpType(String description, PumpType parent, PumpCapability pumpCapability) {
>>>>>>>
PumpType(String description, String model, PumpType parent, PumpCapability pumpCapability)
{
<<<<<<<
PumpTempBasalType pumpTempBasalType, DoseSettings tbrSettings, PumpCapability specialBasalDurations, //
double baseBasalMinValue, double baseBasalStep, DoseStepSize baseBasalSpecialSteps, PumpCapability pumpCapability)
{
this(description, manufacter, model, bolusSize, specialBolusSize, extendedBolusSettings, pumpTempBasalType, tbrSettings, specialBasalDurations, baseBasalMinValue, null, baseBasalStep, baseBasalSpecialSteps, pumpCapability);
=======
PumpTempBasalType pumpTempBasalType, DoseSettings tbrSettings, PumpCapability specialBasalDurations, //
double baseBasalMinValue, double baseBasalStep, DoseStepSize baseBasalSpecialSteps, PumpCapability pumpCapability) {
this(description, bolusSize, specialBolusSize, extendedBolusSettings, pumpTempBasalType, tbrSettings, specialBasalDurations, baseBasalMinValue, null, baseBasalStep, baseBasalSpecialSteps, pumpCapability);
>>>>>>>
PumpTempBasalType pumpTempBasalType, DoseSettings tbrSettings, PumpCapability specialBasalDurations, //
double baseBasalMinValue, double baseBasalStep, DoseStepSize baseBasalSpecialSteps, PumpCapability pumpCapability)
{
this(description, manufacter, model, bolusSize, specialBolusSize, extendedBolusSettings, pumpTempBasalType, tbrSettings, specialBasalDurations, baseBasalMinValue, null, baseBasalStep, baseBasalSpecialSteps, pumpCapability); |
<<<<<<<
MainApp.bus().register(this);
initializeData(range());
=======
initializeTempBasalData();
initializeTreatmentData();
initializeExtendedBolusData();
initializeTempTargetData();
initializeProfileSwitchData();
>>>>>>>
initializeData(range());
<<<<<<<
@Subscribe
public void onStatusEvent(final EventReloadTreatmentData ev) {
if (L.isEnabled(L.DATATREATMENTS))
log.debug("EventReloadTreatmentData");
initializeTreatmentData(range());
initializeExtendedBolusData(range());
updateTotalIOBTreatments();
MainApp.bus().post(ev.next);
}
@Subscribe
@SuppressWarnings("unused")
public void onStatusEvent(final EventReloadTempBasalData ev) {
if (L.isEnabled(L.DATATREATMENTS))
log.debug("EventReloadTempBasalData");
initializeTempBasalData(range());
updateTotalIOBTempBasals();
}
=======
>>>>>>>
<<<<<<<
// TempTargets
@Subscribe
@SuppressWarnings("unused")
public void onStatusEvent(final EventTempTargetChange ev) {
initializeTempTargetData(range());
}
=======
>>>>>>>
<<<<<<<
// Profile Switch
@Subscribe
@SuppressWarnings("unused")
public void onStatusEvent(final EventReloadProfileSwitchData ev) {
initializeProfileSwitchData(range());
}
=======
>>>>>>> |
<<<<<<<
ruffyService.addHandler(mHandler);
// TODO this'll be done better in v2 via ConnectionManager
if (idleDisconnectMonitorThread.getState() == Thread.State.NEW) {
idleDisconnectMonitorThread.start();
}
started = true;
} catch (RemoteException e) {
=======
if(newService!=null) {
this.ruffyService = newService;
idleDisconnectMonitorThread.start();
started = true;
try{newService.addHandler(mHandler);}catch (Exception e){}
}
} catch (Exception e) {
>>>>>>>
if(newService!=null) {
this.ruffyService = newService;
// TODO this'll be done better in v2 via ConnectionManager
if (idleDisconnectMonitorThread.getState() == Thread.State.NEW) {
idleDisconnectMonitorThread.start();
}
started = true;
try{newService.addHandler(mHandler);}catch (Exception e){}
}
} catch (Exception e) { |
<<<<<<<
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 info.nightscout.androidaps.plugins.IobCobCalculator.BasalData;
import info.nightscout.androidaps.plugins.Loop.APSResult;
<<<<<<<
public void addBgReadings(GraphView bgGraph, long fromTime, long toTime, double lowLine, double highLine, APSResult apsResult) {
=======
public GraphData(GraphView graph) {
units = MainApp.getConfigBuilder().getProfileUnits();
this.graph = graph;
}
public void addBgReadings(long fromTime, long toTime, double lowLine, double highLine, DetermineBasalResultAMA amaResult) {
>>>>>>>
public GraphData(GraphView graph) {
units = MainApp.getConfigBuilder().getProfileUnits();
this.graph = graph;
}
public void addBgReadings(long fromTime, long toTime, double lowLine, double highLine, APSResult apsResult) {
<<<<<<<
public void addRatio(GraphView graph, long fromTime, long toTime, boolean useForScale, double scale) {
LineGraphSeries<ScaledDataPoint> ratioSeries;
List<ScaledDataPoint> ratioArray = new ArrayList<>();
=======
public void addRatio(long fromTime, long toTime, boolean useForScale, double scale) {
LineGraphSeries<DataPoint> ratioSeries;
List<DataPoint> ratioArray = new ArrayList<>();
>>>>>>>
public void addRatio(long fromTime, long toTime, boolean useForScale, double scale) {
LineGraphSeries<ScaledDataPoint> ratioSeries;
List<ScaledDataPoint> ratioArray = new ArrayList<>();
<<<<<<<
public void addDeviationSlope(GraphView graph, long fromTime, long toTime, boolean useForScale, double scale) {
LineGraphSeries<ScaledDataPoint> dsMaxSeries;
LineGraphSeries<ScaledDataPoint> dsMinSeries;
List<ScaledDataPoint> dsMaxArray = new ArrayList<>();
List<ScaledDataPoint> dsMinArray = new ArrayList<>();
Double maxFromMaxValueFound = 0d;
Double maxFromMinValueFound = 0d;
Scale dsMaxScale = new Scale();
Scale dsMinScale = new Scale();
for (long time = fromTime; time <= toTime; time += 5 * 60 * 1000L) {
AutosensData autosensData = IobCobCalculatorPlugin.getAutosensData(time);
if (autosensData != null) {
dsMaxArray.add(new ScaledDataPoint(time, autosensData.slopeFromMaxDeviation, dsMaxScale));
dsMinArray.add(new ScaledDataPoint(time, autosensData.slopeFromMinDeviation, dsMinScale));
maxFromMaxValueFound = Math.max(maxFromMaxValueFound, Math.abs(autosensData.slopeFromMaxDeviation));
maxFromMinValueFound = Math.max(maxFromMinValueFound, Math.abs(autosensData.slopeFromMinDeviation));
}
}
// Slopes
ScaledDataPoint[] ratioMaxData = new ScaledDataPoint[dsMaxArray.size()];
ratioMaxData = dsMaxArray.toArray(ratioMaxData);
dsMaxSeries = new LineGraphSeries<>(ratioMaxData);
dsMaxSeries.setColor(Color.MAGENTA);
dsMaxSeries.setThickness(3);
ScaledDataPoint[] ratioMinData = new ScaledDataPoint[dsMinArray.size()];
ratioMinData = dsMinArray.toArray(ratioMinData);
dsMinSeries = new LineGraphSeries<>(ratioMinData);
dsMinSeries.setColor(Color.YELLOW);
dsMinSeries.setThickness(3);
if (useForScale)
maxY = Math.max(maxFromMaxValueFound, maxFromMinValueFound);
dsMaxScale.setMultiplier(maxY * scale / maxFromMaxValueFound);
dsMinScale.setMultiplier(maxY * scale / maxFromMinValueFound);
addSeriesWithoutInvalidate(graph, dsMaxSeries);
addSeriesWithoutInvalidate(graph, dsMinSeries);
}
// scale in % of vertical size (like 0.3)
public void addNowLine(GraphView graph, long now) {
=======
public void addNowLine(long now) {
>>>>>>>
public void addDeviationSlope(long fromTime, long toTime, boolean useForScale, double scale) {
LineGraphSeries<ScaledDataPoint> dsMaxSeries;
LineGraphSeries<ScaledDataPoint> dsMinSeries;
List<ScaledDataPoint> dsMaxArray = new ArrayList<>();
List<ScaledDataPoint> dsMinArray = new ArrayList<>();
Double maxFromMaxValueFound = 0d;
Double maxFromMinValueFound = 0d;
Scale dsMaxScale = new Scale();
Scale dsMinScale = new Scale();
for (long time = fromTime; time <= toTime; time += 5 * 60 * 1000L) {
AutosensData autosensData = IobCobCalculatorPlugin.getAutosensData(time);
if (autosensData != null) {
dsMaxArray.add(new ScaledDataPoint(time, autosensData.slopeFromMaxDeviation, dsMaxScale));
dsMinArray.add(new ScaledDataPoint(time, autosensData.slopeFromMinDeviation, dsMinScale));
maxFromMaxValueFound = Math.max(maxFromMaxValueFound, Math.abs(autosensData.slopeFromMaxDeviation));
maxFromMinValueFound = Math.max(maxFromMinValueFound, Math.abs(autosensData.slopeFromMinDeviation));
}
}
// Slopes
ScaledDataPoint[] ratioMaxData = new ScaledDataPoint[dsMaxArray.size()];
ratioMaxData = dsMaxArray.toArray(ratioMaxData);
dsMaxSeries = new LineGraphSeries<>(ratioMaxData);
dsMaxSeries.setColor(Color.MAGENTA);
dsMaxSeries.setThickness(3);
ScaledDataPoint[] ratioMinData = new ScaledDataPoint[dsMinArray.size()];
ratioMinData = dsMinArray.toArray(ratioMinData);
dsMinSeries = new LineGraphSeries<>(ratioMinData);
dsMinSeries.setColor(Color.YELLOW);
dsMinSeries.setThickness(3);
if (useForScale)
maxY = Math.max(maxFromMaxValueFound, maxFromMinValueFound);
dsMaxScale.setMultiplier(maxY * scale / maxFromMaxValueFound);
dsMinScale.setMultiplier(maxY * scale / maxFromMinValueFound);
addSeries(dsMaxSeries);
addSeries(dsMinSeries);
}
// scale in % of vertical size (like 0.3)
public void addNowLine(long now) { |
<<<<<<<
import info.nightscout.androidaps.Services.Intents;
=======
import ch.qos.logback.classic.LoggerContext;
>>>>>>>
<<<<<<<
import info.nightscout.utils.LoggerUtils;
import info.nightscout.utils.NSUpload;
=======
>>>>>>>
import info.nightscout.utils.LoggerUtils; |
<<<<<<<
=======
private static Logger log = LoggerFactory.getLogger(DetermineBasalResultAMA.class);
public Date date;
public JSONObject json = new JSONObject();
>>>>>>>
private static Logger log = LoggerFactory.getLogger(DetermineBasalResultAMA.class);
<<<<<<<
=======
public List<BgReading> getPredictions() {
List<BgReading> array = new ArrayList<>();
try {
long startTime = date.getTime();
if (json.has("predBGs")) {
JSONObject predBGs = json.getJSONObject("predBGs");
if (predBGs.has("IOB")) {
JSONArray iob = predBGs.getJSONArray("IOB");
for (int i = 1; i < iob.length(); i ++) {
BgReading bg = new BgReading();
bg.value = iob.getInt(i);
bg.date = startTime + i * 5 * 60 * 1000L;
bg.isPrediction = true;
array.add(bg);
}
}
if (predBGs.has("aCOB")) {
JSONArray iob = predBGs.getJSONArray("aCOB");
for (int i = 1; i < iob.length(); i ++) {
BgReading bg = new BgReading();
bg.value = iob.getInt(i);
bg.date = startTime + i * 5 * 60 * 1000L;
bg.isPrediction = true;
array.add(bg);
}
}
if (predBGs.has("COB")) {
JSONArray iob = predBGs.getJSONArray("COB");
for (int i = 1; i < iob.length(); i ++) {
BgReading bg = new BgReading();
bg.value = iob.getInt(i);
bg.date = startTime + i * 5 * 60 * 1000L;
bg.isPrediction = true;
array.add(bg);
}
}
}
} catch (JSONException e) {
log.error("Unhandled exception", e);
}
return array;
}
public long getLatestPredictionsTime() {
long latest = 0;
try {
long startTime = date.getTime();
if (json.has("predBGs")) {
JSONObject predBGs = json.getJSONObject("predBGs");
if (predBGs.has("IOB")) {
JSONArray iob = predBGs.getJSONArray("IOB");
latest = Math.max(latest, startTime + (iob.length() - 1) * 5 * 60 * 1000L);
}
if (predBGs.has("aCOB")) {
JSONArray iob = predBGs.getJSONArray("aCOB");
latest = Math.max(latest, startTime + (iob.length() - 1) * 5 * 60 * 1000L);
}
if (predBGs.has("COB")) {
JSONArray iob = predBGs.getJSONArray("COB");
latest = Math.max(latest, startTime + (iob.length() - 1) * 5 * 60 * 1000L);
}
}
} catch (JSONException e) {
log.error("Unhandled exception", e);
}
return latest;
}
>>>>>>> |
<<<<<<<
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.AutosensData;
import info.nightscout.androidaps.plugins.IobCobCalculator.IobCobCalculatorPlugin;
=======
import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
>>>>>>>
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.PumpCombo.ComboFragment;
import info.nightscout.androidaps.plugins.PumpDanaR.DanaRFragment;
=======
import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPlugin;
>>>>>>>
import info.nightscout.androidaps.plugins.PumpCombo.ComboFragment;
import info.nightscout.androidaps.plugins.PumpDanaR.DanaRFragment;
import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPlugin;
<<<<<<<
if (Config.DANAR) pluginsList.add(DanaRFragment.getPlugin());
if (Config.DANAR) pluginsList.add(DanaRKoreanFragment.getPlugin());
if (Config.DANARv2) pluginsList.add(DanaRv2Fragment.getPlugin());
if (Config.COMBO) pluginsList.add(ComboFragment.getPlugin());
=======
if (Config.DANAR) pluginsList.add(DanaRPlugin.getPlugin());
if (Config.DANAR) pluginsList.add(DanaRKoreanPlugin.getPlugin());
if (Config.DANARv2) pluginsList.add(DanaRv2Plugin.getPlugin());
>>>>>>>
if (Config.DANAR) pluginsList.add(DanaRPlugin.getPlugin());
if (Config.DANAR) pluginsList.add(DanaRKoreanPlugin.getPlugin());
if (Config.DANARv2) pluginsList.add(DanaRv2Plugin.getPlugin());
if (Config.COMBO) pluginsList.add(ComboFragment.getPlugin()); |
<<<<<<<
if (batteryLevel == 1) {
mUploaderBattery.setTextColor(ContextCompat.getColor(getApplicationContext(), dividerMatchesBg ?
R.color.dark_midColor : R.color.dark_uploaderBattery));
=======
if (rawData.batteryLevel == 1) {
mUploaderBattery.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_uploaderBattery));
>>>>>>>
if (rawData.batteryLevel == 1) {
mUploaderBattery.setTextColor(ContextCompat.getColor(getApplicationContext(), dividerMatchesBg ?
R.color.dark_midColor : R.color.dark_uploaderBattery));
<<<<<<<
if (batteryLevel == 1) {
mUploaderBattery.setTextColor(dividerMatchesBg ? Color.BLACK : Color.WHITE);
=======
if (rawData.batteryLevel == 1) {
mUploaderBattery.setTextColor(Color.WHITE);
>>>>>>>
if (rawData.batteryLevel == 1) {
mUploaderBattery.setTextColor(dividerMatchesBg ? Color.BLACK : Color.WHITE); |
<<<<<<<
public interface OnValueChangedListener {
void onValueChanged(double value);
}
TextView editText;
=======
EditText editText;
>>>>>>>
public interface OnValueChangedListener {
void onValueChanged(double value);
}
EditText editText;
<<<<<<<
callValueChangedListener();
=======
if (okButton != null) {
if (value > maxValue || value < minValue)
okButton.setVisibility(INVISIBLE);
else
okButton.setVisibility(VISIBLE);
}
>>>>>>>
callValueChangedListener();
if (okButton != null) {
if (value > maxValue || value < minValue)
okButton.setVisibility(INVISIBLE);
else
okButton.setVisibility(VISIBLE);
}
<<<<<<<
callValueChangedListener();
=======
this.okButton = okButton;
>>>>>>>
callValueChangedListener();
this.okButton = okButton; |
<<<<<<<
apsModeView.setTextColor(MainApp.gc(R.color.ribbonTextWarning));
} else if (loopPlugin.isEnabled(PluginType.LOOP) && loopPlugin.isDisconnected()) {
apsModeView.setBackgroundColor(MainApp.gc(R.color.ribbonCritical));
=======
apsModeView.setTextColor(Color.WHITE);
} else if (loopPlugin.isDisconnected()) {
apsModeView.setBackgroundColor(MainApp.gc(R.color.looppumpsuspended));
>>>>>>>
apsModeView.setTextColor(MainApp.gc(R.color.ribbonTextWarning));
} else if (loopPlugin.isDisconnected()) {
apsModeView.setBackgroundColor(MainApp.gc(R.color.ribbonCritical)); |
<<<<<<<
=======
import org.json.JSONException;
import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.text.DecimalFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.Locale;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
>>>>>>>
import org.json.JSONException;
import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.text.DecimalFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.Locale;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; |
<<<<<<<
if (carbsAfterConstraints > 0 || startActivityTTCheckbox.isChecked()
|| startEatingSoonTTCheckbox.isChecked() || startHypoTTCheckbox.isChecked()) {
builder.setMessage(Html.fromHtml(Joiner.on("<br/>").join(actions)));
builder.setPositiveButton(MainApp.gs(R.string.ok), (dialog, id) -> {
synchronized (builder) {
if (accepted) {
log.debug("guarding: already accepted");
return;
}
accepted = true;
if (startActivityTTCheckbox.isChecked()) {
TempTarget tempTarget = new TempTarget()
.date(System.currentTimeMillis())
.duration(finalActivityTTDuration)
.reason(MainApp.gs(R.string.activity))
.source(Source.USER)
.low(Profile.toMgdl(finalActivityTT, currentProfile.getUnits()))
.high(Profile.toMgdl(finalActivityTT, currentProfile.getUnits()));
MainApp.getDbHelper().createOrUpdate(tempTarget);
} else if (startEatingSoonTTCheckbox.isChecked()) {
TempTarget tempTarget = new TempTarget()
.date(System.currentTimeMillis())
.duration(finalEatingSoonTTDuration)
.reason(MainApp.gs(R.string.eatingsoon))
.source(Source.USER)
.low(Profile.toMgdl(finalEatigSoonTT, currentProfile.getUnits()))
.high(Profile.toMgdl(finalEatigSoonTT, currentProfile.getUnits()));
MainApp.getDbHelper().createOrUpdate(tempTarget);
} else if (startHypoTTCheckbox.isChecked()) {
TempTarget tempTarget = new TempTarget()
.date(System.currentTimeMillis())
.duration(finalHypoTTDuration)
.reason(MainApp.gs(R.string.hypo))
.source(Source.USER)
.low(Profile.toMgdl(finalHypoTT, currentProfile.getUnits()))
.high(Profile.toMgdl(finalHypoTT, currentProfile.getUnits()));
MainApp.getDbHelper().createOrUpdate(tempTarget);
}
=======
builder.setMessage(actions.isEmpty()
? MainApp.gs(R.string.no_action_selected)
: Html.fromHtml(Joiner.on("<br/>").join(actions)));
builder.setPositiveButton(MainApp.gs(R.string.ok), actions.isEmpty() ? null : (dialog, id) -> {
synchronized (builder) {
if (accepted) {
log.debug("guarding: already accepted");
return;
}
accepted = true;
if (startActivityTTCheckbox.isChecked()) {
TempTarget tempTarget = new TempTarget()
.date(System.currentTimeMillis())
.duration(finalActivityTTDuration)
.reason(MainApp.gs(R.string.activity))
.source(Source.USER)
.low(Profile.toMgdl(finalActivityTT, currentProfile.getUnits()))
.high(Profile.toMgdl(finalActivityTT, currentProfile.getUnits()));
TreatmentsPlugin.getPlugin().addToHistoryTempTarget(tempTarget);
} else if (startEatingSoonTTCheckbox.isChecked()) {
TempTarget tempTarget = new TempTarget()
.date(System.currentTimeMillis())
.duration(finalEatingSoonTTDuration)
.reason(MainApp.gs(R.string.eatingsoon))
.source(Source.USER)
.low(Profile.toMgdl(finalEatigSoonTT, currentProfile.getUnits()))
.high(Profile.toMgdl(finalEatigSoonTT, currentProfile.getUnits()));
TreatmentsPlugin.getPlugin().addToHistoryTempTarget(tempTarget);
} else if (startHypoTTCheckbox.isChecked()) {
TempTarget tempTarget = new TempTarget()
.date(System.currentTimeMillis())
.duration(finalHypoTTDuration)
.reason(MainApp.gs(R.string.hypo))
.source(Source.USER)
.low(Profile.toMgdl(finalHypoTT, currentProfile.getUnits()))
.high(Profile.toMgdl(finalHypoTT, currentProfile.getUnits()));
TreatmentsPlugin.getPlugin().addToHistoryTempTarget(tempTarget);
}
>>>>>>>
if (carbsAfterConstraints > 0 || startActivityTTCheckbox.isChecked()
|| startEatingSoonTTCheckbox.isChecked() || startHypoTTCheckbox.isChecked()) {
builder.setMessage(Html.fromHtml(Joiner.on("<br/>").join(actions)));
builder.setPositiveButton(MainApp.gs(R.string.ok), (dialog, id) -> {
synchronized (builder) {
if (accepted) {
log.debug("guarding: already accepted");
return;
}
accepted = true;
if (startActivityTTCheckbox.isChecked()) {
TempTarget tempTarget = new TempTarget()
.date(System.currentTimeMillis())
.duration(finalActivityTTDuration)
.reason(MainApp.gs(R.string.activity))
.source(Source.USER)
.low(Profile.toMgdl(finalActivityTT, currentProfile.getUnits()))
.high(Profile.toMgdl(finalActivityTT, currentProfile.getUnits()));
TreatmentsPlugin.getPlugin().addToHistoryTempTarget(tempTarget);
} else if (startEatingSoonTTCheckbox.isChecked()) {
TempTarget tempTarget = new TempTarget()
.date(System.currentTimeMillis())
.duration(finalEatingSoonTTDuration)
.reason(MainApp.gs(R.string.eatingsoon))
.source(Source.USER)
.low(Profile.toMgdl(finalEatigSoonTT, currentProfile.getUnits()))
.high(Profile.toMgdl(finalEatigSoonTT, currentProfile.getUnits()));
TreatmentsPlugin.getPlugin().addToHistoryTempTarget(tempTarget);
} else if (startHypoTTCheckbox.isChecked()) {
TempTarget tempTarget = new TempTarget()
.date(System.currentTimeMillis())
.duration(finalHypoTTDuration)
.reason(MainApp.gs(R.string.hypo))
.source(Source.USER)
.low(Profile.toMgdl(finalHypoTT, currentProfile.getUnits()))
.high(Profile.toMgdl(finalHypoTT, currentProfile.getUnits()));
TreatmentsPlugin.getPlugin().addToHistoryTempTarget(tempTarget);
} |
<<<<<<<
public static GregorianCalendar gregorianCalendar() {
return new GregorianCalendar();
}
=======
public static long getTimeZoneOffsetMs() {
return new GregorianCalendar().getTimeZone().getRawOffset();
}
public static int getTimeZoneOffsetMinutes(final long timestamp) {
return TimeZone.getDefault().getOffset(timestamp) / 60000;
}
public static String niceTimeScalar(long t) {
String unit = MainApp.gs(R.string.unit_second);
t = t / 1000;
if (t != 1) unit = MainApp.gs(R.string.unit_seconds);
if (t > 59) {
unit = MainApp.gs(R.string.unit_minute);
t = t / 60;
if (t != 1) unit = MainApp.gs(R.string.unit_minutes);
if (t > 59) {
unit = MainApp.gs(R.string.unit_hour);
t = t / 60;
if (t != 1) unit = MainApp.gs(R.string.unit_hours);
if (t > 24) {
unit = MainApp.gs(R.string.unit_day);
t = t / 24;
if (t != 1) unit = MainApp.gs(R.string.unit_days);
if (t > 28) {
unit = MainApp.gs(R.string.unit_week);
t = t / 7;
if (t != 1) unit = MainApp.gs(R.string.unit_weeks);
}
}
}
}
//if (t != 1) unit = unit + "s"; //implemented plurality in every step, because in other languages plurality of time is not every time adding the same character
return qs((double) t, 0) + " " + unit;
}
// singletons to avoid repeated allocation
private static DecimalFormatSymbols dfs;
private static DecimalFormat df;
public static String qs(double x, int digits) {
if (digits == -1) {
digits = 0;
if (((int) x != x)) {
digits++;
if ((((int) x * 10) / 10 != x)) {
digits++;
if ((((int) x * 100) / 100 != x)) digits++;
}
}
}
if (dfs == null) {
final DecimalFormatSymbols local_dfs = new DecimalFormatSymbols();
local_dfs.setDecimalSeparator('.');
dfs = local_dfs; // avoid race condition
}
final DecimalFormat this_df;
// use singleton if on ui thread otherwise allocate new as DecimalFormat is not thread safe
if (Thread.currentThread().getId() == 1) {
if (df == null) {
final DecimalFormat local_df = new DecimalFormat("#", dfs);
local_df.setMinimumIntegerDigits(1);
df = local_df; // avoid race condition
}
this_df = df;
} else {
this_df = new DecimalFormat("#", dfs);
}
this_df.setMaximumFractionDigits(digits);
return this_df.format(x);
}
>>>>>>>
public static GregorianCalendar gregorianCalendar() {
return new GregorianCalendar();
}
public static long getTimeZoneOffsetMs() {
return new GregorianCalendar().getTimeZone().getRawOffset();
}
public static int getTimeZoneOffsetMinutes(final long timestamp) {
return TimeZone.getDefault().getOffset(timestamp) / 60000;
}
public static String niceTimeScalar(long t) {
String unit = MainApp.gs(R.string.unit_second);
t = t / 1000;
if (t != 1) unit = MainApp.gs(R.string.unit_seconds);
if (t > 59) {
unit = MainApp.gs(R.string.unit_minute);
t = t / 60;
if (t != 1) unit = MainApp.gs(R.string.unit_minutes);
if (t > 59) {
unit = MainApp.gs(R.string.unit_hour);
t = t / 60;
if (t != 1) unit = MainApp.gs(R.string.unit_hours);
if (t > 24) {
unit = MainApp.gs(R.string.unit_day);
t = t / 24;
if (t != 1) unit = MainApp.gs(R.string.unit_days);
if (t > 28) {
unit = MainApp.gs(R.string.unit_week);
t = t / 7;
if (t != 1) unit = MainApp.gs(R.string.unit_weeks);
}
}
}
}
//if (t != 1) unit = unit + "s"; //implemented plurality in every step, because in other languages plurality of time is not every time adding the same character
return qs((double) t, 0) + " " + unit;
}
// singletons to avoid repeated allocation
private static DecimalFormatSymbols dfs;
private static DecimalFormat df;
public static String qs(double x, int digits) {
if (digits == -1) {
digits = 0;
if (((int) x != x)) {
digits++;
if ((((int) x * 10) / 10 != x)) {
digits++;
if ((((int) x * 100) / 100 != x)) digits++;
}
}
}
if (dfs == null) {
final DecimalFormatSymbols local_dfs = new DecimalFormatSymbols();
local_dfs.setDecimalSeparator('.');
dfs = local_dfs; // avoid race condition
}
final DecimalFormat this_df;
// use singleton if on ui thread otherwise allocate new as DecimalFormat is not thread safe
if (Thread.currentThread().getId() == 1) {
if (df == null) {
final DecimalFormat local_df = new DecimalFormat("#", dfs);
local_df.setMinimumIntegerDigits(1);
df = local_df; // avoid race condition
}
this_df = df;
} else {
this_df = new DecimalFormat("#", dfs);
}
this_df.setMaximumFractionDigits(digits);
return this_df.format(x);
} |
<<<<<<<
public static final String SMS = "SMS";
=======
public static final String LOCATION = "LOCATION";
>>>>>>>
public static final String LOCATION = "LOCATION";
public static final String SMS = "SMS"; |
<<<<<<<
import info.nightscout.androidaps.plugins.PumpCombo.ComboPlugin;
import info.nightscout.androidaps.plugins.PumpDanaR.BluetoothDevicePreference;
=======
>>>>>>>
import info.nightscout.androidaps.plugins.PumpCombo.ComboPlugin;
<<<<<<<
=======
if (savedInstanceState != null && savedInstanceState.containsKey("id")) {
id = savedInstanceState.getInt("id");
}
>>>>>>>
if (savedInstanceState != null && savedInstanceState.containsKey("id")) {
id = savedInstanceState.getInt("id");
} |
<<<<<<<
// if faking found in NS, adapt AAPS to use it too
if (!VirtualPumpPlugin.getFakingStatus()) {
VirtualPumpPlugin.setFakingStatus(true);
=======
if (!VirtualPumpPlugin.getPlugin().getFakingStatus()) {
VirtualPumpPlugin.getPlugin().setFakingStatus(true);
>>>>>>>
// if faking found in NS, adapt AAPS to use it too
if (!VirtualPumpPlugin.getPlugin().getFakingStatus()) {
VirtualPumpPlugin.getPlugin().setFakingStatus(true);
<<<<<<<
// if faking found in NS, adapt AAPS to use it too
if (!VirtualPumpPlugin.getFakingStatus()) {
VirtualPumpPlugin.setFakingStatus(true);
=======
if (!VirtualPumpPlugin.getPlugin().getFakingStatus()) {
VirtualPumpPlugin.getPlugin().setFakingStatus(true);
>>>>>>>
// if faking found in NS, adapt AAPS to use it too
if (!VirtualPumpPlugin.getPlugin().getFakingStatus()) {
VirtualPumpPlugin.getPlugin().setFakingStatus(true); |
<<<<<<<
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.CompositeDisposable;
<<<<<<<
Activity activity = getActivity();
if (activity != null)
activity.runOnUiThread(new Runnable() {
@Override
public void run() {
recyclerView.swapAdapter(new RecyclerViewAdapter(MainApp.getDbHelper().getProfileSwitchData(DateUtil.now() - T.days(30).msecs(),false)), false);
}
});
=======
recyclerView.swapAdapter(new RecyclerViewAdapter(MainApp.getDbHelper().getProfileSwitchData(false)), false);
>>>>>>>
recyclerView.swapAdapter(new RecyclerViewAdapter(MainApp.getDbHelper().getProfileSwitchData(DateUtil.now() - T.days(30).msecs(),false)), false); |
<<<<<<<
import info.nightscout.androidaps.data.DetailedBolusInfo;
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus;
=======
>>>>>>>
<<<<<<<
final Double finalInsulinAfterConstraints = insulinAfterConstraints;
final Integer finalCarbsAfterConstraints = carbsAfterConstraints;
final Context context = getContext();
final AlertDialog.Builder builder = new AlertDialog.Builder(context);
accepted = false;
builder.setTitle(MainApp.gs(R.string.confirmation));
builder.setMessage(confirmMessage);
builder.setPositiveButton(MainApp.gs(R.string.ok), (dialog, id) -> {
synchronized (builder) {
if (accepted) {
if (L.isEnabled(L.OVERVIEW))
log.debug("guarding: already accepted");
return;
}
accepted = true;
if (Math.abs(insulinAfterConstraints - wizard.calculatedTotalInsulin) >= 0.01 || finalCarbsAfterConstraints > 0) {
if (wizard.superBolus) {
final LoopPlugin loopPlugin = LoopPlugin.getPlugin();
if (loopPlugin.isEnabled(PluginType.LOOP)) {
loopPlugin.superBolusTo(System.currentTimeMillis() + T.hours(2).msecs());
MainApp.bus().post(new EventRefreshOverview("WizardDialog"));
}
PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
if (pump.getPumpDescription().tempBasalStyle == PumpDescription.ABSOLUTE) {
ConfigBuilderPlugin.getPlugin().getCommandQueue().tempBasalAbsolute(0.0d, 120, true, profile, new Callback() {
@Override
public void run() {
if (!result.success) {
Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
i.putExtra("soundid", R.raw.boluserror);
i.putExtra("status", result.comment);
i.putExtra("title", MainApp.gs(R.string.tempbasaldeliveryerror));
i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
MainApp.instance().startActivity(i);
}
}
});
} else {
ConfigBuilderPlugin.getPlugin().getCommandQueue().tempBasalPercent(0, 120, true, profile, new Callback() {
@Override
public void run() {
if (!result.success) {
Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
i.putExtra("soundid", R.raw.boluserror);
i.putExtra("status", result.comment);
i.putExtra("title", MainApp.gs(R.string.tempbasaldeliveryerror));
i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
MainApp.instance().startActivity(i);
}
}
});
}
}
DetailedBolusInfo detailedBolusInfo = new DetailedBolusInfo();
detailedBolusInfo.eventType = CareportalEvent.BOLUSWIZARD;
detailedBolusInfo.insulin = finalInsulinAfterConstraints;
detailedBolusInfo.carbs = finalCarbsAfterConstraints;
detailedBolusInfo.context = context;
detailedBolusInfo.boluscalc = boluscalcJSON;
detailedBolusInfo.source = Source.USER;
if (finalInsulinAfterConstraints > 0 || ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().storesCarbInfo) {
ConfigBuilderPlugin.getPlugin().getCommandQueue().bolus(detailedBolusInfo, new Callback() {
@Override
public void run() {
if (!result.success) {
Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
i.putExtra("soundid", R.raw.boluserror);
i.putExtra("status", result.comment);
i.putExtra("title", MainApp.gs(R.string.treatmentdeliveryerror));
i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
MainApp.instance().startActivity(i);
}
}
});
} else {
TreatmentsPlugin.getPlugin().addToHistoryTreatment(detailedBolusInfo, false);
}
}
}
});
builder.setNegativeButton(MainApp.gs(R.string.cancel), null);
builder.show();
=======
wizard.confirmAndExecute(getContext());
>>>>>>>
wizard.confirmAndExecute(getContext()); |
<<<<<<<
=======
private long connectionStartTime = 0;
private long lastCommandTime = 0;
>>>>>>>
private long lastCommandTime = 0;
<<<<<<<
long connectionStartTime = System.currentTimeMillis();
=======
connectionStartTime = lastCommandTime = System.currentTimeMillis();
>>>>>>>
long connectionStartTime = lastCommandTime = System.currentTimeMillis(); |
<<<<<<<
import static javax.time.calendrical.LocalPeriodUnit.DAYS;
=======
import static javax.time.calendrical.LocalDateTimeField.INSTANT_SECONDS;
import static javax.time.calendrical.LocalDateTimeField.NANO_OF_SECOND;
>>>>>>>
import static javax.time.calendrical.LocalDateTimeField.INSTANT_SECONDS;
import static javax.time.calendrical.LocalDateTimeField.NANO_OF_SECOND;
import static javax.time.calendrical.LocalPeriodUnit.DAYS; |
<<<<<<<
@Test(groups={"tck"})
public void test_getAmountSeconds() {
=======
public void test_getTotalSeconds() {
>>>>>>>
@Test(groups={"tck"})
public void test_getTotalSeconds() { |
<<<<<<<
import org.osiam.storage.entities.*;
=======
import org.osiam.storage.entities.ChildOfMultiValueAttribute;
import org.osiam.storage.entities.ChildOfMultiValueAttributeWithIdAndType;
import org.osiam.storage.entities.ChildOfMultiValueAttributeWithIdAndTypeAndPrimary;
import org.osiam.storage.entities.GroupEntity;
import java.lang.reflect.Field;
import java.util.Collection;
import java.util.Locale;
import java.util.Map;
>>>>>>>
import org.osiam.storage.entities.*;
import java.lang.reflect.Field;
import java.util.Collection;
import java.util.Locale;
import java.util.Map;
<<<<<<<
addHibernateUserReferenceToEntityIfNeeded(target);
=======
// This is bad and should be fixed in a different way
if (target instanceof GroupEntity) {
((GroupEntity) target).setDisplayName(m.getDisplay());
}
>>>>>>>
addHibernateUserReferenceToEntityIfNeeded(target);
// This is bad and should be fixed in a different way
if (target instanceof GroupEntity) {
((GroupEntity) target).setDisplayName(m.getDisplay());
} |
<<<<<<<
import org.osiam.resources.scim.Email;
import org.osiam.resources.scim.Entitlement;
=======
import org.osiam.resources.scim.Im;
import org.osiam.resources.scim.PhoneNumber;
import org.osiam.resources.scim.Photo;
>>>>>>>
import org.osiam.resources.scim.Email;
import org.osiam.resources.scim.Entitlement;
import org.osiam.resources.scim.Im;
import org.osiam.resources.scim.PhoneNumber;
import org.osiam.resources.scim.Photo;
<<<<<<<
=======
import org.osiam.storage.entities.X509CertificateEntity_;
>>>>>>> |
<<<<<<<
private static final long serialVersionUID = -6535056565639057158L;
@OneToMany(fetch = FetchType.EAGER)
=======
@ManyToMany(fetch = FetchType.EAGER)
>>>>>>>
private static final long serialVersionUID = -6535056565639057158L;
@ManyToMany(fetch = FetchType.EAGER) |
<<<<<<<
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
=======
import org.osiam.storage.dao.ExtensionDao;
import org.osiam.storage.entities.ExtensionEntity;
import org.osiam.storage.entities.ExtensionFieldEntity;
import org.osiam.storage.entities.UserEntity;
import javax.persistence.NoResultException;
import javax.persistence.criteria.AbstractQuery;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
>>>>>>>
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.osiam.storage.dao.ExtensionDao;
import org.osiam.storage.entities.ExtensionEntity;
import org.osiam.storage.entities.ExtensionFieldEntity;
import org.osiam.storage.entities.UserEntity;
import javax.persistence.NoResultException;
import javax.persistence.criteria.AbstractQuery;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
<<<<<<<
import org.osiam.storage.dao.ExtensionDao;
import org.osiam.storage.entities.UserEntity;
=======
private static String createOrConstraints() {
StringBuilder sb = new StringBuilder();
for (FilterConstraint constraint : FilterConstraint.values()) {
if (sb.length() != 0) {
sb.append("|");
}
sb.append(constraint.toString());
}
return sb.toString();
>>>>>>>
import org.osiam.storage.dao.ExtensionDao;
import org.osiam.storage.entities.UserEntity;
<<<<<<<
this.em = em;
this.extensionDao = extensionDao;
=======
this.criteriaBuilder = filterParser.getEntityManager().getCriteriaBuilder();
this.extensionDao = filterParser.extensionDao;
>>>>>>>
this.em = em;
this.criteriaBuilder = em.getCriteriaBuilder();
this.extensionDao = extensionDao;
<<<<<<<
public Predicate createPredicateAndJoin(Root<UserEntity> root) {
if (filterField != null) {
return filterField.addFilter(root, constraint, value, em.getCriteriaBuilder());
=======
public Predicate createPredicateAndJoin(AbstractQuery<Long> query, Root<UserEntity> root) {
if (userFilterField != null) {
return userFilterField.addFilter(query, root, constraint, value, criteriaBuilder);
} else if (extensionFilterField != null) {
return extensionFilterField.addFilter(root, constraint, value, criteriaBuilder);
>>>>>>>
public Predicate createPredicateAndJoin(Root<UserEntity> root) {
if (userFilterField != null) {
return userFilterField.addFilter(root, constraint, value, criteriaBuilder);
} else if (extensionFilterField != null) {
return extensionFilterField.addFilter(root, constraint, value, criteriaBuilder); |
<<<<<<<
=======
Log.d("ads", "ad");
>>>>>>> |
<<<<<<<
=======
String hdivParameter = HDIVUtil.getHdivStateParameterName(request);
>>>>>>> |
<<<<<<<
import java.util.List;
=======
import java.util.Iterator;
import java.util.Map;
>>>>>>>
import java.util.List;
import java.util.Map;
<<<<<<<
import org.hdiv.filter.ValidatorError;
=======
import org.hdiv.filter.RequestWrapper;
>>>>>>>
import org.hdiv.filter.RequestWrapper;
import org.hdiv.filter.ValidatorError; |
<<<<<<<
@Override
=======
private RequestWrapper requestWrapper;
private ResponseWrapper responseWrapper;
>>>>>>>
private RequestWrapper requestWrapper;
private ResponseWrapper responseWrapper;
@Override
<<<<<<<
DataComposerFactory dataComposerFactory = getApplicationContext().getBean(DataComposerFactory.class);
HttpServletRequest request = getMockRequest();
dataComposer = dataComposerFactory.newInstance(request);
HDIVUtil.setDataComposer(dataComposer, request);
dataComposer.startPage();
=======
DataComposerFactory dataComposerFactory = this.getApplicationContext().getBean(DataComposerFactory.class);
HttpServletRequest request = this.getMockRequest();
HttpServletResponse response = this.getMockResponse();
this.dataComposer = dataComposerFactory.newInstance(request);
HDIVUtil.setDataComposer(this.dataComposer, request);
this.dataComposer.startPage();
RequestInitializer requestInitializer = this.getApplicationContext().getBean(RequestInitializer.class);
this.requestWrapper = requestInitializer.createRequestWrapper(request, response);
this.responseWrapper = requestInitializer.createResponseWrapper(request, response);
>>>>>>>
DataComposerFactory dataComposerFactory = getApplicationContext().getBean(DataComposerFactory.class);
HttpServletRequest request = getMockRequest();
HttpServletResponse response = getMockResponse();
dataComposer = dataComposerFactory.newInstance(request);
HDIVUtil.setDataComposer(dataComposer, request);
dataComposer.startPage();
RequestInitializer requestInitializer = getApplicationContext().getBean(RequestInitializer.class);
requestWrapper = requestInitializer.createRequestWrapper(request, response);
responseWrapper = requestInitializer.createResponseWrapper(request, response);
<<<<<<<
dataComposer.endPage();
RequestWrapper requestWrapper = new RequestWrapper(request);
=======
this.dataComposer.endPage();
>>>>>>>
dataComposer.endPage();
<<<<<<<
MockHttpServletRequest request = getMockRequest();
RequestWrapper requestWrapper = new RequestWrapper(request);
MockHttpServletResponse response = new MockHttpServletResponse();
ResponseWrapper responseWrapper = new ResponseWrapper(request, response);
=======
MockHttpServletRequest request = this.getMockRequest();
>>>>>>>
MockHttpServletRequest request = getMockRequest(); |
<<<<<<<
import java.util.AbstractQueue;
import java.util.Iterator;
import java.util.concurrent.atomic.AtomicReferenceArray;
abstract class AtomicReferenceArrayQueue<E> extends AbstractQueue<E> implements IndexedQueue, QueueProgressIndicators
{
=======
abstract class AtomicReferenceArrayQueue<E> extends AbstractQueue<E> implements IndexedQueue, QueueProgressIndicators, MessagePassingQueue<E> {
>>>>>>>
import java.util.AbstractQueue;
import java.util.Iterator;
import java.util.concurrent.atomic.AtomicReferenceArray;
abstract class AtomicReferenceArrayQueue<E> extends AbstractQueue<E> implements IndexedQueue, QueueProgressIndicators, MessagePassingQueue<E> {
<<<<<<<
protected final E lvElement(AtomicReferenceArray<E> buffer, int offset)
{
=======
public static <E> E lvElement(AtomicReferenceArray<E> buffer, int offset) {
>>>>>>>
public static <E> E lvElement(AtomicReferenceArray<E> buffer, int offset)
{
<<<<<<<
protected final E lpElement(AtomicReferenceArray<E> buffer, int offset)
{
=======
public static <E> E lpElement(AtomicReferenceArray<E> buffer, int offset) {
>>>>>>>
public static <E> E lpElement(AtomicReferenceArray<E> buffer, int offset)
{
<<<<<<<
protected final void spElement(AtomicReferenceArray<E> buffer, int offset, E value)
{
=======
public static <E> void spElement(AtomicReferenceArray<E> buffer, int offset, E value) {
>>>>>>>
public static <E> void spElement(AtomicReferenceArray<E> buffer, int offset, E value) {
<<<<<<<
protected final void soElement(AtomicReferenceArray<E> buffer, int offset, E value)
{
=======
public static <E> void soElement(AtomicReferenceArray<E> buffer, int offset, E value) {
>>>>>>>
public static <E> void soElement(AtomicReferenceArray<E> buffer, int offset, E value) {
<<<<<<<
protected final void svElement(AtomicReferenceArray<E> buffer, int offset, E value)
{
=======
public static <E> void svElement(AtomicReferenceArray<E> buffer, int offset, E value) {
>>>>>>>
public static <E> void svElement(AtomicReferenceArray<E> buffer, int offset, E value) {
<<<<<<<
protected final int capacity()
{
=======
@Override
public final int capacity() {
>>>>>>>
@Override
public final int capacity() { |
<<<<<<<
=======
import static org.jctools.util.UnsafeAccess.UNSAFE;
>>>>>>>
import static org.jctools.util.UnsafeAccess.UNSAFE;
<<<<<<<
import static org.jctools.util.UnsafeAccess.UNSAFE;
=======
import org.jctools.util.RangeUtil;
>>>>>>>
import org.jctools.util.RangeUtil; |
<<<<<<<
* @param scopes OAuth scopes to be requested. A full list of scopes can be found
* <a href="https://www.reddit.com/dev/api/oauth>here</a>
=======
* @param scope The first scope. A full list of scopes can be found
* <a href="https://www.reddit.com/dev/api/oauth">here</a>
* @param otherScopes Any other additional scopes
>>>>>>>
* @param scopes OAuth scopes to be requested. A full list of scopes can be found
* <a href="https://www.reddit.com/dev/api/oauth">here</a> |
<<<<<<<
import org.eclipse.che.api.debug.shared.model.Location;
import org.eclipse.che.ide.api.app.AppContext;
=======
>>>>>>>
import org.eclipse.che.ide.api.app.AppContext;
<<<<<<<
AppContext appContext,
RequestHandlerManager requestHandlerManager) {
=======
RequestHandlerManager requestHandlerManager,
DebuggerResourceHandlerFactory debuggerResourceHandlerFactory) {
>>>>>>>
AppContext appContext,
RequestHandlerManager requestHandlerManager,
DebuggerResourceHandlerFactory debuggerResourceHandlerFactory) { |
<<<<<<<
=======
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import static java.util.Collections.emptyMap;
import static java.util.Collections.unmodifiableMap;
import static org.eclipse.che.api.core.websocket.impl.WebsocketIdService.randomClientId;
>>>>>>>
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import static java.util.Collections.emptyMap;
import static java.util.Collections.unmodifiableMap;
import static org.eclipse.che.api.core.websocket.impl.WebsocketIdService.randomClientId;
<<<<<<<
public void onOpen(Session session) {
String combinedEndpointId = getCombinedEndpointId(session);
=======
public void onOpen(Session session) {
String combinedEndpointId = getOrGenerateCombinedEndpointId(session);
>>>>>>>
public void onOpen(Session session) {
String combinedEndpointId = getOrGenerateCombinedEndpointId(session);
<<<<<<<
public void onError(Throwable t) {
LOG.debug("Web socket session error");
LOG.debug("Error: {}", t);
=======
public void onError(Throwable t, Session session) {
Optional<String> endpointIdOptional = registry.get(session);
String combinedEndpointId;
if (endpointIdOptional.isPresent()) {
combinedEndpointId = endpointIdOptional.get();
LOG.debug("Web socket session error");
LOG.debug("Endpoint: {}", combinedEndpointId);
LOG.debug("Error: {}", t);
} else {
LOG.warn("Web socket session error");
LOG.debug("Unidentified session");
LOG.debug("Error: {}", t);
}
}
protected abstract String getEndpointId();
private String getOrGenerateCombinedEndpointId(Session session) {
Map<String, String> queryParamsMap = getQueryParamsMap(session.getQueryString());
String clientId = queryParamsMap.getOrDefault("clientId", randomClientId());
return registry.get(session).orElse(identificationService.getCombinedId(getEndpointId(), clientId));
}
private Map<String, String> getQueryParamsMap(String queryParamsString) {
Map<String, String> queryParamsMap = new HashMap<>();
for (String queryParamsPair : Optional.ofNullable(queryParamsString).orElse("").split("&")) {
String[] pair = queryParamsPair.split("=");
if (pair.length == 2) {
queryParamsMap.put(pair[0], pair[1]);
}
}
return queryParamsMap.isEmpty() ? emptyMap() : unmodifiableMap(queryParamsMap);
>>>>>>>
public void onError(Throwable t, Session session) {
Optional<String> endpointIdOptional = registry.get(session);
String combinedEndpointId;
if (endpointIdOptional.isPresent()) {
combinedEndpointId = endpointIdOptional.get();
LOG.debug("Web socket session error");
LOG.debug("Endpoint: {}", combinedEndpointId);
LOG.debug("Error: {}", t);
} else {
LOG.warn("Web socket session error");
LOG.debug("Unidentified session");
LOG.debug("Error: {}", t);
}
}
protected abstract String getEndpointId();
private String getOrGenerateCombinedEndpointId(Session session) {
Map<String, String> queryParamsMap = getQueryParamsMap(session.getQueryString());
String clientId = queryParamsMap.getOrDefault("clientId", randomClientId());
return registry.get(session).orElse(identificationService.getCombinedId(getEndpointId(), clientId));
}
private Map<String, String> getQueryParamsMap(String queryParamsString) {
Map<String, String> queryParamsMap = new HashMap<>();
for (String queryParamsPair : Optional.ofNullable(queryParamsString).orElse("").split("&")) {
String[] pair = queryParamsPair.split("=");
if (pair.length == 2) {
queryParamsMap.put(pair[0], pair[1]);
}
}
return queryParamsMap.isEmpty() ? emptyMap() : unmodifiableMap(queryParamsMap); |
<<<<<<<
import org.eclipse.che.api.git.shared.BranchListMode;
import org.eclipse.che.api.git.shared.Remote;
import org.eclipse.che.api.promises.client.Operation;
import org.eclipse.che.api.promises.client.OperationException;
import org.eclipse.che.api.promises.client.PromiseError;
=======
>>>>>>>
<<<<<<<
service.remoteList(project.getLocation(), null, true).then(new Operation<List<Remote>>() {
@Override
public void apply(List<Remote> remotes) throws OperationException {
updateLocalBranches();
view.setRepositories(remotes);
view.setEnablePushButton(!remotes.isEmpty());
view.setSelectedForcePushCheckBox(false);
view.showDialog();
}
}).catchError(new Operation<PromiseError>() {
@Override
public void apply(PromiseError error) throws OperationException {
String errorMessage = error.getMessage() != null ? error.getMessage() : constant.remoteListFailed();
GitOutputConsole console = gitOutputConsoleFactory.create(REMOTE_REPO_COMMAND_NAME);
console.printError(errorMessage);
processesPanelPresenter.addCommandOutput(console);
notificationManager.notify(constant.remoteListFailed(), FAIL, FLOAT_MODE);
view.setEnablePushButton(false);
}
});
=======
service.remoteList(project.getLocation(), null, true)
.then(remotes -> {
updateLocalBranches();
view.setRepositories(remotes);
view.setEnablePushButton(!remotes.isEmpty());
view.setSelectedForcePushCheckBox(false);
view.showDialog();
})
.catchError(error -> {
String errorMessage = error.getMessage() != null ? error.getMessage() : constant.remoteListFailed();
GitOutputConsole console = gitOutputConsoleFactory.create(REMOTE_REPO_COMMAND_NAME);
console.printError(errorMessage);
processesPanelPresenter.addCommandOutput(appContext.getDevMachine().getId(), console);
notificationManager.notify(constant.remoteListFailed(), FAIL, FLOAT_MODE);
view.setEnablePushButton(false);
});
>>>>>>>
service.remoteList(project.getLocation(), null, true)
.then(remotes -> {
updateLocalBranches();
view.setRepositories(remotes);
view.setEnablePushButton(!remotes.isEmpty());
view.setSelectedForcePushCheckBox(false);
view.showDialog();
})
.catchError(error -> {
String errorMessage = error.getMessage() != null ? error.getMessage() : constant.remoteListFailed();
GitOutputConsole console = gitOutputConsoleFactory.create(REMOTE_REPO_COMMAND_NAME);
console.printError(errorMessage);
processesPanelPresenter.addCommandOutput(appContext.getDevMachine().getId(), console);
notificationManager.notify(constant.remoteListFailed(), FAIL, FLOAT_MODE);
view.setEnablePushButton(false);
});
<<<<<<<
service.config(project.getLocation(), Arrays.asList(configUpstreamBranch, configBranchRemote))
.then(new Operation<Map<String, String>>() {
@Override
public void apply(Map<String, String> configs) throws OperationException {
if (configs.containsKey(configBranchRemote) && configs.containsKey(configUpstreamBranch)) {
String displayName = configs.get(configBranchRemote) + "/" + configs.get(configUpstreamBranch);
Branch upstream = dtoFactory.createDto(Branch.class)
.withActive(false)
.withRemote(true)
.withDisplayName(displayName)
.withName("refs/remotes/" + displayName);
result.onSuccess(upstream);
} else {
result.onSuccess(null);
}
=======
service.config(project.getLocation(), Arrays.asList(configUpstreamBranch, configBranchRemote))
.then(configs -> {
if (configs.containsKey(configBranchRemote) && configs.containsKey(configUpstreamBranch)) {
String displayName = configs.get(configBranchRemote) + "/" + configs.get(configUpstreamBranch);
Branch upstream = dtoFactory.createDto(Branch.class)
.withActive(false)
.withRemote(true)
.withDisplayName(displayName)
.withName("refs/remotes/" + displayName);
result.onSuccess(upstream);
} else {
result.onSuccess(null);
>>>>>>>
service.config(project.getLocation(), Arrays.asList(configUpstreamBranch, configBranchRemote))
.then(configs -> {
if (configs.containsKey(configBranchRemote) && configs.containsKey(configUpstreamBranch)) {
String displayName = configs.get(configBranchRemote) + "/" + configs.get(configUpstreamBranch);
Branch upstream = dtoFactory.createDto(Branch.class)
.withActive(false)
.withRemote(true)
.withDisplayName(displayName)
.withName("refs/remotes/" + displayName);
result.onSuccess(upstream);
} else {
result.onSuccess(null);
<<<<<<<
service.branchList(project.getLocation(), remoteMode).then(new Operation<List<Branch>>() {
@Override
public void apply(List<Branch> branches) throws OperationException {
asyncResult.onSuccess(branches);
}
}).catchError(new Operation<PromiseError>() {
@Override
public void apply(PromiseError error) throws OperationException {
asyncResult.onFailure(error.getCause());
}
});
=======
service.branchList(project.getLocation(), remoteMode)
.then(branches -> {
asyncResult.onSuccess(branches);
})
.catchError(error -> {
asyncResult.onFailure(error.getCause());
});
>>>>>>>
service.branchList(project.getLocation(), remoteMode)
.then(branches -> {
asyncResult.onSuccess(branches);
})
.catchError(error -> {
asyncResult.onFailure(error.getCause());
}); |
<<<<<<<
=======
private EventRemover appStateEventRemover;
/**
* List of actions with parameters which comes from startup URL. Can be processed after IDE
* initialization as usual after starting ws-agent.
*/
private List<StartUpAction> startAppActions;
>>>>>>>
private EventRemover appStateEventRemover;
<<<<<<<
eventBus.addHandler(WorkspaceStoppingEvent.TYPE, workspaceStateHandler);
// in some cases IDE doesn't save preferences on window close
// so try to save if window lost focus
Elements.getWindow()
.addEventListener(Event.BLUR, evt -> appStateManager.get().persistWorkspaceState());
=======
eventBus.addHandler(WorkspaceStatusChangedEvent.TYPE, workspaceStateHandler);
>>>>>>>
eventBus.addHandler(WorkspaceStoppingEvent.TYPE, workspaceStateHandler);
<<<<<<<
/** Sets the current workspace. */
public void setWorkspace(WorkspaceImpl workspace) {
this.workspace = new WorkspaceImpl(workspace);
=======
@Override
public void setWorkspace(Workspace workspace) {
if (appStateEventRemover != null) {
appStateEventRemover.remove();
}
if (workspace != null) {
userWorkspace = workspace;
if (workspace.getRuntime() != null) {
runtime = new ActiveRuntime(workspace.getRuntime());
}
//in some cases IDE doesn't save preferences on window close
//so try to save if window lost focus
appStateEventRemover =
Elements.getWindow()
.addEventListener(
Event.BLUR,
evt -> appStateManager.get().persistWorkspaceState(workspace.getId()));
} else {
userWorkspace = null;
runtime = null;
}
>>>>>>>
/** Sets the current workspace. */
public void setWorkspace(WorkspaceImpl workspace) {
this.workspace = new WorkspaceImpl(workspace);
if (appStateEventRemover != null) {
appStateEventRemover.remove();
}
// in some cases IDE doesn't save preferences on window close
// so try to save if window lost focus
appStateEventRemover =
Elements.getWindow()
.addEventListener(Event.BLUR, evt -> appStateManager.get().persistWorkspaceState());
<<<<<<<
public void onWorkspaceStopping(WorkspaceStoppingEvent event) {
persistWorkspaceStatePromise = appStateManager.get().persistWorkspaceState();
=======
public void onWindowClosing(WindowActionEvent event) {
Workspace workspace = getWorkspace();
if (workspace != null) {
appStateManager.get().persistWorkspaceState(workspace.getId());
}
}
@Override
public void onWindowClosed(WindowActionEvent event) {}
@Override
public void onWorkspaceStarted(WorkspaceStartedEvent event) {
setWorkspace(event.getWorkspace());
}
@Override
public void onWorkspaceStatusChangedEvent(WorkspaceStatusChangedEvent event) {
WorkspaceStatus workspaceStatus = event.getWorkspaceStatusEvent().getStatus();
if (STOPPING == workspaceStatus) {
Workspace workspace = getWorkspace();
if (workspace != null) {
persistWorkspaceStatePromise =
appStateManager.get().persistWorkspaceState(workspace.getId());
}
}
>>>>>>>
public void onWorkspaceStopping(WorkspaceStoppingEvent event) {
persistWorkspaceStatePromise = appStateManager.get().persistWorkspaceState(); |
<<<<<<<
import org.eclipse.che.api.core.model.workspace.config.Command;
=======
import org.eclipse.che.api.core.jsonrpc.commons.JsonRpcPromise;
import org.eclipse.che.api.core.model.machine.Command;
>>>>>>>
import org.eclipse.che.api.core.model.workspace.config.Command;
import org.eclipse.che.api.core.jsonrpc.commons.JsonRpcPromise; |
<<<<<<<
import static org.eclipse.che.ide.part.perspectives.project.ProjectPerspective.PROJECT_PERSPECTIVE_ID;
=======
import org.eclipse.che.ide.util.browser.BrowserUtils;
import static org.eclipse.che.ide.workspace.perspectives.project.ProjectPerspective.PROJECT_PERSPECTIVE_ID;
>>>>>>>
import org.eclipse.che.ide.util.browser.BrowserUtils; |
<<<<<<<
import org.eclipse.che.api.promises.client.*;
import org.eclipse.che.ide.api.statepersistance.StateComponent;
import org.eclipse.che.ide.ui.smartTree.data.Node;
=======
import org.eclipse.che.api.promises.client.Promise;
import org.eclipse.che.api.promises.client.PromiseError;
import org.eclipse.che.api.promises.client.PromiseProvider;
import org.eclipse.che.ide.api.component.StateComponent;
import org.eclipse.che.ide.api.data.tree.Node;
>>>>>>>
import org.eclipse.che.api.promises.client.Promise;
import org.eclipse.che.api.promises.client.PromiseError;
import org.eclipse.che.api.promises.client.PromiseProvider;
import org.eclipse.che.ide.api.statepersistance.StateComponent;
import org.eclipse.che.ide.ui.smartTree.data.Node; |
<<<<<<<
=======
GinMapBinder<String, WsAgentComponent> wsAgentComponentsBinder =
GinMapBinder.newMapBinder(binder(), String.class, WsAgentComponent.class);
wsAgentComponentsBinder.addBinding("Load Language Server file types.").to(LanguageServerFileTypeRegister.class);
bind(PublishDiagnosticsReceiver.class).asEagerSingleton();
bind(ShowMessageJsonRpcReceiver.class).asEagerSingleton();
>>>>>>>
bind(PublishDiagnosticsReceiver.class).asEagerSingleton();
bind(ShowMessageJsonRpcReceiver.class).asEagerSingleton(); |
<<<<<<<
@Source("panel/panel-selector-bottom.svg")
SVGResource panelSelectorBottom();
@Source("panel/panel-selector-full-editor.svg")
SVGResource panelSelectorFullEditor();
@Source("panel/panel-selector-left.svg")
SVGResource panelSelectorLeft();
@Source("panel/panel-selector-left-bottom.svg")
SVGResource panelSelectorLeftBottom();
@Source("panel/panel-selector-left-right-bottom.svg")
SVGResource panelSelectorLeftRightBottom();
@Source("panel/panel-selector-right.svg")
SVGResource panelSelectorRight();
=======
@Source("searchMatch.svg")
SVGResource searchMatch();
>>>>>>>
@Source("panel/panel-selector-bottom.svg")
SVGResource panelSelectorBottom();
@Source("panel/panel-selector-full-editor.svg")
SVGResource panelSelectorFullEditor();
@Source("panel/panel-selector-left.svg")
SVGResource panelSelectorLeft();
@Source("panel/panel-selector-left-bottom.svg")
SVGResource panelSelectorLeftBottom();
@Source("panel/panel-selector-left-right-bottom.svg")
SVGResource panelSelectorLeftRightBottom();
@Source("panel/panel-selector-right.svg")
SVGResource panelSelectorRight();
@Source("searchMatch.svg")
SVGResource searchMatch();
<<<<<<<
@ClassName("codeassistant-highlight")
String codeassistantHighlight();
=======
String tagsPanel();
@ClassName("found-highlight")
String foundPhraseHighlight();
@ClassName("found-item")
String foundItem();
@ClassName("search-match")
String searchMatch();
>>>>>>>
@ClassName("codeassistant-highlight")
String codeassistantHighlight();
@ClassName("found-highlight")
String foundPhraseHighlight();
@ClassName("found-item")
String foundItem();
@ClassName("search-match")
String searchMatch(); |
<<<<<<<
public RecipeImpl getRecipe() {
=======
@Override
public EnvironmentRecipeImpl getRecipe() {
>>>>>>>
@Override
public RecipeImpl getRecipe() { |
<<<<<<<
import static org.eclipse.che.api.workspace.shared.Constants.SERVER_WS_AGENT_HTTP_REFERENCE;
=======
import static org.eclipse.che.api.core.model.workspace.WorkspaceStatus.STOPPING;
>>>>>>>
import static org.eclipse.che.api.workspace.shared.Constants.SERVER_WS_AGENT_HTTP_REFERENCE;
<<<<<<<
import org.eclipse.che.api.core.model.factory.Factory;
=======
import org.eclipse.che.api.core.model.workspace.Workspace;
import org.eclipse.che.api.core.model.workspace.WorkspaceStatus;
import org.eclipse.che.api.factory.shared.dto.FactoryDto;
import org.eclipse.che.api.promises.client.Promise;
>>>>>>>
import org.eclipse.che.api.core.model.factory.Factory;
import org.eclipse.che.api.promises.client.Promise;
<<<<<<<
=======
import org.eclipse.che.ide.api.workspace.event.WorkspaceStartedEvent;
import org.eclipse.che.ide.api.workspace.event.WorkspaceStatusChangedEvent;
>>>>>>>
<<<<<<<
import org.eclipse.che.ide.ui.smartTree.data.HasDataObject;
import org.eclipse.che.ide.util.loging.Log;
=======
import org.eclipse.che.ide.util.dom.Elements;
>>>>>>>
import org.eclipse.che.ide.ui.smartTree.data.HasDataObject;
import org.eclipse.che.ide.util.dom.Elements;
import org.eclipse.che.ide.util.loging.Log;
<<<<<<<
eventBus.addHandler(ProjectTypesLoadedEvent.TYPE, e -> initResourceManager());
=======
WorkspaceStateHandler workspaceStateHandler = new WorkspaceStateHandler();
>>>>>>>
eventBus.addHandler(ProjectTypesLoadedEvent.TYPE, e -> initResourceManager());
WorkspaceStateHandler workspaceStateHandler = new WorkspaceStateHandler();
<<<<<<<
eventBus.addHandler(WorkspaceStoppedEvent.TYPE, this);
=======
eventBus.addHandler(WindowActionEvent.TYPE, workspaceStateHandler);
eventBus.addHandler(WorkspaceStoppedEvent.TYPE, workspaceStateHandler);
eventBus.addHandler(WorkspaceStatusChangedEvent.TYPE, workspaceStateHandler);
//in some cases IDE doesn't save preferences on window close
//so try to save if window lost focus
Elements.getWindow()
.addEventListener(
Event.BLUR, evt -> appStateManager.get().persistWorkspaceState(getWorkspaceId()));
>>>>>>>
eventBus.addHandler(WorkspaceStoppedEvent.TYPE, workspaceStateHandler);
eventBus.addHandler(WorkspaceStoppingEvent.TYPE, workspaceStateHandler);
// in some cases IDE doesn't save preferences on window close
// so try to save if window lost focus
Elements.getWindow()
.addEventListener(Event.BLUR, evt -> appStateManager.get().persistWorkspaceState());
<<<<<<<
private void initResourceManager() {
if (!rootProjects.isEmpty()) {
for (Project project : rootProjects) {
eventBus.fireEvent(new ResourceChangedEvent(new ResourceDeltaImpl(project, REMOVED)));
}
rootProjects.clear();
}
=======
@Override
public void initResourceManager(final Callback<ResourceManager, Exception> callback) {
if (runtime.getDevMachine() == null) {
//should never happened, but anyway
callback.onFailure(new NullPointerException("Dev machine is not initialized"));
}
clearProjects();
>>>>>>>
private void initResourceManager() {
clearProjects(); |
<<<<<<<
=======
logAsErrorAgentStartLogs(machine, agent.getName(), agentLogger.getText());
>>>>>>>
logAsErrorAgentStartLogs(machine, agent.getName(), agentLogger.getText()); |
<<<<<<<
import java.util.Map;
=======
import java.util.logging.Logger;
>>>>>>>
import java.util.logging.Logger;
<<<<<<<
public class LanguageServerFileTypeRegister {
=======
public class LanguageServerFileTypeRegister implements WsAgentComponent {
private static Logger LOGGER = Logger.getLogger(LanguageServerFileTypeRegister.class.getName());
>>>>>>>
public class LanguageServerFileTypeRegister {
private static Logger LOGGER = Logger.getLogger(LanguageServerFileTypeRegister.class.getName());
<<<<<<<
// highlighting
OrionHighlightingConfigurationOverlay config = OrionHighlightingConfigurationOverlay
.create();
config.setId(lang.getLanguageId() + ".highlighting");
config.setContentTypes(contentTypeId);
config.setPatterns(lang.getHighlightingConfiguration());
orionContentTypeRegistrant.registerFileType(contentType, config);
}
=======
// highlighting
OrionHighlightingConfigurationOverlay config = OrionHighlightingConfigurationOverlay.create();
config.setId(lang.getLanguageId() + ".highlighting");
config.setContentTypes(mimeType);
config.setPatterns(lang.getHighlightingConfiguration());
contentTypeRegistrant.registerFileType(contentType, config);
LOGGER.info("registered language description for " + lang.getLanguageId());
>>>>>>>
// highlighting
OrionHighlightingConfigurationOverlay config = OrionHighlightingConfigurationOverlay.create();
config.setId(lang.getLanguageId() + ".highlighting");
config.setContentTypes(mimeType);
config.setPatterns(lang.getHighlightingConfiguration());
contentTypeRegistrant.registerFileType(contentType, config);
LOGGER.info("registered language description for " + lang.getLanguageId()); |
<<<<<<<
import org.eclipse.che.api.core.model.workspace.config.ProjectConfig;
import org.eclipse.che.api.core.model.workspace.config.SourceStorage;
import org.eclipse.che.api.project.shared.NewProjectConfig;
import org.eclipse.che.api.workspace.shared.dto.CommandDto;
=======
import org.eclipse.che.api.core.model.project.NewProjectConfig;
import org.eclipse.che.api.core.model.project.ProjectConfig;
import org.eclipse.che.api.core.model.project.ProjectProblem;
import org.eclipse.che.api.core.model.project.SourceStorage;
import org.eclipse.che.api.machine.shared.dto.CommandDto;
>>>>>>>
import org.eclipse.che.api.core.model.project.ProjectProblem;
import org.eclipse.che.api.core.model.workspace.config.ProjectConfig;
import org.eclipse.che.api.core.model.workspace.config.SourceStorage;
import org.eclipse.che.api.project.shared.NewProjectConfig;
import org.eclipse.che.api.workspace.shared.dto.CommandDto; |
<<<<<<<
=======
private String applicationWebsocketId = null;
private Workspace userWorkspace;
private CurrentUser currentUser;
private FactoryDto factory;
private Path projectsRoot;
private ActiveRuntime runtime;
private ResourceManager resourceManager;
private Map<String, String> properties;
>>>>>>> |
<<<<<<<
service.log(project.getLocation(), null, false).then(new Operation<LogResponse>() {
@Override
public void apply(LogResponse log) throws OperationException {
view.setRevisions(log.getCommits());
view.setMixMode(true);
view.setEnableResetButton(selectedRevision != null);
view.showDialog();
project.synchronize();
}
}).catchError(new Operation<PromiseError>() {
@Override
public void apply(PromiseError error) throws OperationException {
if (getErrorCode(error.getCause()) == ErrorCodes.INIT_COMMIT_WAS_NOT_PERFORMED) {
dialogFactory.createMessageDialog(constant.resetCommitViewTitle(),
constant.initCommitWasNotPerformed(),
null).show();
return;
}
String errorMessage = (error.getMessage() != null) ? error.getMessage() : constant.logFailed();
GitOutputConsole console = gitOutputConsoleFactory.create(LOG_COMMAND_NAME);
console.printError(errorMessage);
consolesPanelPresenter.addCommandOutput(console);
notificationManager.notify(constant.logFailed(), FAIL, FLOAT_MODE);
}
});
=======
service.log(project.getLocation(), null, -1, -1, false)
.then(log -> {
view.setRevisions(log.getCommits());
view.setMixMode(true);
view.setEnableResetButton(selectedRevision != null);
view.showDialog();
project.synchronize();
})
.catchError(error -> {
if (getErrorCode(error.getCause()) == ErrorCodes.INIT_COMMIT_WAS_NOT_PERFORMED) {
dialogFactory.createMessageDialog(constant.resetCommitViewTitle(),
constant.initCommitWasNotPerformed(),
null).show();
return;
}
String errorMessage = (error.getMessage() != null) ? error.getMessage() : constant.logFailed();
GitOutputConsole console = gitOutputConsoleFactory.create(LOG_COMMAND_NAME);
console.printError(errorMessage);
consolesPanelPresenter.addCommandOutput(appContext.getDevMachine().getId(), console);
notificationManager.notify(constant.logFailed(), FAIL, FLOAT_MODE);
});
>>>>>>>
service.log(project.getLocation(), null, -1, -1, false)
.then(log -> {
view.setRevisions(log.getCommits());
view.setMixMode(true);
view.setEnableResetButton(selectedRevision != null);
view.showDialog();
project.synchronize();
})
.catchError(error -> {
if (getErrorCode(error.getCause()) == ErrorCodes.INIT_COMMIT_WAS_NOT_PERFORMED) {
dialogFactory.createMessageDialog(constant.resetCommitViewTitle(),
constant.initCommitWasNotPerformed(),
null).show();
return;
}
String errorMessage = (error.getMessage() != null) ? error.getMessage() : constant.logFailed();
GitOutputConsole console = gitOutputConsoleFactory.create(LOG_COMMAND_NAME);
console.printError(errorMessage);
consolesPanelPresenter.addCommandOutput(console);
notificationManager.notify(constant.logFailed(), FAIL, FLOAT_MODE);
});
<<<<<<<
service.reset(project.getLocation(), selectedRevision.getId(), type, null).then(new Operation<Void>() {
@Override
public void apply(Void ignored) throws OperationException {
console.print(constant.resetSuccessfully());
consolesPanelPresenter.addCommandOutput(console);
notificationManager.notify(constant.resetSuccessfully());
project.synchronize();
}
}).catchError(new Operation<PromiseError>() {
@Override
public void apply(PromiseError error) throws OperationException {
String errorMessage = (error.getMessage() != null) ? error.getMessage() : constant.resetFail();
console.printError(errorMessage);
consolesPanelPresenter.addCommandOutput(console);
notificationManager.notify(constant.resetFail(), FAIL, FLOAT_MODE);
}
});
=======
service.reset(project.getLocation(), selectedRevision.getId(), type, null)
.then(ignored -> {
console.print(constant.resetSuccessfully());
consolesPanelPresenter.addCommandOutput(appContext.getDevMachine().getId(), console);
notificationManager.notify(constant.resetSuccessfully());
project.synchronize();
})
.catchError(error -> {
String errorMessage = (error.getMessage() != null) ? error.getMessage() : constant.resetFail();
console.printError(errorMessage);
consolesPanelPresenter.addCommandOutput(appContext.getDevMachine().getId(), console);
notificationManager.notify(constant.resetFail(), FAIL, FLOAT_MODE);
});
>>>>>>>
service.reset(project.getLocation(), selectedRevision.getId(), type, null)
.then(ignored -> {
console.print(constant.resetSuccessfully());
consolesPanelPresenter.addCommandOutput(console);
notificationManager.notify(constant.resetSuccessfully());
project.synchronize();
})
.catchError(error -> {
String errorMessage = (error.getMessage() != null) ? error.getMessage() : constant.resetFail();
console.printError(errorMessage);
consolesPanelPresenter.addCommandOutput(console);
notificationManager.notify(constant.resetFail(), FAIL, FLOAT_MODE);
}); |
<<<<<<<
private static Class loadClass(ClassLoader classLoader, String className) throws ClassNotFoundException {
ProcessEngineConfigurationImpl processEngineConfiguration = Context.getProcessEngineConfiguration();
boolean useClassForName = processEngineConfiguration == null ||
processEngineConfiguration.isUseClassForNameClassLoading();
return useClassForName ? Class.forName(className, true, classLoader) : classLoader.loadClass(className);
}
=======
public static boolean isGetter(Method method) {
String name = method.getName();
Class< ? > type = method.getReturnType();
Class< ? > params[] = method.getParameterTypes();
if (!GETTER_PATTERN.matcher(name).matches()) {
return false;
}
// special for isXXX boolean
if (name.startsWith("is")) {
return params.length == 0 && type.getSimpleName().equalsIgnoreCase("boolean");
}
return params.length == 0 && !type.equals(Void.TYPE);
}
public static boolean isSetter(Method method, boolean allowBuilderPattern) {
String name = method.getName();
Class< ? > type = method.getReturnType();
Class< ? > params[] = method.getParameterTypes();
if (!SETTER_PATTERN.matcher(name).matches()) {
return false;
}
return params.length == 1 && (type.equals(Void.TYPE) || (allowBuilderPattern && method.getDeclaringClass().isAssignableFrom(type)));
}
public static boolean isSetter(Method method) {
return isSetter(method, false);
}
public static String getGetterShorthandName(Method method) {
if (!isGetter(method)) {
return method.getName();
}
String name = method.getName();
if (name.startsWith("get")) {
name = name.substring(3);
name = name.substring(0, 1).toLowerCase(Locale.ENGLISH) + name.substring(1);
} else if (name.startsWith("is")) {
name = name.substring(2);
name = name.substring(0, 1).toLowerCase(Locale.ENGLISH) + name.substring(1);
}
return name;
}
public static String getSetterShorthandName(Method method) {
if (!isSetter(method)) {
return method.getName();
}
String name = method.getName();
if (name.startsWith("set")) {
name = name.substring(3);
name = name.substring(0, 1).toLowerCase(Locale.ENGLISH) + name.substring(1);
}
return name;
}
>>>>>>>
private static Class loadClass(ClassLoader classLoader, String className) throws ClassNotFoundException {
ProcessEngineConfigurationImpl processEngineConfiguration = Context.getProcessEngineConfiguration();
boolean useClassForName = processEngineConfiguration == null ||
processEngineConfiguration.isUseClassForNameClassLoading();
return useClassForName ? Class.forName(className, true, classLoader) : classLoader.loadClass(className);
}
public static boolean isGetter(Method method) {
String name = method.getName();
Class< ? > type = method.getReturnType();
Class< ? > params[] = method.getParameterTypes();
if (!GETTER_PATTERN.matcher(name).matches()) {
return false;
}
// special for isXXX boolean
if (name.startsWith("is")) {
return params.length == 0 && type.getSimpleName().equalsIgnoreCase("boolean");
}
return params.length == 0 && !type.equals(Void.TYPE);
}
public static boolean isSetter(Method method, boolean allowBuilderPattern) {
String name = method.getName();
Class< ? > type = method.getReturnType();
Class< ? > params[] = method.getParameterTypes();
if (!SETTER_PATTERN.matcher(name).matches()) {
return false;
}
return params.length == 1 && (type.equals(Void.TYPE) || (allowBuilderPattern && method.getDeclaringClass().isAssignableFrom(type)));
}
public static boolean isSetter(Method method) {
return isSetter(method, false);
}
public static String getGetterShorthandName(Method method) {
if (!isGetter(method)) {
return method.getName();
}
String name = method.getName();
if (name.startsWith("get")) {
name = name.substring(3);
name = name.substring(0, 1).toLowerCase(Locale.ENGLISH) + name.substring(1);
} else if (name.startsWith("is")) {
name = name.substring(2);
name = name.substring(0, 1).toLowerCase(Locale.ENGLISH) + name.substring(1);
}
return name;
}
public static String getSetterShorthandName(Method method) {
if (!isSetter(method)) {
return method.getName();
}
String name = method.getName();
if (name.startsWith("set")) {
name = name.substring(3);
name = name.substring(0, 1).toLowerCase(Locale.ENGLISH) + name.substring(1);
}
return name;
} |
<<<<<<<
service.branchList(project.getLocation(), LIST_LOCAL).then(new Operation<List<Branch>>() {
@Override
public void apply(List<Branch> branches) throws OperationException {
List<Reference> references = new ArrayList<>();
for (Branch branch : branches) {
if (!branch.isActive()) {
Reference reference = new Reference(branch.getName(), branch.getDisplayName(), LOCAL_BRANCH);
references.add(reference);
}
}
view.setLocalBranches(references);
}
}).catchError(new Operation<PromiseError>() {
@Override
public void apply(PromiseError error) throws OperationException {
console.printError(error.getMessage());
consolesPanelPresenter.addCommandOutput(console);
notificationManager.notify(constant.branchesListFailed(), FAIL, FLOAT_MODE);
}
});
service.branchList(project.getLocation(), LIST_REMOTE).then(new Operation<List<Branch>>() {
@Override
public void apply(List<Branch> branches) throws OperationException {
List<Reference> references = new ArrayList<>();
for (Branch branch : branches) {
if (!branch.isActive()) {
Reference reference =
new Reference(branch.getName(), branch.getDisplayName(), REMOTE_BRANCH);
references.add(reference);
}
}
view.setRemoteBranches(references);
}
}).catchError(new Operation<PromiseError>() {
@Override
public void apply(PromiseError error) throws OperationException {
console.printError(error.getMessage());
consolesPanelPresenter.addCommandOutput(console);
notificationManager.notify(constant.branchesListFailed(), FAIL, FLOAT_MODE);
}
});
=======
service.branchList(project.getLocation(), LIST_LOCAL)
.then(branches -> {
List<Reference> references = new ArrayList<>();
for (Branch branch : branches) {
if (!branch.isActive()) {
Reference reference = new Reference(branch.getName(), branch.getDisplayName(), LOCAL_BRANCH);
references.add(reference);
}
}
view.setLocalBranches(references);
})
.catchError(error -> {
console.printError(error.getMessage());
consolesPanelPresenter.addCommandOutput(appContext.getDevMachine().getId(), console);
notificationManager.notify(constant.branchesListFailed(), FAIL, FLOAT_MODE);
});
service.branchList(project.getLocation(), LIST_REMOTE)
.then(branches -> {
List<Reference> references = new ArrayList<>();
for (Branch branch : branches) {
if (!branch.isActive()) {
Reference reference =
new Reference(branch.getName(), branch.getDisplayName(), REMOTE_BRANCH);
references.add(reference);
}
}
view.setRemoteBranches(references);
})
.catchError(error -> {
console.printError(error.getMessage());
consolesPanelPresenter.addCommandOutput(appContext.getDevMachine().getId(), console);
notificationManager.notify(constant.branchesListFailed(), FAIL, FLOAT_MODE);
});
>>>>>>>
service.branchList(project.getLocation(), LIST_LOCAL)
.then(branches -> {
List<Reference> references = new ArrayList<>();
for (Branch branch : branches) {
if (!branch.isActive()) {
Reference reference = new Reference(branch.getName(), branch.getDisplayName(), LOCAL_BRANCH);
references.add(reference);
}
}
view.setLocalBranches(references);
})
.catchError(error -> {
console.printError(error.getMessage());
consolesPanelPresenter.addCommandOutput(console);
notificationManager.notify(constant.branchesListFailed(), FAIL, FLOAT_MODE);
});
service.branchList(project.getLocation(), LIST_REMOTE)
.then(branches -> {
List<Reference> references = new ArrayList<>();
for (Branch branch : branches) {
if (!branch.isActive()) {
Reference reference =
new Reference(branch.getName(), branch.getDisplayName(), REMOTE_BRANCH);
references.add(reference);
}
}
view.setRemoteBranches(references);
})
.catchError(error -> {
console.printError(error.getMessage());
consolesPanelPresenter.addCommandOutput(console);
notificationManager.notify(constant.branchesListFailed(), FAIL, FLOAT_MODE);
}); |
<<<<<<<
// FIXME: spi
// final String machineId = machine.getId();
//
// processesPanelPresenter.addCommandOutput(machineId, console);
//
// execAgentClient.startProcess(machineId, expandedCommand)
// .thenIfProcessStartedEvent(console.getProcessStartedOperation())
// .thenIfProcessDiedEvent(console.getProcessDiedOperation())
// .thenIfProcessStdOutEvent(console.getStdOutOperation())
// .thenIfProcessStdErrEvent(console.getStdErrOperation());
=======
final String machineId = machine.getId();
processesPanelPresenter.addCommandOutput(machineId, console);
execAgentClient.startProcess(machineId, expandedCommand)
.thenIfProcessStartedEvent(console.getProcessStartedConsumer())
.thenIfProcessDiedEvent(console.getProcessDiedConsumer())
.thenIfProcessStdOutEvent(console.getStdOutConsumer())
.thenIfProcessStdErrEvent(console.getStdErrConsumer());
>>>>>>>
// FIXME: spi
// final String machineId = machine.getId();
//
// processesPanelPresenter.addCommandOutput(machineId, console);
//
// execAgentClient.startProcess(machineId, expandedCommand)
// .thenIfProcessStartedEvent(console.getProcessStartedConsumer())
// .thenIfProcessDiedEvent(console.getProcessDiedConsumer())
// .thenIfProcessStdOutEvent(console.getStdOutConsumer())
// .thenIfProcessStdErrEvent(console.getStdErrConsumer()); |
<<<<<<<
import org.eclipse.che.api.debug.shared.model.Location;
import org.eclipse.che.ide.api.app.AppContext;
=======
>>>>>>>
import org.eclipse.che.ide.api.app.AppContext;
<<<<<<<
AppContext appContext,
RequestHandlerManager requestHandlerManager) {
=======
RequestHandlerManager requestHandlerManager,
DebuggerResourceHandlerFactory debuggerResourceHandlerFactory) {
>>>>>>>
RequestHandlerManager requestHandlerManager,
DebuggerResourceHandlerFactory debuggerResourceHandlerFactory) { |
<<<<<<<
import org.eclipse.che.ide.api.app.AppContext;
import org.eclipse.che.ide.api.editor.events.FileContentUpdateEvent;
=======
import org.eclipse.che.ide.api.dialogs.CancelCallback;
import org.eclipse.che.ide.api.dialogs.ConfirmCallback;
import org.eclipse.che.ide.api.dialogs.DialogFactory;
import org.eclipse.che.ide.api.event.FileContentUpdateEvent;
import org.eclipse.che.ide.api.git.GitServiceClient;
>>>>>>>
import org.eclipse.che.ide.api.editor.events.FileContentUpdateEvent;
<<<<<<<
import org.eclipse.che.ide.ext.git.client.GitServiceClient;
import org.eclipse.che.ide.ext.git.client.GitUtil;
=======
>>>>>>>
import org.eclipse.che.ide.ext.git.client.GitServiceClient; |
<<<<<<<
import static org.eclipse.che.ide.api.workspace.Constants.WORKSAPCE_AGENT_ENDPOINT_ID;
=======
import org.eclipse.che.api.promises.client.Promise;
import org.eclipse.che.api.promises.client.PromiseError;
import org.eclipse.che.api.promises.client.js.Promises;
import org.eclipse.lsp4j.ServerCapabilities;
import java.util.concurrent.TimeoutException;
>>>>>>>
import org.eclipse.che.api.promises.client.Promise;
import org.eclipse.che.api.promises.client.PromiseError;
import org.eclipse.che.api.promises.client.js.Promises;
import org.eclipse.lsp4j.ServerCapabilities;
import java.util.concurrent.TimeoutException;
import static org.eclipse.che.ide.api.workspace.Constants.WORKSAPCE_AGENT_ENDPOINT_ID;
<<<<<<<
public JsonRpcPromise<Boolean> initializeServer(String path) {
return requestTransmitter.newRequest()
.endpointId(WORKSAPCE_AGENT_ENDPOINT_ID)
.methodName("languageServer/initialize")
.paramsAsString(path)
.sendAndReceiveResultAsBoolean(30_000);
=======
public Promise<ServerCapabilities> initializeServer(String path) {
return Promises.create((resolve, reject) -> requestTransmitter.newRequest().endpointId("ws-agent")
.methodName("languageServer/initialize").paramsAsString(path)
.sendAndReceiveResultAsDto(ServerCapabilities.class, 30000).onSuccess(resolve::apply)
.onFailure(error -> reject.apply(getPromiseError(error)))
.onTimeout(() -> {
final TimeoutException e = new TimeoutException();
reject.apply(new PromiseError() {
@Override
public String getMessage() {
return "Timeout initializing error";
}
@Override
public Throwable getCause() {
return e;
}
});
}));
}
private PromiseError getPromiseError(JsonRpcError jsonRpcError) {
return new PromiseError() {
@Override
public String getMessage() {
return jsonRpcError.getMessage();
}
@Override
public Throwable getCause() {
return new JsonRpcException(jsonRpcError.getCode(), jsonRpcError.getMessage());
}
};
>>>>>>>
public Promise<ServerCapabilities> initializeServer(String path) {
return Promises.create((resolve, reject) -> requestTransmitter.newRequest().endpointId(WORKSAPCE_AGENT_ENDPOINT_ID)
.methodName("languageServer/initialize").paramsAsString(path)
.sendAndReceiveResultAsDto(ServerCapabilities.class, 30000).onSuccess(resolve::apply)
.onFailure(error -> reject.apply(getPromiseError(error)))
.onTimeout(() -> {
final TimeoutException e = new TimeoutException();
reject.apply(new PromiseError() {
@Override
public String getMessage() {
return "Timeout initializing error";
}
@Override
public Throwable getCause() {
return e;
}
});
}));
}
private PromiseError getPromiseError(JsonRpcError jsonRpcError) {
return new PromiseError() {
@Override
public String getMessage() {
return jsonRpcError.getMessage();
}
@Override
public Throwable getCause() {
return new JsonRpcException(jsonRpcError.getCode(), jsonRpcError.getMessage());
}
}; |
<<<<<<<
public static final String WORKSPACE_STATUS_CHANGED_METHOD = "workspace/statusChanged";
public static final String MACHINE_STATUS_CHANGED_METHOD = "machine/statusChanged";
public static final String SERVER_STATUS_CHANGED_METHOD = "server/statusChanged";
public static final String MACHINE_LOG_METHOD = "machine/log";
public static final String INSTALLER_LOG_METHOD = "installer/log";
=======
public static final String ACTIVITY_CHECKER = "activity-checker";
>>>>>>>
public static final String WORKSPACE_STATUS_CHANGED_METHOD = "workspace/statusChanged";
public static final String MACHINE_STATUS_CHANGED_METHOD = "machine/statusChanged";
public static final String SERVER_STATUS_CHANGED_METHOD = "server/statusChanged";
public static final String MACHINE_LOG_METHOD = "machine/log";
public static final String INSTALLER_LOG_METHOD = "installer/log";
public static final String ACTIVITY_CHECKER = "activity-checker"; |
<<<<<<<
import org.eclipse.che.ide.editor.EditorFileStatusNotificationOperation;
=======
import org.eclipse.che.ide.api.vcs.HasVcsChangeMarkerRender;
import org.eclipse.che.ide.api.vcs.VcsChangeMarkerRender;
import org.eclipse.che.ide.api.vcs.VcsChangeMarkerRenderFactory;
import org.eclipse.che.ide.editor.orion.client.jso.OrionExtRulerOverlay;
>>>>>>>
import org.eclipse.che.ide.api.vcs.HasVcsChangeMarkerRender;
import org.eclipse.che.ide.api.vcs.VcsChangeMarkerRender;
import org.eclipse.che.ide.api.vcs.VcsChangeMarkerRenderFactory;
import org.eclipse.che.ide.editor.EditorFileStatusNotificationOperation;
import org.eclipse.che.ide.editor.orion.client.jso.OrionExtRulerOverlay; |
<<<<<<<
import org.eclipse.che.commons.annotation.Nullable;
import org.eclipse.che.ide.api.app.AppContext;
import org.eclipse.che.ide.api.debug.Breakpoint;
=======
>>>>>>>
import org.eclipse.che.ide.api.app.AppContext;
<<<<<<<
AppContext appContext,
String type,
RequestHandlerManager requestHandlerManager) {
=======
RequestHandlerManager requestHandlerManager,
DebuggerResourceHandlerFactory debuggerResourceHandlerFactory,
String type) {
>>>>>>>
RequestHandlerManager requestHandlerManager,
DebuggerResourceHandlerFactory debuggerResourceHandlerFactory,
String type) {
<<<<<<<
if (!isConnected()) {
return;
}
Promise<DebugSessionDto> promise = service.getSessionInfo(debugSessionDto.getId());
promise
.then(
debugSessionDto -> {
debuggerManager.setActiveDebugger(AbstractDebugger.this);
setDebugSession(debugSessionDto);
=======
if (!isConnected()) {
return;
}
Promise<DebugSessionDto> promise = service.getSessionInfo(debugSessionDto.getId());
promise
.then(
debugSessionDto -> {
debuggerManager.setActiveDebugger(AbstractDebugger.this);
setDebugSession(debugSessionDto);
DebuggerInfo debuggerInfo = debugSessionDto.getDebuggerInfo();
String info = debuggerInfo.getName() + " " + debuggerInfo.getVersion();
String address = debuggerInfo.getHost() + ":" + debuggerInfo.getPort();
DebuggerDescriptor debuggerDescriptor = new DebuggerDescriptor(info, address);
for (DebuggerObserver observer : observers) {
observer.onDebuggerAttached(debuggerDescriptor, Promises.resolve(null));
}
for (BreakpointDto breakpoint : debugSessionDto.getBreakpoints()) {
onBreakpointActivated(breakpoint.getLocation());
}
if (currentLocation != null) {
debuggerResourceHandlerFactory
.getOrDefault(getDebuggerType())
.find(
currentLocation,
new AsyncCallback<VirtualFile>() {
@Override
public void onFailure(Throwable caught) {
for (DebuggerObserver observer : observers) {
observer.onBreakpointStopped(
currentLocation.getTarget(), currentLocation);
}
}
@Override
public void onSuccess(VirtualFile result) {
for (DebuggerObserver observer : observers) {
observer.onBreakpointStopped(
result.getLocation().toString(), currentLocation);
}
}
});
}
>>>>>>>
if (!isConnected()) {
return;
}
Promise<DebugSessionDto> promise = service.getSessionInfo(debugSessionDto.getId());
promise
.then(
debugSessionDto -> {
debuggerManager.setActiveDebugger(AbstractDebugger.this);
setDebugSession(debugSessionDto); |
<<<<<<<
import org.activiti.engine.delegate.event.impl.ActivitiEventBuilder;
=======
import org.activiti.bpmn.model.EndEvent;
>>>>>>>
import org.activiti.bpmn.model.EndEvent;
import org.activiti.engine.delegate.event.impl.ActivitiEventBuilder;
<<<<<<<
import org.activiti.engine.impl.context.Context;
import org.activiti.engine.impl.persistence.entity.ExecutionEntity;
=======
>>>>>>>
import org.activiti.engine.impl.context.Context;
import org.activiti.engine.impl.persistence.entity.ExecutionEntity;
<<<<<<<
boolean loop = true;
// get top superexecution to terminate
while (scopeExecution.getSuperExecutionId() != null && loop) {
ActivityExecution superExecution = (ActivityExecution) Context.getProcessEngineConfiguration().getRuntimeService().createExecutionQuery().executionId(scopeExecution.getSuperExecutionId()).singleResult();
if (superExecution != null) {
// superExecution can be null in the case when no wait state was reached between super start event and TerminateEndEvent
while (superExecution.getParent() != null) {
superExecution = superExecution.getParent();
}
scopeExecution = superExecution;
} else {
loop = false;
}
}
terminateExecution(execution, terminateEndEventActivity, scopeExecution);
}
private void terminateExecution(ActivityExecution execution, ActivityImpl terminateEndEventActivity, ActivityExecution scopeExecution) {
// send cancelled event
sendCancelledEvent( execution, terminateEndEventActivity, scopeExecution);
=======
>>>>>>>
boolean loop = true;
// get top superexecution to terminate
while (scopeExecution.getSuperExecutionId() != null && loop) {
ActivityExecution superExecution = (ActivityExecution) Context.getProcessEngineConfiguration().getRuntimeService().createExecutionQuery().executionId(scopeExecution.getSuperExecutionId()).singleResult();
if (superExecution != null) {
// superExecution can be null in the case when no wait state was reached between super start event and TerminateEndEvent
while (superExecution.getParent() != null) {
superExecution = superExecution.getParent();
}
scopeExecution = superExecution;
} else {
loop = false;
}
}
terminateExecution(execution, terminateEndEventActivity, scopeExecution);
}
protected void terminateExecution(ActivityExecution execution, ActivityImpl terminateEndEventActivity, ActivityExecution scopeExecution) {
// send cancelled event
sendCancelledEvent( execution, terminateEndEventActivity, scopeExecution);
<<<<<<<
private void sendCancelledEvent(ActivityExecution execution, ActivityImpl terminateEndEventActivity, ActivityExecution scopeExecution) {
if (Context.getProcessEngineConfiguration().getEventDispatcher().isEnabled()) {
Context.getProcessEngineConfiguration().getEventDispatcher().dispatchEvent(
ActivitiEventBuilder.createCancelledEvent(execution.getId(), execution.getProcessInstanceId(),
execution.getProcessDefinitionId(), terminateEndEventActivity));
}
dispatchExecutionCancelled(scopeExecution, terminateEndEventActivity);
}
private void dispatchExecutionCancelled(ActivityExecution execution, ActivityImpl causeActivity) {
// subprocesses
for (ActivityExecution subExecution : execution.getExecutions()) {
dispatchExecutionCancelled(subExecution, causeActivity);
}
// call activities
ExecutionEntity subProcessInstance = Context.getCommandContext().getExecutionEntityManager().findSubProcessInstanceBySuperExecutionId(execution.getId());
if (subProcessInstance != null) {
dispatchExecutionCancelled(subProcessInstance, causeActivity);
}
// activity with message/signal boundary events
ActivityImpl activity = (ActivityImpl) execution.getActivity();
if (activity != null && activity.getActivityBehavior() != null && activity != causeActivity) {
dispatchActivityCancelled(execution, activity, causeActivity);
}
}
private void dispatchActivityCancelled(ActivityExecution execution, ActivityImpl activity, ActivityImpl causeActivity) {
Context.getProcessEngineConfiguration().getEventDispatcher().dispatchEvent(
ActivitiEventBuilder.createActivityCancelledEvent(activity.getId(),
(String) activity.getProperties().get("name"),
execution.getId(),
execution.getProcessInstanceId(), execution.getProcessDefinitionId(),
(String) activity.getProperties().get("type"),
activity.getActivityBehavior().getClass().getCanonicalName(),
causeActivity)
);
}
=======
public EndEvent getEndEvent() {
return this.endEvent;
}
// If we use this implementation, we run into trouble in the DbSqlSession, see ACT-1382
// public void execute(ActivityExecution execution) throws Exception {
//
// PvmActivity terminateEndEventActivity = execution.getActivity();
//
// ActivityExecution scopeExecution = ScopeUtil.findScopeExecution(execution);
//
// // first end the current execution normally
// execution.end();
//
// // if this does not end the scope execution, interrupt it and destroy it.
// if (!scopeExecution.isEnded()) {
// // destroy the scope execution (this interrupts all child executions / sub process instances)
// scopeExecution.destroyScope("terminate end event fired");
//
// // set the scope execution to the terminate end event make
// // (the history should reflect that the execution ended here).
// ((InterpretableExecution)scopeExecution).setActivity((ActivityImpl) terminateEndEventActivity);
// // end the scope execution
// scopeExecution.end();
// }
// }
>>>>>>>
protected void sendCancelledEvent(ActivityExecution execution, ActivityImpl terminateEndEventActivity, ActivityExecution scopeExecution) {
if (Context.getProcessEngineConfiguration().getEventDispatcher().isEnabled()) {
Context.getProcessEngineConfiguration().getEventDispatcher().dispatchEvent(
ActivitiEventBuilder.createCancelledEvent(execution.getId(), execution.getProcessInstanceId(),
execution.getProcessDefinitionId(), terminateEndEventActivity));
}
dispatchExecutionCancelled(scopeExecution, terminateEndEventActivity);
}
private void dispatchExecutionCancelled(ActivityExecution execution, ActivityImpl causeActivity) {
// subprocesses
for (ActivityExecution subExecution : execution.getExecutions()) {
dispatchExecutionCancelled(subExecution, causeActivity);
}
// call activities
ExecutionEntity subProcessInstance = Context.getCommandContext().getExecutionEntityManager().findSubProcessInstanceBySuperExecutionId(execution.getId());
if (subProcessInstance != null) {
dispatchExecutionCancelled(subProcessInstance, causeActivity);
}
// activity with message/signal boundary events
ActivityImpl activity = (ActivityImpl) execution.getActivity();
if (activity != null && activity.getActivityBehavior() != null && activity != causeActivity) {
dispatchActivityCancelled(execution, activity, causeActivity);
}
}
protected void dispatchActivityCancelled(ActivityExecution execution, ActivityImpl activity, ActivityImpl causeActivity) {
Context.getProcessEngineConfiguration().getEventDispatcher().dispatchEvent(
ActivitiEventBuilder.createActivityCancelledEvent(activity.getId(),
(String) activity.getProperties().get("name"),
execution.getId(),
execution.getProcessInstanceId(), execution.getProcessDefinitionId(),
(String) activity.getProperties().get("type"),
activity.getActivityBehavior().getClass().getCanonicalName(),
causeActivity)
);
}
public EndEvent getEndEvent() {
return this.endEvent;
} |
<<<<<<<
import org.eclipse.che.api.core.model.workspace.config.Command;
=======
import org.eclipse.che.api.core.jsonrpc.commons.RequestTransmitter;
import org.eclipse.che.api.core.model.machine.Command;
import org.eclipse.che.api.core.model.machine.Machine;
>>>>>>>
import org.eclipse.che.api.core.jsonrpc.commons.RequestTransmitter;
import org.eclipse.che.api.core.model.workspace.config.Command; |
<<<<<<<
String REPORTING_SAVE_POPUP_NAME_TOO_LONG = "reporting.save.popup.name.too.long";
=======
String REPORTING_SAVE_POPUP_NAME_TOO_LONG = "reporting.save.popup..name.too.long";
String REPORTING_CREATE_TIME = "reporting.report.created";
>>>>>>>
String REPORTING_SAVE_POPUP_NAME_TOO_LONG = "reporting.save.popup.name.too.long";
String REPORTING_SAVE_POPUP_NAME_TOO_LONG = "reporting.save.popup..name.too.long";
String REPORTING_CREATE_TIME = "reporting.report.created"; |
<<<<<<<
import org.eclipse.che.ide.ui.smartTree.data.Node;
import org.eclipse.che.ide.ui.smartTree.data.TreeExpander;
import org.eclipse.che.ide.ui.smartTree.data.settings.NodeSettings;
import org.eclipse.che.ide.ui.smartTree.data.settings.SettingsProvider;
=======
import org.eclipse.che.ide.ui.smartTree.presentation.HasPresentation;
>>>>>>>
import org.eclipse.che.ide.ui.smartTree.data.Node;
import org.eclipse.che.ide.ui.smartTree.data.TreeExpander;
import org.eclipse.che.ide.ui.smartTree.data.settings.NodeSettings;
import org.eclipse.che.ide.ui.smartTree.data.settings.SettingsProvider;
import org.eclipse.che.ide.ui.smartTree.presentation.HasPresentation; |
<<<<<<<
import org.eclipse.che.ide.CoreLocalizationConstant;
import org.eclipse.che.ide.actions.WorkspaceSnapshotNotifier;
import org.eclipse.che.ide.api.app.AppContext;
import org.eclipse.che.ide.api.notification.NotificationManager;
import org.eclipse.che.ide.api.workspace.WorkspaceServiceClient;
import org.eclipse.che.ide.api.workspace.event.WsStatusChangedEvent;
import org.eclipse.che.ide.jsonrpc.RequestHandlerConfigurator;
import org.eclipse.che.ide.ui.loaders.LoaderPresenter;
=======
import org.eclipse.che.ide.api.workspace.event.WorkspaceStatusChangedEvent;
>>>>>>>
import org.eclipse.che.ide.CoreLocalizationConstant;
import org.eclipse.che.ide.actions.WorkspaceSnapshotNotifier;
import org.eclipse.che.ide.api.app.AppContext;
import org.eclipse.che.ide.api.notification.NotificationManager;
import org.eclipse.che.ide.api.workspace.WorkspaceServiceClient;
import org.eclipse.che.ide.api.workspace.event.WsStatusChangedEvent;
import org.eclipse.che.ide.ui.loaders.LoaderPresenter; |
<<<<<<<
=======
import org.eclipse.che.api.core.model.project.NewProjectConfig;
import org.eclipse.che.api.core.model.project.ProjectConfig;
import org.eclipse.che.api.core.model.project.ProjectProblem;
import org.eclipse.che.api.core.model.project.SourceStorage;
>>>>>>>
import org.eclipse.che.api.core.model.project.ProjectProblem; |
<<<<<<<
import org.eclipse.che.api.core.model.workspace.Workspace;
import org.eclipse.che.api.promises.client.Operation;
import org.eclipse.che.api.promises.client.OperationException;
=======
>>>>>>>
import org.eclipse.che.api.core.model.workspace.Workspace;
<<<<<<<
import org.eclipse.che.api.promises.client.PromiseError;
import org.eclipse.che.ide.api.app.AppContext;
import org.eclipse.che.ide.api.statepersistance.StateComponent;
import org.eclipse.che.ide.api.WindowActionEvent;
import org.eclipse.che.ide.api.WindowActionHandler;
=======
import org.eclipse.che.api.promises.client.PromiseProvider;
import org.eclipse.che.ide.api.component.StateComponent;
>>>>>>>
import org.eclipse.che.api.promises.client.PromiseProvider;
import org.eclipse.che.ide.api.WindowActionEvent;
import org.eclipse.che.ide.api.WindowActionHandler;
import org.eclipse.che.ide.api.app.AppContext;
<<<<<<<
private final Map<String, Provider<StateComponent>> persistenceComponents;
private final PreferencesManager preferencesManager;
private final JsonFactory jsonFactory;
private final AppContext appContext;
private JsonObject allWsState;
=======
/**
* Sorted by execution priority list of persistence state components.
*/
private final List<StateComponent> persistenceComponents;
private final PreferencesManager preferencesManager;
private final JsonFactory jsonFactory;
private final PromiseProvider promises;
private JsonObject allWsState;
>>>>>>>
/**
* Sorted by execution priority list of persistence state components.
*/
private final List<StateComponent> persistenceComponents;
private final PreferencesManager preferencesManager;
private final JsonFactory jsonFactory;
private final PromiseProvider promises;
private final AppContext appContext;
private JsonObject allWsState;
<<<<<<<
public AppStateManager(Map<String, Provider<StateComponent>> persistenceComponents,
=======
public AppStateManager(Set<StateComponent> persistenceComponents,
>>>>>>>
public AppStateManager(Set<StateComponent> persistenceComponents,
<<<<<<<
JsonFactory jsonFactory,
EventBus eventBus,
AppContext appContext) {
this.persistenceComponents = persistenceComponents;
=======
JsonFactory jsonFactory,
PromiseProvider promises) {
this.persistenceComponents = persistenceComponents.stream()
.sorted(comparingInt(StateComponent::getPriority).reversed())
.collect(toList());
>>>>>>>
JsonFactory jsonFactory,
PromiseProvider promises,
EventBus eventBus,
AppContext appContext) {
this.persistenceComponents = persistenceComponents.stream()
.sorted(comparingInt(StateComponent::getPriority).reversed())
.collect(toList());
<<<<<<<
this.appContext = appContext;
// delay is required because we need to wait some time while different components initialized
eventBus.addHandler(WorkspaceReadyEvent.getType(), e -> restoreWorkspaceStateWithDelay());
eventBus.addHandler(WindowActionEvent.TYPE, new WindowActionHandler() {
@Override
public void onWindowClosing(WindowActionEvent event) {
final Workspace workspace = appContext.getWorkspace();
if (workspace != null) {
persistWorkspaceState();
}
}
@Override
public void onWindowClosed(WindowActionEvent event) {
}
});
=======
this.promises = promises;
readStateFromPreferences();
>>>>>>>
this.promises = promises;
this.appContext = appContext;
// delay is required because we need to wait some time while different components initialized
eventBus.addHandler(WorkspaceReadyEvent.getType(), e -> restoreWorkspaceStateWithDelay());
eventBus.addHandler(WindowActionEvent.TYPE, new WindowActionHandler() {
@Override
public void onWindowClosing(WindowActionEvent event) {
final Workspace workspace = appContext.getWorkspace();
if (workspace != null) {
persistWorkspaceState();
}
}
@Override
public void onWindowClosed(WindowActionEvent event) {
}
});
<<<<<<<
if (persistenceComponents.containsKey(key)) {
StateComponent component = persistenceComponents.get(key).get();
component.loadState(workspace.getObject(key));
=======
Optional<StateComponent> stateComponent = persistenceComponents.stream()
.filter(component -> component.getId().equals(key))
.findAny();
if (stateComponent.isPresent()) {
StateComponent component = stateComponent.get();
Log.debug(getClass(), "Restore state for the component ID: " + component.getId());
sequentialRestore = sequentialRestore.thenPromise(ignored -> component.loadState(workspace.getObject(key)));
>>>>>>>
Optional<StateComponent> stateComponent = persistenceComponents.stream()
.filter(component -> component.getId().equals(key))
.findAny();
if (stateComponent.isPresent()) {
StateComponent component = stateComponent.get();
Log.debug(getClass(), "Restore state for the component ID: " + component.getId());
sequentialRestore = sequentialRestore.thenPromise(ignored -> component.loadState(workspace.getObject(key)));
<<<<<<<
public Promise<Void> persistWorkspaceState() {
final String wsId = appContext.getWorkspace().getId();
final JsonObject settings = Json.createObject();
=======
public Promise<Void> persistWorkspaceState(String wsId) {
JsonObject settings = Json.createObject();
>>>>>>>
public Promise<Void> persistWorkspaceState() {
String wsId = appContext.getWorkspace().getId();
JsonObject settings = Json.createObject(); |
<<<<<<<
import static org.eclipse.che.ide.api.jsonrpc.Constants.WS_AGENT_JSON_RPC_ENDPOINT_ID;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
=======
import com.google.web.bindery.event.shared.EventBus;
import javax.inject.Inject;
import javax.inject.Provider;
import javax.inject.Singleton;
>>>>>>>
import static org.eclipse.che.ide.api.jsonrpc.Constants.WS_AGENT_JSON_RPC_ENDPOINT_ID;
import javax.inject.Inject;
import javax.inject.Provider;
import javax.inject.Singleton; |
<<<<<<<
import org.eclipse.che.ide.ui.smartTree.data.Node;
=======
import org.eclipse.che.ide.ui.smartTree.presentation.AbstractPresentationNode;
>>>>>>>
import org.eclipse.che.ide.ui.smartTree.data.Node;
import org.eclipse.che.ide.ui.smartTree.presentation.AbstractPresentationNode; |
<<<<<<<
private void addSelectedAndCommit(final String message, final boolean commitAll, final boolean amend) {
service.add(project.getLocation(), false, toRelativePaths(appContext.getResources()))
.then(new Operation<Void>() {
@Override
public void apply(Void ignored) throws OperationException {
doCommit(message, false, commitAll, amend);
}
=======
@Override
public void onCommitClicked() {
DevMachine devMachine = appContext.getDevMachine();
Path location = project.getLocation();
Path[] filesToCommitArray = getFilesToCommitArray();
service.add(devMachine, location, false, filesToCommitArray)
.then(arg -> {
service.commit(devMachine,
location,
view.getMessage(),
false,
filesToCommitArray,
view.isAmend())
.then(revision -> {
onCommitSuccess(revision);
if (view.isPushAfterCommit()) {
push(devMachine, location);
}
view.close();
})
.catchError(error -> {
handleError(error.getCause());
});
})
.catchError(error -> {
notificationManager.notify(constant.addFailed(), FAIL, FLOAT_MODE);
>>>>>>>
@Override
public void onCommitClicked() {
Path location = project.getLocation();
Path[] filesToCommitArray = getFilesToCommitArray();
service.add(location, false, filesToCommitArray)
.then(arg -> {
service.commit(location,
view.getMessage(),
false,
filesToCommitArray,
view.isAmend())
.then(revision -> {
onCommitSuccess(revision);
if (view.isPushAfterCommit()) {
push(location);
}
view.close();
})
.catchError(error -> {
handleError(error.getCause());
});
})
.catchError(error -> {
notificationManager.notify(constant.addFailed(), FAIL, FLOAT_MODE);
<<<<<<<
@VisibleForTesting
void doCommit(final String message, final boolean addAll, final boolean commitAll, final boolean amend) {
final Resource[] resources = appContext.getResources();
checkState(resources != null);
service.commit(
project.getLocation(),
message,
addAll,
commitAll ? new Path[]{} : toRelativePaths(resources),
amend)
.then(new Operation<Revision>() {
@Override
public void apply(Revision revision) throws OperationException {
onCommitSuccess(revision);
view.close();
=======
@Override
public void setAmendCommitMessage() {
service.log(appContext.getDevMachine(), project.getLocation(), null, -1, -1, false)
.then(log -> {
String message = "";
final Revision revision = getFirst(log.getCommits(), null);
if (revision != null) {
message = revision.getMessage();
>>>>>>>
@Override
public void setAmendCommitMessage() {
service.log(project.getLocation(), null, -1, -1, false)
.then(log -> {
String message = "";
final Revision revision = getFirst(log.getCommits(), null);
if (revision != null) {
message = revision.getMessage();
<<<<<<<
/** {@inheritDoc} */
@Override
public void onCancelClicked() {
view.close();
}
/** {@inheritDoc} */
@Override
public void onValueChanged() {
String message = view.getMessage();
view.setEnableCommitButton(!message.isEmpty());
}
/** {@inheritDoc} */
@Override
public void setAmendCommitMessage() {
service.log(project.getLocation(), null, false)
.then(new Operation<LogResponse>() {
@Override
public void apply(LogResponse log) throws OperationException {
final List<Revision> commits = log.getCommits();
String message = "";
if (commits != null && (!commits.isEmpty())) {
final Revision tip = commits.get(0);
if (tip != null) {
message = tip.getMessage();
}
}
CommitPresenter.this.view.setMessage(message);
CommitPresenter.this.view.setEnableCommitButton(!message.isEmpty());
}
})
.catchError(new Operation<PromiseError>() {
@Override
public void apply(PromiseError error) throws OperationException {
if (getErrorCode(error.getCause()) == ErrorCodes.INIT_COMMIT_WAS_NOT_PERFORMED) {
dialogFactory.createMessageDialog(constant.commitTitle(),
constant.initCommitWasNotPerformed(),
null).show();
} else {
CommitPresenter.this.view.setMessage("");
notificationManager.notify(constant.logFailed(), FAIL, NOT_EMERGE_MODE);
}
}
});
}
=======
>>>>>>> |
<<<<<<<
appContext.getWsAgentServerApiEndpoint() + servicePath + "pom/reconcile?pompath=" + pomPath;
=======
appContext.getDevMachine().getWsAgentBaseUrl()
+ servicePath
+ "pom/reconcile?pompath="
+ encodePath(valueOf(pomPath));
>>>>>>>
appContext.getWsAgentServerApiEndpoint()
+ servicePath
+ "pom/reconcile?pompath="
+ encodePath(valueOf(pomPath)); |
<<<<<<<
=======
import org.eclipse.che.api.core.jsonrpc.commons.RequestTransmitter;
import org.eclipse.che.api.core.model.project.SourceStorage;
>>>>>>>
import org.eclipse.che.api.core.jsonrpc.commons.RequestTransmitter; |
<<<<<<<
// installers
Multibinder<Installer> installers = Multibinder.newSetBinder(binder(), Installer.class);
installers.addBinding().to(SshInstaller.class);
installers.addBinding().to(UnisonInstaller.class);
installers.addBinding().to(ExecInstaller.class);
installers.addBinding().to(TerminalInstaller.class);
installers.addBinding().to(WsInstaller.class);
installers.addBinding().to(LSPhpInstaller.class);
installers.addBinding().to(LSPythonInstaller.class);
installers.addBinding().to(LSJsonInstaller.class);
installers.addBinding().to(LSCSharpInstaller.class);
installers.addBinding().to(LSTypeScriptInstaller.class);
installers.addBinding().to(GitCredentialsInstaller.class);
=======
bind(org.eclipse.che.api.workspace.server.WorkspaceValidator.class)
.to(org.eclipse.che.api.workspace.server.DefaultWorkspaceValidator.class);
bind(org.eclipse.che.api.workspace.server.event.MachineStateListener.class).asEagerSingleton();
// agents
bind(org.eclipse.che.api.agent.server.AgentRegistry.class).to(org.eclipse.che.api.agent.server.impl.AgentRegistryImpl.class);
Multibinder<Agent> agents = Multibinder.newSetBinder(binder(), Agent.class);
agents.addBinding().to(SshAgent.class);
agents.addBinding().to(UnisonAgent.class);
agents.addBinding().to(org.eclipse.che.api.agent.ExecAgent.class);
agents.addBinding().to(org.eclipse.che.api.agent.TerminalAgent.class);
agents.addBinding().to(WsAgent.class);
agents.addBinding().to(LSPhpAgent.class);
agents.addBinding().to(LSPythonAgent.class);
agents.addBinding().to(LSJsonAgent.class);
agents.addBinding().to(LSCSharpAgent.class);
agents.addBinding().to(LSTypeScriptAgent.class);
agents.addBinding().to(GitCredentialsAgent.class);
Multibinder<AgentLauncher> launchers = Multibinder.newSetBinder(binder(), AgentLauncher.class);
launchers.addBinding().to(WsAgentLauncher.class);
launchers.addBinding().to(org.eclipse.che.api.agent.ExecAgentLauncher.class);
launchers.addBinding().to(org.eclipse.che.api.agent.TerminalAgentLauncher.class);
launchers.addBinding().to(SshAgentLauncher.class);
bindConstant().annotatedWith(Names.named("machine.ws_agent.run_command"))
.to("export JPDA_ADDRESS=\"4403\" && ~/che/ws-agent/bin/catalina.sh jpda run");
bindConstant().annotatedWith(Names.named("machine.terminal_agent.run_command"))
.to("$HOME/che/terminal/che-websocket-terminal " +
"-addr :4411 " +
"-cmd ${SHELL_INTERPRETER} " +
"-enable-activity-tracking");
bindConstant().annotatedWith(Names.named("machine.exec_agent.run_command"))
.to("$HOME/che/exec-agent/che-exec-agent " +
"-addr :4412 " +
"-cmd ${SHELL_INTERPRETER} " +
"-logs-dir $HOME/che/exec-agent/logs");
>>>>>>>
// installers
Multibinder<Installer> installers = Multibinder.newSetBinder(binder(), Installer.class);
installers.addBinding().to(SshInstaller.class);
installers.addBinding().to(UnisonInstaller.class);
installers.addBinding().to(ExecInstaller.class);
installers.addBinding().to(TerminalInstaller.class);
installers.addBinding().to(WsInstaller.class);
installers.addBinding().to(LSPhpInstaller.class);
installers.addBinding().to(LSPythonInstaller.class);
installers.addBinding().to(LSJsonInstaller.class);
installers.addBinding().to(LSCSharpInstaller.class);
installers.addBinding().to(LSTypeScriptInstaller.class);
installers.addBinding().to(GitCredentialsInstaller.class);
<<<<<<<
// bind(org.eclipse.che.api.environment.server.MachineInstanceProvider.class)
// .to(org.eclipse.che.plugin.docker.machine.MachineProviderImpl.class);
=======
install(new org.eclipse.che.api.workspace.server.activity.inject.WorkspaceActivityModule());
bind(org.eclipse.che.api.environment.server.MachineInstanceProvider.class)
.to(org.eclipse.che.plugin.docker.machine.MachineProviderImpl.class);
>>>>>>>
// bind(org.eclipse.che.api.environment.server.MachineInstanceProvider.class)
// .to(org.eclipse.che.plugin.docker.machine.MachineProviderImpl.class);
install(new org.eclipse.che.api.workspace.server.activity.inject.WorkspaceActivityModule()); |
<<<<<<<
import org.eclipse.che.api.core.model.workspace.config.ProjectConfig;
import org.eclipse.che.api.core.model.workspace.config.SourceStorage;
=======
import java.util.stream.Collectors;
import org.eclipse.che.api.core.model.project.ProjectConfig;
import org.eclipse.che.api.core.model.project.ProjectProblem;
import org.eclipse.che.api.core.model.project.SourceStorage;
>>>>>>>
import java.util.stream.Collectors;
import org.eclipse.che.api.core.model.project.ProjectProblem;
import org.eclipse.che.api.core.model.workspace.config.ProjectConfig;
import org.eclipse.che.api.core.model.workspace.config.SourceStorage; |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.