conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
URICOLL(FNURI, FNGen.class, 0, 1, "uri-collection([string])", STR_ZO, URI_ZM),
=======
URICOLL(FNURI, FNGen.class, 0, 1, "uri-collection([uri])", URI_ZM),
>>>>>>>
URICOLL(FNURI, FNGen.class, 0, 1, "uri-collection([uri])", STR_ZO, URI_ZM),
<<<<<<<
/* FNOut functions. */
/** XQuery function. */
ERROR(FNURI, FNInfo.class, 0, 3, "error([code[,desc[,object]]])",
QNM_ZO, STR, ITEM_ZM, ITEM_Z),
/** XQuery function. */
TRACE(FNURI, FNInfo.class, 2, 2, "trace(item,msg)", ITEM_ZM, STR, ITEM_ZM),
/** XQuery function. */
ENV(FNURI, FNInfo.class, 1, 1, "environment-variable(string)", STR, STR_ZO),
/** XQuery function. */
ENVS(FNURI, FNInfo.class, 0, 0, "available-environment-variables()", STR_ZM),
=======
>>>>>>> |
<<<<<<<
coreVal = signature.validate(valContext);
} catch(final XMLSignatureException | SAXException | ParserConfigurationException |
IOException e) {
=======
return Bln.get(signature.validate(valContext));
} catch(final XMLSignatureException e) {
throw CX_IOEXC.get(info, e);
} catch(final SAXException e) {
throw CX_IOEXC.get(info, e);
} catch(final ParserConfigurationException e) {
throw CX_IOEXC.get(info, e);
} catch(final IOException e) {
>>>>>>>
return Bln.get(signature.validate(valContext));
} catch(final XMLSignatureException | SAXException | ParserConfigurationException |
IOException e) { |
<<<<<<<
import org.basex.query.item.Nod;
import org.basex.query.item.NodeType;
=======
import org.basex.query.item.ANode;
>>>>>>>
import org.basex.query.item.ANode;
import org.basex.query.item.NodeType;
<<<<<<<
final Nod n = root(i);
if(n == null || n.type != NodeType.DOC) CTXNODE.thrw(input);
=======
final ANode n = root(i);
if(n == null || n.type != Type.DOC) CTXNODE.thrw(input);
>>>>>>>
final ANode n = root(i);
if(n == null || n.type != NodeType.DOC) CTXNODE.thrw(input); |
<<<<<<<
=======
import org.basex.core.locks.*;
>>>>>>>
<<<<<<<
=======
import org.basex.query.util.*;
import org.basex.query.value.*;
>>>>>>>
import org.basex.query.value.*; |
<<<<<<<
if (key.getColumnFamily().equals(DataFileColumnFamily.NAME)) {
String[] sizeEntries = new String(entry.getValue().get(), Constants.UTF8).split(",");
=======
if (key.getColumnFamily().equals(Constants.METADATA_DATAFILE_COLUMN_FAMILY)) {
String[] sizeEntries = new String(entry.getValue().get(), UTF_8).split(",");
>>>>>>>
if (key.getColumnFamily().equals(DataFileColumnFamily.NAME)) {
String[] sizeEntries = new String(entry.getValue().get(), UTF_8).split(","); |
<<<<<<<
(val.item() ? (Item) val : val.iter(ctx).next()).type == NodeType.DOC;
=======
(val.item() ? (Item) val : val.iter().next()).type == Type.DOC;
>>>>>>>
(val.item() ? (Item) val : val.iter().next()).type == NodeType.DOC; |
<<<<<<<
if(data.meta.users.drop(data.meta.users.get(user))) info(USER_DROPPED_X_X, user, db);
finishUpdate(data);
=======
if(data.meta.users.drop(data.meta.users.get(user))) {
info(USER_DROPPED_X_X, user, db);
data.meta.dirty = true;
}
if(!finishUpdate(data)) return false;
>>>>>>>
if(data.meta.users.drop(data.meta.users.get(user))) info(USER_DROPPED_X_X, user, db);
if(!finishUpdate(data)) return false; |
<<<<<<<
* Parses the "IntegerLiteral" rule.
* @param itr integer flag
=======
>>>>>>>
* Parses the "IntegerLiteral" rule.
* @param itr integer flag |
<<<<<<<
try (Scanner master = connMaster.createScanner(masterTable, Authorizations.EMPTY);
Scanner peer = connPeer.createScanner(peerTable, Authorizations.EMPTY)) {
Iterator<Entry<Key,Value>> masterIter = master.iterator(), peerIter = peer.iterator();
Entry<Key,Value> masterEntry = null, peerEntry = null;
while (masterIter.hasNext() && peerIter.hasNext()) {
masterEntry = masterIter.next();
peerEntry = peerIter.next();
Assert.assertEquals(masterEntry.getKey() + " was not equal to " + peerEntry.getKey(), 0,
masterEntry.getKey().compareTo(peerEntry.getKey(),
PartialKey.ROW_COLFAM_COLQUAL_COLVIS));
Assert.assertEquals(masterEntry.getValue(), peerEntry.getValue());
}
=======
Scanner master = connMaster.createScanner(masterTable, Authorizations.EMPTY),
peer = connPeer.createScanner(peerTable, Authorizations.EMPTY);
Iterator<Entry<Key,Value>> masterIter = master.iterator(), peerIter = peer.iterator();
Entry<Key,Value> masterEntry = null, peerEntry = null;
while (masterIter.hasNext() && peerIter.hasNext()) {
masterEntry = masterIter.next();
peerEntry = peerIter.next();
assertEquals(masterEntry.getKey() + " was not equal to " + peerEntry.getKey(), 0,
masterEntry.getKey().compareTo(peerEntry.getKey(),
PartialKey.ROW_COLFAM_COLQUAL_COLVIS));
assertEquals(masterEntry.getValue(), peerEntry.getValue());
}
>>>>>>>
try (Scanner master = connMaster.createScanner(masterTable, Authorizations.EMPTY);
Scanner peer = connPeer.createScanner(peerTable, Authorizations.EMPTY)) {
Iterator<Entry<Key,Value>> masterIter = master.iterator(), peerIter = peer.iterator();
Entry<Key,Value> masterEntry = null, peerEntry = null;
while (masterIter.hasNext() && peerIter.hasNext()) {
masterEntry = masterIter.next();
peerEntry = peerIter.next();
assertEquals(masterEntry.getKey() + " was not equal to " + peerEntry.getKey(), 0,
masterEntry.getKey().compareTo(peerEntry.getKey(),
PartialKey.ROW_COLFAM_COLQUAL_COLVIS));
assertEquals(masterEntry.getValue(), peerEntry.getValue());
}
<<<<<<<
Assert.assertFalse("Had more data to read from the master", masterIter.hasNext());
Assert.assertFalse("Had more data to read from the peer", peerIter.hasNext());
}
=======
assertFalse("Had more data to read from the master", masterIter.hasNext());
assertFalse("Had more data to read from the peer", peerIter.hasNext());
>>>>>>>
assertFalse("Had more data to read from the master", masterIter.hasNext());
assertFalse("Had more data to read from the peer", peerIter.hasNext());
} |
<<<<<<<
import static org.basex.data.DataText.*;
import java.io.IOException;
=======
import static org.basex.api.webdav.BXResourceFactory.*;
>>>>>>>
import static org.basex.api.webdav.BXResourceFactory.*;
<<<<<<<
import org.basex.core.BaseXException;
=======
import org.basex.core.BaseXException;
import org.basex.core.Command;
>>>>>>>
import org.basex.core.BaseXException;
import org.basex.core.Command;
<<<<<<<
import org.basex.core.Prop;
import org.basex.core.cmd.Close;
import org.basex.core.cmd.Open;
import org.basex.data.MetaData;
import org.basex.io.DataInput;
import org.basex.io.IO;
import org.basex.util.StringList;
=======
import org.basex.core.cmd.CreateDB;
>>>>>>>
import org.basex.core.cmd.Close;
import org.basex.core.cmd.CreateDB;
import org.basex.core.cmd.Open;
import org.basex.util.StringList;
<<<<<<<
final List<BXResource> dbs = new ArrayList<BXResource>();
// Get all databases
final StringList list = org.basex.core.cmd.List.list(ctx);
for(final String db : list) {
try {
new Open(db).execute(ctx);
if(ctx.data.meta.ndocs > 1) {
dbs.add(new BXDatabaseCollection(db, ctx));
} else if (ctx.data.meta.ndocs == 1) {
dbs.add(new BXDatabaseResource(db));
}
} catch(BaseXException e) {
try {
new Close().execute(ctx);
} catch(BaseXException e1) {
// TODO Auto-generated catch block
e1.printStackTrace();
}
e.printStackTrace();
}
}
try {
new Close().execute(ctx);
} catch(BaseXException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
=======
final List<BXResource> dbs = new ArrayList<BXResource>();
for(final String d : listDatabases(ctx))
dbs.add(isCollection(ctx, d) ?
new BXCollectionDatabaseResource(ctx, d) :
new BXDocumentResource(ctx, d));
>>>>>>>
final List<BXResource> dbs = new ArrayList<BXResource>();
// Get all databases
final StringList list = org.basex.core.cmd.List.list(ctx);
for(final String db : list) {
try {
new Open(db).execute(ctx);
if(ctx.data.meta.ndocs > 1) {
dbs.add(new BXDatabaseCollection(db, ctx));
} else if (ctx.data.meta.ndocs == 1) {
dbs.add(new BXDocumentResource(ctx, db));
}
} catch(BaseXException e) {
try {
new Close().execute(ctx);
} catch(BaseXException e1) {
// TODO Auto-generated catch block
e1.printStackTrace();
}
e.printStackTrace();
}
}
try {
new Close().execute(ctx);
} catch(BaseXException e) {
// TODO Auto-generated catch block
e.printStackTrace();
} |
<<<<<<<
=======
final int s = size();
final int last = s - 1;
// create a sorted list of all keys: allows faster binary search
final TokenList allkeys = new TokenList(map).sort(true);
>>>>>>>
<<<<<<<
public synchronized void replace(final byte[] old, final byte[] key, final int id) {
// delete the id from the old key
final int p = get(old);
if(p >= 0) {
final int[] tmp = { id };
if(deleteIds(p, old, tmp) == 0) {
tmp[0] = p;
deleteKeys(tmp);
}
=======
public synchronized void delete(final TokenObjMap<IntList> map) {
// create a sorted list of all keys: allows faster binary search
final TokenList allkeys = new TokenList(map).sort(true);
// delete ids and create a list of the key positions which should be deleted
final IntList empty = new IntList(map.size());
int p = -1;
final int s = size();
for(final byte[] key : allkeys) {
p = get(key, ++p, s);
if(p < 0) throw Util.notExpected("Tried to delete ids " + map.get(key) +
" of non-existing index key: '" + string(key) + '\'');
else if(deleteIds(p, key, map.get(key).sort().toArray()) == 0) empty.add(p);
>>>>>>>
public synchronized void replace(final byte[] old, final byte[] key, final int id) {
// delete the id from the old key
final int p = get(old);
if(p >= 0) {
final int[] tmp = { id };
if(deleteIds(p, old, tmp)) {
tmp[0] = p;
deleteKeys(tmp);
}
<<<<<<<
size.set(sz - k);
=======
size(s - j);
}
@Override
public synchronized void replace(final byte[] old, final byte[] key, final int id) {
// delete the id from the old key
final int p = get(old);
if(p >= 0) {
final int[] tmp = { id};
if(deleteIds(p, old, tmp) == 0) {
// the old key remains empty: delete it
cache.delete(old);
tmp[0] = p;
deleteKeys(tmp);
}
}
// add the id to the new key
insertId(key, id);
>>>>>>>
size(sz - k);
<<<<<<<
// create space for new entry
final int sz = size.get();
for(int i = sz; i > index; --i) writeRef(i, i - 1);
=======
// shift all entries with bigger keys to the right
final int s = size();
for(int i = s; i > ix; --i)
idxr.write5(i * 5L, idxr.read5((i - 1) * 5L));
>>>>>>>
// create space for new entry
final int sz = size();
for(int i = sz; i > index; --i) writeRef(i, i - 1);
<<<<<<<
* Returns a new array which contains the id distances in ascending order.
=======
* Assigns the number of index entries.
* @param sz number of index entries
*/
private void size(final int sz) {
size.set(sz);
idxl.write4(0, sz);
}
/**
* Sort and calculate the differences between a list of ids.
>>>>>>>
* Assigns the number of index entries.
* @param sz number of index entries
*/
private void size(final int sz) {
size.set(sz);
idxl.write4(0, sz);
}
/**
* Returns a new array which contains the id distances in ascending order. |
<<<<<<<
final Data data = CONTEXT.data();
data.startUpdate();
data.update(7, Data.ATTR, NAME, Token.EMPTY);
data.update(7, Data.ATTR, JUNIT);
data.finishUpdate();
=======
final Data data = context.data();
data.update(7, Data.ATTR, T_NAME, Token.EMPTY);
data.update(7, Data.ATTR, T_JUNIT);
>>>>>>>
final Data data = context.data();
data.startUpdate();
data.update(7, Data.ATTR, T_NAME, Token.EMPTY);
data.update(7, Data.ATTR, T_JUNIT);
data.finishUpdate();
<<<<<<<
final Data data = CONTEXT.data();
data.startUpdate();
data.update(8, Data.ATTR, NAME, Token.EMPTY);
data.update(8, Data.ATTR, JUNIT);
data.finishUpdate();
=======
final Data data = context.data();
data.update(8, Data.ATTR, T_NAME, Token.EMPTY);
data.update(8, Data.ATTR, T_JUNIT);
>>>>>>>
final Data data = context.data();
data.startUpdate();
data.update(8, Data.ATTR, T_NAME, Token.EMPTY);
data.update(8, Data.ATTR, T_JUNIT);
data.finishUpdate(); |
<<<<<<<
case NSURIPRE: // TODO [LW][LK] broken...
=======
case NSURIPRE: // [LW][LK] broken...
// [LK] find out if inherit flag has a persistent effect
>>>>>>>
case NSURIPRE: // [LW][LK] broken...
// [LK] find out if inherit flag has a persistent effect
<<<<<<<
// [LK] find out if inherit flag has a persistent effect - if positive,
// we're screwed. test case added to unresolved namespace tests.
final ANode an = (ANode) checkType(it2, NodeType.ELM);
final Atts at = an.nsScope(copiedNod(an, ctx) ? ctx.nsInherit : true);
=======
final ANode an = (ANode) checkType(it2, Type.ELM);
final Atts at = an.nsScope(!copiedNod(an, ctx) || ctx.nsInherit);
>>>>>>>
final ANode an = (ANode) checkType(it2, NodeType.ELM);
final Atts at = an.nsScope(!copiedNod(an, ctx) || ctx.nsInherit); |
<<<<<<<
String VERSION = "";
=======
String VERSION = "6.6.3 beta";
>>>>>>>
String VERSION = "6.6.3 beta";
<<<<<<<
"[" + CmdCreate.DATABASE + "|" +
CmdCreate.INDEX + "|" + CmdCreate.USER + "|" +
CmdCreate.TRIGGER + "] [...]",
=======
"[" + CmdCreate.DATABASE + "|" + CmdCreate.INDEX + "|" +
CmdCreate.USER + "|" + CmdCreate.BACKUP + "] [...]",
>>>>>>>
"[" + CmdCreate.DATABASE + "|" + CmdCreate.INDEX + "|" +
CmdCreate.USER + "|" + CmdCreate.BACKUP + CmdCreate.TRIGGER + "] [...]",
<<<<<<<
"[" + CmdDrop.DB + "|" + CmdDrop.INDEX + "|" + CmdDrop.USER + "|"
+ CmdDrop.TRIGGER + "] [...]",
=======
"[" + CmdDrop.BACKUP + "|" + CmdDrop.DATABASE + "|" +
CmdDrop.INDEX + "|" + CmdDrop.USER + "] [...]",
>>>>>>>
"[" + CmdDrop.BACKUP + "|" + CmdDrop.DATABASE + "|" +
CmdDrop.INDEX + "|" + CmdDrop.USER + CmdDrop.TRIGGER + "] [...]",
<<<<<<<
LI + CmdDrop.USER + " [" + C_NAME + "] (" + ON + " [db]): " + NL + " " +
lang("ch_drop23") + NL +
LI + CmdDrop.BACKUP + " [" + C_NAME + "]:" + NL + " " +
lang("ch_drop24", C_NAME) + NL +
LI + CmdDrop.TRIGGER + " [" + C_NAME + "]:" + NL + " " +
lang("ch_drop25", C_NAME)
=======
LI + CmdDrop.USER + " [" + C_NAME + "] (" + ON + " [database]): " + NL +
" " + lang("ch_drop23")
>>>>>>>
LI + CmdDrop.USER + " [" + C_NAME + "] (" + ON + " [database]): " + NL +
" " + lang("ch_drop23") +
LI + CmdDrop.TRIGGER + " [" + C_NAME + "]:" + NL + " " +
lang("ch_drop25", C_NAME)
<<<<<<<
LI + CmdShow.USERS + " (" + ON + " [db]): " + lang("ch_show24") + NL +
LI + CmdShow.BACKUPS + ": " + lang("ch_show25") + NL +
LI + CmdShow.TRIGGERS + ": " + lang("ch_show26")
=======
LI + CmdShow.USERS + " (" + ON + " [database]): " + lang("ch_show24") + NL +
LI + CmdShow.BACKUPS + ": " + lang("ch_show25")
>>>>>>>
LI + CmdShow.USERS + " (" + ON + " [database]): " + lang("ch_show24") + NL +
LI + CmdShow.BACKUPS + ": " + lang("ch_show25") + NL +
LI + CmdShow.TRIGGERS + ": " + lang("ch_show26") |
<<<<<<<
=======
/** Module loader. */
private ModuleLoader modules;
/** Opened connections to relational databases. */
private JDBCConnections jdbc;
/** Opened connections to relational databases. */
private ClientSessions sessions;
>>>>>>>
<<<<<<<
this(ctx, null);
resources = new QueryResources(this);
}
/**
* Constructor.
* @param context database context
* @param parent parent context (optional)
*/
private QueryContext(final Context context, final QueryContext parent) {
this.context = context;
this.parentCtx = parent;
nodes = context.current();
=======
context = ctx;
>>>>>>>
this(ctx, null);
resources = new QueryResources(this);
}
/**
* Constructor.
* @param context database context
* @param parent parent context (optional)
*/
private QueryContext(final Context context, final QueryContext parent) {
this.context = context;
this.parentCtx = parent;
<<<<<<<
=======
* Returns the module loader.
* @return module loader
*/
public ModuleLoader modules() {
if(modules == null) modules = new ModuleLoader(context);
return modules;
}
/**
* Returns JDBC connections.
* @return jdbc connections
*/
public JDBCConnections jdbc() {
if(jdbc == null) jdbc = new JDBCConnections();
return jdbc;
}
/**
* Returns client sessions.
* @return client session
*/
public ClientSessions sessions() {
if(sessions == null) sessions = new ClientSessions();
return sessions;
}
/**
>>>>>>>
<<<<<<<
=======
// close database connections
resource.close();
// close JDBC connections
if(jdbc != null) jdbc.close();
// close client sessions
if(sessions != null) sessions.close();
// close dynamically loaded JAR files
if(modules != null) modules.close();
>>>>>>> |
<<<<<<<
if(!sc.mixUpdates && ann.contains(Ann.Q_UPDATING)) throw error(UPFUNCITEM);
=======
>>>>>>> |
<<<<<<<
final Data data = CONTEXT.data();
data.startUpdate();
data.update(10, Data.TEXT, JUNIT);
data.finishUpdate();
=======
final Data data = context.data();
data.update(10, Data.TEXT, T_JUNIT);
>>>>>>>
final Data data = context.data();
data.startUpdate();
data.update(10, Data.TEXT, T_JUNIT);
data.finishUpdate(); |
<<<<<<<
if(empty) return null;
checkNode(it);
return it.type != NodeType.ELM ? null : Bln.FALSE;
=======
if(it == null) return null;
return checkNode(it).type != Type.ELM ? null : Bln.FALSE;
>>>>>>>
if(it == null) return null;
return checkNode(it).type != NodeType.ELM ? null : Bln.FALSE;
<<<<<<<
if(empty || it.type == NodeType.PI) return Uri.EMPTY;
=======
if(it == null || it.type == Type.PI) return Uri.EMPTY;
>>>>>>>
if(it == null || it.type == NodeType.PI) return Uri.EMPTY; |
<<<<<<<
public FTxt(final byte[] t, final Nod p) {
super(NodeType.TXT);
=======
public FTxt(final byte[] t, final ANode p) {
super(Type.TXT);
>>>>>>>
public FTxt(final byte[] t, final ANode p) {
super(NodeType.TXT); |
<<<<<<<
import static org.basex.util.Token.*;
import java.io.IOException;
import javax.xml.bind.ParseConversionEvent;
import org.basex.core.BaseXException;
import org.basex.server.ClientQuery;
import org.basex.server.ClientSession;
import org.basex.util.StringList;
=======
>>>>>>>
import static org.basex.util.Token.*;
import javax.xml.bind.ParseConversionEvent;
<<<<<<<
/** XML mime type. */
static final String MIMETYPEXML = "text/xml";
/** File path separator. */
static final String DIRSEP = System.getProperty("file.separator");
=======
/** Not authorized resource. */
private static final Resource NOAUTH = new BXNotAuthorizedResource();
>>>>>>>
/** Not authorized resource. */
private static final Resource NOAUTH = new BXNotAuthorizedResource();
/** File path separator. */
static final String DIRSEP = System.getProperty("file.separator");
<<<<<<<
/**
* List all databases.
* @param cs session
* @return a list of database names
* @throws BaseXException query exception
*/
static StringList listDatabases(final ClientSession cs) throws BaseXException {
final StringList result = new StringList();
final ClientQuery q = cs.query("db:list()");
while(q.more())
result.add(q.next());
return result;
}
/**
* Is the specified database a collection of documents?
* @param cs session
* @param db database name
* @return <code>true</code> if the database has more than one document
* @throws BaseXException query exception
*/
static boolean isCollection(final ClientSession cs, final String db)
throws BaseXException {
return "0".equals(cs.query("count(collection('" + db + "'))").execute());
}
/**
* Get a valid database name from a general file name.
* @param n name
* @return valid database name
*/
static String dbname(final String n) {
final int i = n.lastIndexOf(".");
return (i != -1 ? n.substring(0, i) : n).replaceAll("[^\\w-]", "");
}
/**
* Login to the database server.
* @param auth user authentication
* @return object representing the new client session
* @throws IOException I/O exception
*/
static ClientSession login(final Auth auth) throws IOException {
final String host = System.getProperty(DBHOST);
final int port = Integer.parseInt(System.getProperty(DBPORT));
String user = System.getProperty(DBUSER);
String pass = System.getProperty(DBPASS);
if(user == null) {
if(auth == null) return null;
user = auth.getUser();
pass = auth.getPassword();
}
return new ClientSession(host, port, user, pass);
}
/**
* Login to the database server.
* @param u user name
* @param p user password
* @return object representing the new client session
* @throws IOException I/O exception
*/
static ClientSession login(final String u, final String p) throws IOException {
final String host = System.getProperty(DBHOST);
final int port = Integer.parseInt(System.getProperty(DBPORT));
String user = System.getProperty(DBUSER);
String pass = System.getProperty(DBPASS);
if(user == null) {
user = u;
pass = p;
}
return new ClientSession(host, port, user, pass);
}
=======
>>>>>>> |
<<<<<<<
module(path, uri, false);
}
/**
* Parses the specified module, checking function and variable references at the end.
* @param path file path
* @param uri module uri
* @param imprt if this is an imported module
* @throws QueryException query exception
*/
private void module(final byte[] path, final byte[] uri, final boolean imprt)
throws QueryException {
=======
>>>>>>>
<<<<<<<
final StaticContext sub = new StaticContext(ctx.context);
final LibraryModule lib = new QueryParser(qu, io.path(), ctx, sub).parseLibrary(!imprt);
=======
final StaticContext sub = new StaticContext(sc.xquery3());
final LibraryModule lib = new QueryParser(qu, io.path(), ctx, sub).parseLibrary(false);
>>>>>>>
final StaticContext sub = new StaticContext(ctx.context);
final LibraryModule lib = new QueryParser(qu, io.path(), ctx, sub).parseLibrary(false); |
<<<<<<<
import org.basex.query.QueryException;
import org.basex.query.item.Nod;
import org.basex.query.item.NodeType;
=======
import org.basex.query.item.ANode;
>>>>>>>
import org.basex.query.item.ANode;
import org.basex.query.item.NodeType; |
<<<<<<<
/**
* Prints exception message to standard error.
* @param ex exception
*/
static void handle(final Exception ex) {
Util.errln(ex.getMessage());
}
=======
/**
* Count the number of documents starting with a certain prefix.
* @param s active client session
* @param db database name
* @param path resource path
* @return number of documents
* @throws BaseXException query exception
*/
static int count(final Session s, final String db, final String path)
throws BaseXException {
final String dbpath = db + SEP + path;
final Query q = s.query("declare variable $d as xs:string external; "
+ "declare variable $p as xs:string external; "
+ "count(db:list($d)[starts-with(., $p)])");
q.bind("$d", dbpath);
q.bind("$p", path);
return parseInt(q.execute());
}
/**
* Count the number of documents which have a given name.
* @param s active client session
* @param db database name
* @param path resource path
* @return number of documents
* @throws BaseXException query exception
*/
static int countExact(final Session s, final String db, final String path)
throws BaseXException {
final String dbpath = db + SEP + path;
final Query q1 = s.query("declare variable $d as xs:string external; "
+ "declare variable $p as xs:string external; "
+ "count(db:list($d)[. = $p])");
q1.bind("$d", dbpath);
q1.bind("$p", path);
return parseInt(q1.execute());
}
/**
* Check a folder for a dummy document and delete it.
* @param s active client session
* @param db database name
* @param p path
* @return {@code true} if dummy document existed
* @throws BaseXException query exception
*/
static boolean deleteDummy(final Session s, final String db, final String p)
throws BaseXException {
final String dummy = p + SEP + DUMMY;
if(count(s, db, dummy) <= 0) return false;
// path contains dummy document
s.execute(new Open(db));
s.execute(new Delete(dummy));
return true;
}
>>>>>>>
/**
* Prints exception message to standard error.
* @param ex exception
*/
static void handle(final Exception ex) {
Util.errln(ex.getMessage());
* @throws BaseXException query exception
*/
static int count(final Session s, final String db, final String path)
throws BaseXException {
final String dbpath = db + SEP + path;
final Query q = s.query("declare variable $d as xs:string external; "
+ "declare variable $p as xs:string external; "
+ "count(db:list($d)[starts-with(., $p)])");
q.bind("$d", dbpath);
q.bind("$p", path);
return parseInt(q.execute());
}
/**
* Count the number of documents which have a given name.
* @param s active client session
* @param db database name
* @param path resource path
* @return number of documents
* @throws BaseXException query exception
*/
static int countExact(final Session s, final String db, final String path)
throws BaseXException {
final String dbpath = db + SEP + path;
final Query q1 = s.query("declare variable $d as xs:string external; "
+ "declare variable $p as xs:string external; "
+ "count(db:list($d)[. = $p])");
q1.bind("$d", dbpath);
q1.bind("$p", path);
return parseInt(q1.execute());
}
/**
* Check a folder for a dummy document and delete it.
* @param s active client session
* @param db database name
* @param p path
* @return {@code true} if dummy document existed
* @throws BaseXException query exception
*/
static boolean deleteDummy(final Session s, final String db, final String p)
throws BaseXException {
final String dummy = p + SEP + DUMMY;
if(count(s, db, dummy) <= 0) return false;
// path contains dummy document
s.execute(new Open(db));
s.execute(new Delete(dummy));
return true;
} |
<<<<<<<
import org.basex.query.item.Nod;
import org.basex.query.item.NodeType;
import org.basex.query.iter.NodIter;
=======
import org.basex.query.item.ANode;
import org.basex.query.item.Type;
import org.basex.query.iter.NodeCache;
>>>>>>>
import org.basex.query.item.ANode;
import org.basex.query.item.NodeType;
import org.basex.query.iter.NodeCache; |
<<<<<<<
import org.basex.query.item.Nod;
import org.basex.query.item.NodeType;
=======
import org.basex.query.item.ANode;
import org.basex.query.item.Type;
>>>>>>>
import org.basex.query.item.ANode;
import org.basex.query.item.NodeType;
<<<<<<<
final Constr c = new Constr(ii, ctx, expr[1]);
final NodIter cList = c.children;
final NodIter aList = c.ats;
=======
final Constr c = new Constr(ctx, expr[1]);
final NodeCache cList = c.children;
final NodeCache aList = c.atts;
>>>>>>>
final Constr c = new Constr(ii, ctx, expr[1]);
final NodeCache cList = c.children;
final NodeCache aList = c.atts;
<<<<<<<
final Nod targ = before || after ? par : n;
if(targ.type != NodeType.ELM)
=======
final ANode targ = before || after ? par : n;
if(targ.type != Type.ELM)
>>>>>>>
final ANode targ = before || after ? par : n;
if(targ.type != NodeType.ELM) |
<<<<<<<
final QueryContext qc = ctx.proc(new QueryContext(ctx));
=======
>>>>>>> |
<<<<<<<
final int[] parStack = new int[IO.MAXHEIGHT];
final int[] tagStack = new int[IO.MAXHEIGHT];
final boolean path = p.is(Prop.PATHINDEX);
int level = 0;
int h = 0, n = 0;
=======
final IntList pars = new IntList();
final IntList tags = new IntList();
final boolean path = prop.is(Prop.PATHINDEX);
int n = 0;
>>>>>>>
final IntList pars = new IntList();
final IntList tags = new IntList();
final boolean path = p.is(Prop.PATHINDEX);
int n = 0;
<<<<<<<
if(h < level) h = level;
if(c != null) c.pre = pre;
=======
>>>>>>>
if(c != null) c.pre = pre; |
<<<<<<<
return (var.type != null ? var.type.cast(v, ctx, input) : v).iter();
=======
return (ret != null ? ret.cast(v, ctx, input) : v).iter(ctx);
>>>>>>>
return (ret != null ? ret.cast(v, ctx, input) : v).iter(); |
<<<<<<<
"[" + CmdCreate.DB + "|" + CmdCreate.FS + "|" +
CmdCreate.INDEX + "|" + CmdCreate.USER + "|"
+ CmdCreate.TRIGGER + "] [...]",
=======
"[" + CmdCreate.DATABASE + "|" +
CmdCreate.INDEX + "|" + CmdCreate.USER + "] [...]",
>>>>>>>
"[" + CmdCreate.DATABASE + "|" +
CmdCreate.INDEX + "|" + CmdCreate.USER + "|" +
CmdCreate.TRIGGER + "] [...]",
<<<<<<<
LI + CmdCreate.FS + " [" + C_NAME + "] [" + C_PATH +
"] ([mountpoint] [store]):" + NL +
" " + lang("ch_create6", C_NAME, C_PATH) + NL +
" " + lang("ch_create7", "mountpoint", "backingstore") + NL +
LI + CmdCreate.USER + " [" + C_NAME + "] ([" + C_PW + "]): " + NL +
" " + lang("ch_create8") + NL +
LI + CmdCreate.TRIGGER + " [" + C_NAME + "]: " + NL +
" " + lang("ch_create9")
=======
LI + CmdCreate.USER + " [" + C_NAME + "] ([" + C_PW + "]):" + NL +
" " + lang("ch_create8")
>>>>>>>
LI + CmdCreate.USER + " [" + C_NAME + "] ([" + C_PW + "]):" + NL +
" " + lang("ch_create8") + NL +
LI + CmdCreate.TRIGGER + " [" + C_NAME + "]: " + NL +
" " + lang("ch_create9") |
<<<<<<<
final Uri uri = (Uri) checkType(expr[0].item(ctx, input), AtomType.URI);
final String file = IOFile.file(uri.toJava().toString());
=======
final Uri uri = (Uri) checkType(expr[0].item(ctx, input), Type.URI);
final String file = IOFile.file(string(uri.atom()));
>>>>>>>
final Uri uri = (Uri) checkType(expr[0].item(ctx, input), AtomType.URI);
final String file = IOFile.file(string(uri.atom())); |
<<<<<<<
=======
import org.apache.logging.log4j.core.Logger;
>>>>>>>
<<<<<<<
private static Logger LOGGER = LoggerFactory.getLogger(UserController.class);
=======
//private static Logger log = Logger.getLogger(UserController.class);
>>>>>>>
private static Logger LOGGER = LoggerFactory.getLogger(UserController.class);
<<<<<<<
// LOGGER.debug("**************All**************");
=======
//log.debug("**************All**************");
>>>>>>>
LOGGER.debug("**************All**************");
<<<<<<<
// LOGGER.debug("************** Delete : id=" + id + "**************");
=======
//log.debug("************** Delete : id=" + id + "**************");
>>>>>>>
LOGGER.debug("************** Delete : id=" + id + "**************");
<<<<<<<
// LOGGER.error("Exception on delete user:", e);
=======
//log.error("Exception on delete user:", e);
>>>>>>>
LOGGER.error("Exception on delete user:", e); |
<<<<<<<
=======
models.add(Brand.class);
>>>>>>>
models.add(Brand.class);
<<<<<<<
=======
Brand b = new Brand();
b.setName("Copcal");
b.save(getContext());
>>>>>>>
Brand b = new Brand();
b.setName("Copcal");
b.save(getContext());
<<<<<<<
=======
b1.setBrand(b);
>>>>>>>
b1.setBrand(b); |
<<<<<<<
/*
* Tencent is pleased to support the open source community by making Angel available.
*
* Copyright (C) 2017-2018 THL A29 Limited, a Tencent company. All rights reserved.
*
* 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://opensource.org/licenses/Apache-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.
*
*/
package com.tencent.angel.psagent.matrix.transport.adapter;
public enum UserRequestType {
GET_ROW, GET_ROWS, UPDATER, FLUSH
}
=======
/*
* Tencent is pleased to support the open source community by making Angel available.
*
* Copyright (C) 2017 THL A29 Limited, a Tencent company. All rights reserved.
*
* Licensed under the BSD 3-Clause License (the "License"); you may not use this file except in
* compliance with the License. You may obtain a copy of the License at
*
* https://opensource.org/licenses/BSD-3-Clause
*
* 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.
*/
package com.tencent.angel.psagent.matrix.transport.adapter;
public enum UserRequestType {
GET_ROW, GET_ROWS, UPDATER, FLUSH, PLUS
}
>>>>>>>
/*
* Tencent is pleased to support the open source community by making Angel available.
*
* Copyright (C) 2017-2018 THL A29 Limited, a Tencent company. All rights reserved.
*
* 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://opensource.org/licenses/Apache-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.
*
*/
package com.tencent.angel.psagent.matrix.transport.adapter;
public enum UserRequestType {
GET_ROW, GET_ROWS, UPDATER, FLUSH, PLUS
} |
<<<<<<<
String savePath = LOCAL_FS + TMP_PATH + "/model/wideDeep";
//String savePath = "file:///E:/model/DCN";
=======
//String savePath = LOCAL_FS + TMP_PATH + "/model/wideDeep";
String savePath = LOCAL_FS + TMP_PATH + "/model/DCN";
>>>>>>>
//String savePath = "file:///E:/model/DCN";
String savePath = LOCAL_FS + TMP_PATH + "/model/DCN"; |
<<<<<<<
byte[] saltAsBytes = salt.getBytes(StandardCharsets.UTF_8);
byte[] derived = scrypt(Utils.fromCharSequenceToBytes(plainTextPassword), saltAsBytes, derivedKeyLength);
=======
byte[] saltAsBytes = Utils.fromCharSequenceToBytes(salt);
byte[] derived = scrypt(Utils.fromCharSequenceToBytes(plainTextPassword), saltAsBytes, 64);
>>>>>>>
byte[] saltAsBytes = Utils.fromCharSequenceToBytes(salt);
byte[] derived = scrypt(Utils.fromCharSequenceToBytes(plainTextPassword), saltAsBytes, derivedKeyLength); |
<<<<<<<
=======
@Deprecated
public A getSafe(Entity e, boolean forceNewInstance) {
A component = mapper.getSafe(e);
if(component == null && forceNewInstance) {
component = mapper.create(e);
}
return component;
}
>>>>>>>
@Deprecated
public A getSafe(Entity e, boolean forceNewInstance) {
A component = mapper.getSafe(e);
if(component == null && forceNewInstance) {
component = mapper.create(e);
}
return component;
}
<<<<<<<
/**
* @deprecated as of odb version 2.0.0 {@see #get} is as safe as getSafe.
*/
@Deprecated
=======
@Deprecated
>>>>>>>
/**
* @deprecated as of odb version 2.0.0 {@see #get} is as safe as getSafe.
*/
@Deprecated
<<<<<<<
/**
* @deprecated as of odb version 2.0.0 {@see #get} is as safe as getSafe.
*/
=======
@Deprecated
>>>>>>>
/**
* @deprecated as of odb version 2.0.0 {@see #get} is as safe as getSafe.
*/
<<<<<<<
=======
public A get(Entity e, boolean forceNewInstance) throws ArrayIndexOutOfBoundsException {
A component = mapper.get(e);
if(component == null && forceNewInstance) {
component = mapper.create(e);
}
return component;
}
public A get(int entityId, boolean forceNewInstance) throws ArrayIndexOutOfBoundsException {
A component = mapper.get(entityId);
if(component == null && forceNewInstance) {
component = mapper.create(entityId);
}
return component;
}
@Deprecated
public A getSafe(int entityId, boolean forceNewInstance) {
A component = mapper.getSafe(entityId);
if(component == null && forceNewInstance) {
component = mapper.create(entityId);
}
return component;
}
>>>>>>>
public A get(Entity e, boolean forceNewInstance) throws ArrayIndexOutOfBoundsException {
A component = mapper.get(e);
if(component == null && forceNewInstance) {
component = mapper.create(e);
}
return component;
}
public A get(int entityId, boolean forceNewInstance) throws ArrayIndexOutOfBoundsException {
A component = mapper.get(entityId);
if(component == null && forceNewInstance) {
component = mapper.create(entityId);
}
return component;
}
@Deprecated
public A getSafe(int entityId, boolean forceNewInstance) {
A component = mapper.getSafe(entityId);
if(component == null && forceNewInstance) {
component = mapper.create(entityId);
}
return component;
} |
<<<<<<<
Condition currentcondition = rules.getCondition(conditionid);
ConditionHistory ch = null;
=======
Condition currentcondition = RulesEngineImpl.getCondition(conditionid);
ConditionHistory aConditionHistory = null;
>>>>>>>
Condition currentcondition = rules.getCondition(conditionid);
ConditionHistory aConditionHistory = null; |
<<<<<<<
=======
import java.util.Map;
>>>>>>>
import java.util.Map;
<<<<<<<
=======
private Map<String, String> helps = null;
public void setHelps(Map<String, String> helps)
{
this.helps = helps;
}
public String getHelpUrl(String isoCode)
{
String url = null;
if (this.helps != null)
{
url = helps.get(isoCode);
}
return url;
}
>>>>>>>
private Map<String, String> helps = null;
public void setHelps(Map<String, String> helps) |
<<<<<<<
/**
* @param filename
* @param patterns
* @return true if the file matched one pattern, false if it did not
*/
private boolean fileMatchesOnePattern(String filename, ArrayList<RE> patterns)
{
// first check whether any include matches
for (RE pattern : patterns)
{
if (pattern.match(filename))
{
return true;
}
}
return false;
}
/**
* @param fileNamePatterns A list of file name patterns (in ant fileset syntax)
* @param recompiler The regular expression compiler (used to speed up RE compiling).
* @return List of org.apache.regexp.RE
*/
private List<RE> preparePatterns(ArrayList<String> fileNamePatterns, RECompiler recompiler)
{
ArrayList<RE> result = new ArrayList<RE>();
for (String element : fileNamePatterns)
{
if ((element != null) && (element.length() > 0))
{
// substitute variables in the pattern
element = variableSubstitutor.substitute(element, SubstitutionType.TYPE_PLAIN);
// check whether the pattern is absolute or relative
File file = new File(element);
// if it is relative, make it absolute and prepend the
// installation path
// (this is a bit dangerous...)
if (!file.isAbsolute())
{
element = new File(this.absolute_installpath, element).toString();
}
// now parse the element and construct a regular expression from
// it
// (we have to parse it one character after the next because
// every
// character should only be processed once - it's not possible
// to get this
// correct using regular expression replacing)
StringBuffer element_re = new StringBuffer();
int lookahead = -1;
int pos = 0;
while (pos < element.length())
{
char c;
if (lookahead != -1)
{
c = (char) lookahead;
lookahead = -1;
}
else
{
c = element.charAt(pos++);
}
switch (c)
{
case '/':
{
element_re.append(File.separator);
break;
}
// escape backslash and dot
case '\\':
case '.':
{
element_re.append("\\");
element_re.append(c);
break;
}
case '*':
{
if (pos == element.length())
{
element_re.append("[^").append(File.separator).append("]*");
break;
}
lookahead = element.charAt(pos++);
// check for "**"
if (lookahead == '*')
{
element_re.append(".*");
// consume second star
lookahead = -1;
}
else
{
element_re.append("[^").append(File.separator).append("]*");
// lookahead stays there
}
break;
}
default:
{
element_re.append(c);
break;
}
} // switch
}
// make sure that the whole expression is matched
element_re.append('$');
// replace \ by \\ and create a RE from the result
try
{
result.add(new RE(recompiler.compile(element_re.toString())));
}
catch (RESyntaxException e)
{
this.handler.emitNotification("internal error: pattern \"" + element
+ "\" produced invalid RE \"" + file.getPath() + "\"");
}
}
}
return result;
}
=======
>>>>>>>
<<<<<<<
File dirToScan = scanstack.pop();
File[] files = dirToScan.listFiles();
=======
File newFile = new File(ds.getBasedir(), srcFiles[i]);
>>>>>>>
File newFile = new File(ds.getBasedir(), srcFiles[i]);
<<<<<<<
if (!file.isDirectory())
// skip directories - they cannot be removed safely yet
{
// this.handler.emitNotification("deleting " + f.getPath());
file.delete();
}
=======
f.delete();
}
for (File d : dirs_to_delete)
{
// Only empty directories will be deleted
d.delete();
>>>>>>>
file.delete();
}
for (File d : dirs_to_delete)
{
// Only empty directories will be deleted
d.delete(); |
<<<<<<<
import com.izforge.izpack.api.GuiId;
=======
import java.awt.Component;
import java.awt.Cursor;
import java.awt.Font;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
import java.awt.LayoutManager2;
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import javax.swing.*;
import javax.swing.plaf.metal.MetalLookAndFeel;
>>>>>>>
import com.izforge.izpack.api.GuiId;
import java.awt.Cursor;
import java.awt.Font;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
import java.awt.LayoutManager2;
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import javax.swing.*;
import javax.swing.plaf.metal.MetalLookAndFeel;
<<<<<<<
import com.izforge.izpack.util.substitutor.VariableSubstitutorImpl;
import javax.swing.*;
import javax.swing.plaf.metal.MetalLookAndFeel;
import java.awt.*;
import java.net.URL;
import java.util.ArrayList;
import java.util.Map;
=======
>>>>>>>
import java.util.Map;
<<<<<<<
buffer.delete(0, buffer.length());
buffer.append(alternateClass).append(".").append(subkey);
retval = installData.getLangpack().getString(buffer.toString());
=======
buf.delete(0, buf.length());
buf.append(alternateClass).append(".").append(subkey);
retval = installData.getLangpack().getString(buf.toString());
>>>>>>>
buffer.delete(0, buffer.length());
buffer.append(alternateClass).append(".").append(subkey);
retval = installData.getLangpack().getString(buffer.toString()); |
<<<<<<<
.getImageIcon("edit"), JLabel.TRAILING);
LayoutHelper.buildConstraints(gbConstraints, 0, 0, 1, 1, 1.0, 0.0);
=======
.get("edit"), JLabel.TRAILING);
parent.buildConstraints(gbConstraints, 0, 0, 1, 1, 1.0, 0.0);
>>>>>>>
.get("edit"), JLabel.TRAILING);
LayoutHelper.buildConstraints(gbConstraints, 0, 0, 1, 1, 1.0, 0.0); |
<<<<<<<
@After
public void tearBinding()
{
=======
@AfterMethod
public void tearBinding() {
>>>>>>>
@AfterMethod
public void tearBinding()
{
<<<<<<<
try
{
if (dialogFrameFixture != null)
{
=======
try {
if (dialogFrameFixture != null) {
>>>>>>>
try
{
if (dialogFrameFixture != null)
{
<<<<<<<
if (installerFrameFixture != null)
{
=======
} finally {
if (installerFrameFixture != null) {
>>>>>>>
} finally {
if (installerFrameFixture != null) {
<<<<<<<
}
catch (ScreenLockException e)
{
e.printStackTrace();
=======
>>>>>>>
<<<<<<<
public void testHelloAndFinishPanels() throws Exception
{
compileAndUnzip("helloAndFinish.xml", getWorkingDirectory("samples"));
=======
public void testHelloAndFinishPanels() throws Exception {
compileInstallJar("helloAndFinish.xml", getWorkingDirectory("samples"));
>>>>>>>
public void testHelloAndFinishPanels() throws Exception {
compileInstallJar("helloAndFinish.xml", getWorkingDirectory("samples"));
<<<<<<<
@Test
public void testHelloAndFinishPanelsCompressed() throws Exception
{
=======
@Test(dependsOnMethods = "testHelloAndFinishPanels", enabled = false)
public void testHelloAndFinishPanelsCompressed() throws Exception {
System.out.println("Using file " + out.getName());
>>>>>>>
@Test(dependsOnMethods = "testHelloAndFinishPanels", enabled = false)
public void testHelloAndFinishPanelsCompressed() throws Exception {
System.out.println("Using file " + out.getName());
<<<<<<<
@Test
public void testBasicInstall() throws Exception
{
compileAndUnzip("basicInstall.xml", getWorkingDirectory("samples/basicInstall"));
=======
@Test(dependsOnMethods = "testHelloAndFinishPanels")
public void testBasicInstall() throws Exception {
compileInstallJar("basicInstall.xml", getWorkingDirectory("samples/basicInstall"));
>>>>>>>
@Test(dependsOnMethods = "testHelloAndFinishPanels")
public void testBasicInstall() throws Exception
compileInstallJar("basicInstall.xml", getWorkingDirectory("samples/basicInstall"));
<<<<<<<
@Test
public void testIzpackInstallation() throws Exception
{
compileAndUnzip("install.xml", getWorkingDirectory("samples/izpack"));
=======
@Test(dependsOnMethods = "testBasicInstall")
public void testIzpackInstallation() throws Exception {
compileInstallJar("install.xml", getWorkingDirectory("samples/izpack"));
>>>>>>>
@Test(dependsOnMethods = "testBasicInstall")
public void testIzpackInstallation() throws Exception
compileInstallJar("install.xml", getWorkingDirectory("samples/izpack"));
compileAndUnzip("install.xml", getWorkingDirectory("samples/izpack"));
<<<<<<<
UninstallData u = UninstallData.getInstance();
for (String p : u.getInstalledFilesList())
{
=======
UninstallData uninstallData = new UninstallData();
for (String p : uninstallData.getInstalledFilesList()) {
>>>>>>>
UninstallData uninstallData = new UninstallData();
for (String p : uninstallData.getInstalledFilesList()) { |
<<<<<<<
public void readFromXML(IXMLElement xmlcondition)
{
try
{
if (xmlcondition.getChildrenCount() != 2)
{
=======
public void readFromXML(IXMLElement xmlcondition)
{
try
{
if (xmlcondition.getChildrenCount() != 2)
{
>>>>>>>
public void readFromXML(IXMLElement xmlcondition)
{
try
{
if (xmlcondition.getChildrenCount() != 2)
{
{ |
<<<<<<<
import javax.swing.*;
import javax.swing.border.TitledBorder;
import javax.swing.text.JTextComponent;
import java.awt.*;
import java.awt.event.*;
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
import static com.izforge.izpack.api.GuiId.*;
=======
>>>>>>>
<<<<<<<
=======
/**
* Search and construct all necessary panels, prepare and size the frame.
*
* @return The frame for fluent interface
* @throws ClassNotFoundException
*/
public InstallerFrame loadPanels() throws ClassNotFoundException
{
panelManager.loadPanelsInContainer();
panelManager.instantiatePanels();
buildGUI();
sizeFrame();
return this;
}
public void enableFrame()
{
showFrame();
switchToFirstEnabledPanel();
}
private void switchToFirstEnabledPanel()
{
int firstPanel = hasNavigateNext(-1, false);
if (firstPanel > -1)
{
showFrame();
installdata.setCurPanelNumber(firstPanel);
switchPanel(firstPanel);
}
}
>>>>>>>
<<<<<<<
VariableSubstitutor substitutor = variableSubstitutor;
message = substitutor.substitute(message);
title = substitutor.substitute(title);
=======
VariableSubstitutor vs = variableSubstitutor;
try
{
message = vs.substitute(message);
}
catch (Exception e)
{
// ignore
}
try
{
title = vs.substitute(title);
}
catch (Exception e)
{
// ignore
}
>>>>>>>
VariableSubstitutor substitutor = variableSubstitutor;
message = substitutor.substitute(message);
title = substitutor.substitute(title);
}
catch (Exception e)
{
// ignore
}
try
{
}
catch (Exception e)
{
// ignore
}
<<<<<<<
=======
public RulesEngine getRules()
{
return rules;
}
private void refreshDynamicVariables()
{
try {
InstallerBase.refreshDynamicVariables(installdata, new VariableSubstitutorImpl(installdata.getVariables()));
}
catch(Exception e) {
Debug.trace("Refreshing dynamic variables failed, asking user whether to proceed.");
StringBuffer msg = new StringBuffer();
msg.append("<html>");
msg.append("The following error occured during refreshing panel contents:<br>");
msg.append("<i>"+e.getMessage()+"</i><br>");
msg.append("Are you sure you want to continue with this installation?");
msg.append("</html>");
JLabel label = new JLabel(msg.toString());
label.setFont(new Font("Sans Serif", Font.PLAIN, 12));
Object[] optionValues = {"Continue", "Exit"};
int selectedOption = JOptionPane.showOptionDialog(null, label, "Warning",
JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE, null, optionValues,
optionValues[1]);
Debug.trace("Selected option: " + selectedOption);
if (selectedOption == 0)
{
Debug.trace("Continuing installation");
}
else
{
Debug.trace("Exiting");
System.exit(1);
}
}
}
>>>>>>>
}
private void refreshDynamicVariables()
{
try {
InstallerBase.refreshDynamicVariables(installdata, new VariableSubstitutorImpl(installdata.getVariables()));
}
catch(Exception e) {
Debug.trace("Refreshing dynamic variables failed, asking user whether to proceed.");
StringBuffer msg = new StringBuffer();
msg.append("<html>");
msg.append("The following error occured during refreshing panel contents:<br>");
msg.append("<i>"+e.getMessage()+"</i><br>");
msg.append("Are you sure you want to continue with this installation?");
msg.append("</html>");
JLabel label = new JLabel(msg.toString());
label.setFont(new Font("Sans Serif", Font.PLAIN, 12));
Object[] optionValues = {"Continue", "Exit"};
int selectedOption = JOptionPane.showOptionDialog(null, label, "Warning",
JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE, null, optionValues,
optionValues[1]);
Debug.trace("Selected option: " + selectedOption);
if (selectedOption == 0)
{
Debug.trace("Continuing installation");
}
else
{
Debug.trace("Exiting");
System.exit(1);
}
} |
<<<<<<<
packselcond.id = "izpack.selected." + pack.id;
packselcond.setPackid(pack.id);
conditionsmap.put(packselcond.id, packselcond);
=======
packselcond.setId("izpack.selected." + pack.id);
packselcond.packid = pack.id;
conditionsmap.put(packselcond.getId(), packselcond);
>>>>>>>
packselcond.setId("izpack.selected." + pack.id);
packselcond.setPackid(pack.id);
conditionsmap.put(packselcond.getId(), packselcond);
<<<<<<<
condition.id = conditionId;
conditionsmap.put(condition.id, condition);
=======
condition.setId(conditionId);
condition.classname = "com.izforge.izpack.util.OsVersion";
condition.fieldname = osVersionField;
condition.returnvalue = "true";
condition.returnvaluetype = "boolean";
condition.complete = true;
conditionsmap.put(condition.getId(), condition);
>>>>>>>
condition.setId(conditionId);
conditionsmap.put(condition.getId(), condition); |
<<<<<<<
VariableSubstitutor variableSubstitutor = new VariableSubstitutorImpl(props);
contents = variableSubstitutor.substitute(contents);
=======
VariableSubstitutor vs = new VariableSubstitutorImpl(props);
try
{
contents = vs.substitute(contents);
}
catch (Exception e)
{
// ignore
}
>>>>>>>
VariableSubstitutor variableSubstitutor = new VariableSubstitutorImpl(props);
try
{
contents = vs.substitute(contents);
}
catch (Exception e)
{
// ignore
} |
<<<<<<<
report.stream().forEach(issue -> issue.setFileName(pathUtil.getAbsolutePath(issue.getFileName())));
=======
// FIXME: why should we set the filename here?
// report.stream().forEach(issue -> issue.setFileName(new PathUtil().getAbsolutePath(issue.getFileName())));
>>>>>>>
resolvePathNames(report);
<<<<<<<
Map<String, String> pathMapping = resolveAbsoluteNames(filesToProcess, sourceDirectories, log);
=======
IssueBuilder builder = new IssueBuilder();
Map<String, String> pathMapping = resolveAbsoluteNames(filesToProcess, workspace, log);
>>>>>>>
IssueBuilder builder = new IssueBuilder();
Map<String, String> pathMapping = resolveAbsoluteNames(filesToProcess, sourceDirectories, log); |
<<<<<<<
* Verifies that {@link WarningChecksPublisher} constructs the {@link ChecksDetails} correctly with only new
* issues.
=======
* Capturing checks publisher for inspection of checks created during a run.
*/
@TestExtension
public static final CapturingChecksPublisher.Factory PUBLISHER_FACTORY = new CapturingChecksPublisher.Factory();
/**
* Resets captured checks after each test.
*/
@After
public void clearPublisher() {
PUBLISHER_FACTORY.getPublishedChecks().clear();
}
/**
* Verifies that {@link WarningChecksPublisher} constructs the {@link ChecksDetails} correctly
* with only new issues.
>>>>>>>
* Capturing checks publisher for inspection of checks created during a run.
*/
@TestExtension
public static final CapturingChecksPublisher.Factory PUBLISHER_FACTORY = new CapturingChecksPublisher.Factory();
/**
* Resets captured checks after each test.
*/
@After
public void clearPublisher() {
PUBLISHER_FACTORY.getPublishedChecks().clear();
}
/**
* Verifies that {@link WarningChecksPublisher} constructs the {@link ChecksDetails} correctly with only new
* issues.
<<<<<<<
WarningChecksPublisher publisher = new WarningChecksPublisher(getResultAction(run), TaskListener.NULL);
assertThat(publisher.extractChecksDetails(AnnotationScope.PUBLISH_NEW_ISSUES))
=======
WarningChecksPublisher publisher = new WarningChecksPublisher(getResultAction(run), TaskListener.NULL, null);
assertThat(publisher.extractChecksDetails())
>>>>>>>
WarningChecksPublisher publisher = new WarningChecksPublisher(getResultAction(run), TaskListener.NULL, null);
assertThat(publisher.extractChecksDetails(AnnotationScope.PUBLISH_NEW_ISSUES))
<<<<<<<
WarningChecksPublisher publisher = new WarningChecksPublisher(getResultAction(run), TaskListener.NULL);
ChecksDetails details = publisher.extractChecksDetails(AnnotationScope.PUBLISH_NEW_ISSUES);
=======
WarningChecksPublisher publisher = new WarningChecksPublisher(getResultAction(run), TaskListener.NULL, null);
ChecksDetails details = publisher.extractChecksDetails();
>>>>>>>
WarningChecksPublisher publisher = new WarningChecksPublisher(getResultAction(run), TaskListener.NULL, null);
ChecksDetails details = publisher.extractChecksDetails(AnnotationScope.PUBLISH_NEW_ISSUES);
<<<<<<<
assertThat(new WarningChecksPublisher(getResultAction(run), TaskListener.NULL)
.extractChecksDetails(AnnotationScope.PUBLISH_NEW_ISSUES).getOutput())
=======
assertThat(new WarningChecksPublisher(getResultAction(run), TaskListener.NULL, null)
.extractChecksDetails().getOutput())
>>>>>>>
assertThat(new WarningChecksPublisher(getResultAction(run), TaskListener.NULL, null)
.extractChecksDetails(AnnotationScope.PUBLISH_NEW_ISSUES).getOutput())
<<<<<<<
assertThat(new WarningChecksPublisher(getResultAction(run), TaskListener.NULL)
.extractChecksDetails(AnnotationScope.PUBLISH_NEW_ISSUES).getOutput())
=======
assertThat(new WarningChecksPublisher(getResultAction(run), TaskListener.NULL, null)
.extractChecksDetails().getOutput())
>>>>>>>
assertThat(new WarningChecksPublisher(getResultAction(run), TaskListener.NULL, null)
.extractChecksDetails(AnnotationScope.PUBLISH_NEW_ISSUES).getOutput())
<<<<<<<
assertThat(new WarningChecksPublisher(getResultAction(run), TaskListener.NULL)
.extractChecksDetails(AnnotationScope.PUBLISH_NEW_ISSUES).getOutput())
=======
assertThat(new WarningChecksPublisher(getResultAction(run), TaskListener.NULL, null)
.extractChecksDetails().getOutput())
>>>>>>>
assertThat(new WarningChecksPublisher(getResultAction(run), TaskListener.NULL, null)
.extractChecksDetails(AnnotationScope.PUBLISH_NEW_ISSUES).getOutput())
<<<<<<<
WarningChecksPublisher publisher = new WarningChecksPublisher(getResultAction(run), TaskListener.NULL);
ChecksDetails details = publisher.extractChecksDetails(AnnotationScope.PUBLISH_NEW_ISSUES);
=======
WarningChecksPublisher publisher = new WarningChecksPublisher(getResultAction(run), TaskListener.NULL, null);
ChecksDetails details = publisher.extractChecksDetails();
>>>>>>>
WarningChecksPublisher publisher = new WarningChecksPublisher(getResultAction(run), TaskListener.NULL, null);
ChecksDetails details = publisher.extractChecksDetails(AnnotationScope.PUBLISH_NEW_ISSUES);
<<<<<<<
WarningChecksPublisher publisher = new WarningChecksPublisher(getResultAction(build), TaskListener.NULL);
assertThat(publisher.extractChecksDetails(AnnotationScope.PUBLISH_NEW_ISSUES).getConclusion())
=======
WarningChecksPublisher publisher = new WarningChecksPublisher(getResultAction(build), TaskListener.NULL, null);
assertThat(publisher.extractChecksDetails().getConclusion())
>>>>>>>
WarningChecksPublisher publisher = new WarningChecksPublisher(getResultAction(build), TaskListener.NULL, null);
assertThat(publisher.extractChecksDetails().getConclusion(AnnotationScope.PUBLISH_NEW_ISSUES)) |
<<<<<<<
*
* @return
*/
private BlamesTableRowType getBlamesTableType() {
if (ArrayUtils.contains(DRY_TOOLS, id)) {
return BlamesTableRowType.DRY;
}
return BlamesTableRowType.DEFAULT;
}
/**
* Returns the type of the rows in the forensics table.
*
* @return the row type
*/
private ForensicsTableRowType getForensicsTableType() {
if (ArrayUtils.contains(DRY_TOOLS, id)) {
return ForensicsTableRowType.DRY;
}
return ForensicsTableRowType.DEFAULT;
}
/**
=======
* Reloads the {@link PageObject}.
*/
public void reload() {
open();
}
/**
>>>>>>>
*
* @return
*/
private BlamesTableRowType getBlamesTableType() {
if (ArrayUtils.contains(DRY_TOOLS, id)) {
return BlamesTableRowType.DRY;
}
return BlamesTableRowType.DEFAULT;
}
/**
* Returns the type of the rows in the forensics table.
*
* @return the row type
*/
private ForensicsTableRowType getForensicsTableType() {
if (ArrayUtils.contains(DRY_TOOLS, id)) {
return ForensicsTableRowType.DRY;
}
return ForensicsTableRowType.DEFAULT;
}
/**
* Reloads the {@link PageObject}.
*/
public void reload() {
open();
}
/** |
<<<<<<<
import java.util.List;
=======
import java.util.Map;
>>>>>>>
import java.util.List;
import java.util.Map;
<<<<<<<
import io.jenkins.plugins.analysis.warnings.AnalysisResult.Tab;
import static io.jenkins.plugins.analysis.warnings.Assertions.assertThat;
import static org.assertj.core.api.Assertions.*;
=======
import io.jenkins.plugins.analysis.warnings.DashboardTable.DashboardTableEntry;
import static io.jenkins.plugins.analysis.warnings.Assertions.*;
>>>>>>>
import io.jenkins.plugins.analysis.warnings.AnalysisResult.Tab;
import static io.jenkins.plugins.analysis.warnings.Assertions.assertThat;
import static org.assertj.core.api.Assertions.*;
import io.jenkins.plugins.analysis.warnings.DashboardTable.DashboardTableEntry;
import static io.jenkins.plugins.analysis.warnings.Assertions.*;
<<<<<<<
verifyDetailsTab(build);
}
/**
* Asserts correct display of Page Objects in the details section of a CheckStyle result page.
*/
private void verifyDetailsTab(final Build build) {
build.open();
AnalysisResult resultPage = new AnalysisResult(build, "checkstyle");
resultPage.open();
assertThat(resultPage).hasOnlyAvailableTabs(Tab.ISSUES, Tab.TYPES, Tab.CATEGORIES);
PropertyDetailsTable categoriesDetailsTable = resultPage.openPropertiesTable(Tab.CATEGORIES);
assertThat(categoriesDetailsTable).hasHeaders("Category", "Total", "Distribution");
assertThat(categoriesDetailsTable).hasSize(2).hasTotal(2);
WebElement categoryPaginate = resultPage.getPaginateElementByActiveTab();
List<WebElement> categoryPaginateButtons = categoryPaginate.findElements(By.cssSelector("ul li"));
assertThat(categoryPaginateButtons.size()).isEqualTo(1);
=======
folder.open();
verifyIssuesColumnResults(build, job.name);
// Dashboard UI-Tests
DashboardView dashboardView = createDashboardWithStaticAnalysisPortlet(folder, false, true);
DashboardTable dashboardTable = new DashboardTable(build, dashboardView.url);
verifyDashboardTablePortlet(dashboardTable, String.format("%s » %s", folder.name, job.name));
>>>>>>>
verifyDetailsTab(build);
folder.open();
verifyIssuesColumnResults(build, job.name);
// Dashboard UI-Tests
DashboardView dashboardView = createDashboardWithStaticAnalysisPortlet(folder, false, true);
DashboardTable dashboardTable = new DashboardTable(build, dashboardView.url);
verifyDashboardTablePortlet(dashboardTable, String.format("%s » %s", folder.name, job.name));
}
private void verifyDetailsTab(final Build build) {
build.open();
AnalysisResult resultPage = new AnalysisResult(build, "checkstyle");
resultPage.open();
assertThat(resultPage).hasOnlyAvailableTabs(Tab.ISSUES, Tab.TYPES, Tab.CATEGORIES);
PropertyDetailsTable categoriesDetailsTable = resultPage.openPropertiesTable(Tab.CATEGORIES);
assertThat(categoriesDetailsTable).hasHeaders("Category", "Total", "Distribution");
assertThat(categoriesDetailsTable).hasSize(2).hasTotal(2);
WebElement categoryPaginate = resultPage.getPaginateElementByActiveTab();
List<WebElement> categoryPaginateButtons = categoryPaginate.findElements(By.cssSelector("ul li"));
assertThat(categoryPaginateButtons.size()).isEqualTo(1); |
<<<<<<<
=======
import java.util.List;
>>>>>>>
import java.util.List; |
<<<<<<<
/*
* Copyright (C) 2012-2017 52°North Initiative for Geospatial Open Source
=======
/**
* Copyright (C) 2012-2017 52°North Initiative for Geospatial Open Source
>>>>>>>
/*
* Copyright (C) 2012-2017 52°North Initiative for Geospatial Open Source
<<<<<<<
=======
import org.n52.sos.convert.ConverterException;
import org.n52.sos.ds.hibernate.dao.DaoFactory;
import org.n52.sos.ds.hibernate.dao.observation.series.AbstractSeriesObservationDAO;
import org.n52.sos.ds.hibernate.dao.observation.series.parameter.SeriesParameterDAO;
import org.n52.sos.ds.hibernate.entities.observation.series.Series;
import org.n52.sos.ds.hibernate.entities.parameter.series.SeriesParameterAdder;
import org.n52.sos.exception.CodedException;
import org.n52.sos.ogc.gml.AbstractFeature;
import org.n52.sos.ogc.gml.time.TimeInstant;
import org.n52.sos.ogc.om.OmObservableProperty;
import org.n52.sos.ogc.om.OmObservation;
import org.n52.sos.ogc.om.OmObservationConstellation;
import org.n52.sos.ogc.om.SingleObservationValue;
import org.n52.sos.ogc.om.values.NilTemplateValue;
import org.n52.sos.ogc.ows.OwsExceptionReport;
import org.n52.sos.ogc.sos.SosProcedureDescription;
import org.n52.sos.request.AbstractObservationRequest;
import org.n52.sos.util.http.MediaType;
>>>>>>>
import org.n52.sos.util.http.MediaType;
<<<<<<<
obsProp.setUnit(queryUnit());
AbstractFeature feature = createFeatureOfInterest(series.getFeatureOfInterest());
=======
obsProp.setUnit(queryUnit(getSeries()));
AbstractFeature feature = createFeatureOfInterest(series.getFeatureOfInterest().getIdentifier());
>>>>>>>
obsProp.setUnit(queryUnit(getSeries()));
AbstractFeature feature = createFeatureOfInterest(series.getFeatureOfInterest());
<<<<<<<
protected OmObservationConstellation getObservationConstellation(SosProcedureDescription<?> procedure,
OmObservableProperty obsProp, AbstractFeature feature) {
=======
protected OmObservationConstellation getObservationConstellation(SosProcedureDescription procedure,
OmObservableProperty obsProp, AbstractFeature feature) throws OwsExceptionReport {
>>>>>>>
protected OmObservationConstellation getObservationConstellation(SosProcedureDescription<?> procedure,
OmObservableProperty obsProp, AbstractFeature feature) throws OwsExceptionReport {
<<<<<<<
AdditionalObservationCreator creator = AdditionalObservationCreatorRepository.getInstance().get(key);
creator.create(sosObservation, series);
=======
AdditionalObservationCreator<Series> creator = AdditionalObservationCreatorRepository.getInstance().get(key);
creator.create(sosObservation, series, getSession());
} else if (checkAcceptType()) {
for (MediaType acceptType : getAcceptType()) {
AdditionalObservationCreatorKey acceptKey = new AdditionalObservationCreatorKey(acceptType.withoutParameters().toString(), series.getClass());
if (AdditionalObservationCreatorRepository.getInstance().hasAdditionalObservationCreatorFor(acceptKey)) {
AdditionalObservationCreator<Series> creator = AdditionalObservationCreatorRepository.getInstance().get(acceptKey);
creator.create(sosObservation, series, getSession());
}
}
>>>>>>>
AdditionalObservationCreator creator = AdditionalObservationCreatorRepository.getInstance().get(key);
creator.create(sosObservation, series, getSession());
} else if (checkAcceptType()) {
for (MediaType acceptType : getAcceptType()) {
AdditionalObservationCreatorKey acceptKey = new AdditionalObservationCreatorKey(acceptType.withoutParameters().toString(), series.getClass());
if (AdditionalObservationCreatorRepository.getInstance().hasAdditionalObservationCreatorFor(acceptKey)) {
AdditionalObservationCreator<Series> creator = AdditionalObservationCreatorRepository.getInstance().get(acceptKey);
creator.create(sosObservation, series, getSession());
}
} |
<<<<<<<
import io.jenkins.plugins.analysis.core.util.HealthDescriptor;
=======
import io.jenkins.plugins.analysis.core.scm.Blames;
import io.jenkins.plugins.analysis.core.util.HealthDescriptor;
>>>>>>>
import io.jenkins.plugins.analysis.core.util.HealthDescriptor;
<<<<<<<
import io.jenkins.plugins.forensics.blame.Blames;
=======
import io.jenkins.plugins.analysis.core.util.StageResultHandler;
>>>>>>>
import io.jenkins.plugins.analysis.core.util.StageResultHandler;
import io.jenkins.plugins.forensics.blame.Blames; |
<<<<<<<
=======
import io.jenkins.plugins.analysis.core.scm.Blames;
import io.jenkins.plugins.analysis.core.scm.GsResults;
>>>>>>>
import io.jenkins.plugins.analysis.core.scm.Blames; |
<<<<<<<
import android.view.WindowManager;
=======
import android.view.WindowManager.LayoutParams;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputMethodManager;
>>>>>>>
import android.view.WindowManager.LayoutParams;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputMethodManager;
<<<<<<<
import org.shadowice.flocke.andotp.Utilities.EditorActionHelper;
import org.shadowice.flocke.andotp.Utilities.EncryptionHelper;
import java.security.NoSuchAlgorithmException;
import java.security.spec.InvalidKeySpecException;
import java.util.Arrays;
=======
>>>>>>>
import org.shadowice.flocke.andotp.Utilities.EditorActionHelper;
<<<<<<<
if (EditorActionHelper.isActionDoneOrKeyboardEnter(actionId, event)) {
checkPassword(v.getText().toString());
=======
if (actionId == EditorInfo.IME_ACTION_DONE) {
startAuthTask(v.getText().toString());
>>>>>>>
if (EditorActionHelper.isActionDoneOrKeyboardEnter(actionId, event)) {
startAuthTask(v.getText().toString()); |
<<<<<<<
import org.shadowice.flocke.andotp.Utilities.EncryptionHelper;
import org.shadowice.flocke.andotp.View.AutoFillable.AutoFillableTextInputEditText;
import java.security.NoSuchAlgorithmException;
import java.security.spec.InvalidKeySpecException;
import java.util.Arrays;
=======
>>>>>>>
import org.shadowice.flocke.andotp.View.AutoFillable.AutoFillableTextInputEditText;
<<<<<<<
public class AuthenticateActivity extends ThemedActivity
implements EditText.OnEditorActionListener, View.OnClickListener {
private String password;
private final AutoFillableTextInputEditText.AutoFillTextListener autoFillTextListener = text -> checkPassword(text.toString());
=======
public class AuthenticateActivity extends BaseActivity
implements EditText.OnEditorActionListener, View.OnClickListener {
>>>>>>>
public class AuthenticateActivity extends BaseActivity
implements EditText.OnEditorActionListener, View.OnClickListener {
private final AutoFillableTextInputEditText.AutoFillTextListener autoFillTextListener = text -> checkPassword(text.toString());
<<<<<<<
@Override
protected void onStart() {
super.onStart();
if (settings.getAutoUnlockAfterAutofill()) {
passwordInput.setAutoFillTextListener(autoFillTextListener);
}
}
@Override
protected void onStop() {
passwordInput.setAutoFillTextListener(null);
super.onStop();
}
=======
@Override
protected void onPause() {
super.onPause();
// We don't want the task to callback to a dead activity and cause a memory leak, so null it here.
TaskFragment taskFragment = findTaskFragment();
if (taskFragment != null) {
taskFragment.task.setCallback(null);
}
}
@Override
protected void onDestroy() {
ProcessLifecycleOwner.get().getLifecycle()
.removeObserver(observer);
super.onDestroy();
}
@Override
protected boolean shouldDestroyOnScreenOff() {
return false;
}
/** Retained instance fragment to hold a running {@link AuthenticationTask} between configuration changes.*/
public static class TaskFragment extends Fragment {
AuthenticationTask task;
public TaskFragment() {
super();
setRetainInstance(true);
}
public void startTask(@NonNull AuthenticationTask task) {
this.task = task;
task.execute();
}
}
>>>>>>>
@Override
protected void onStart() {
super.onStart();
if (settings.getAutoUnlockAfterAutofill()) {
passwordInput.setAutoFillTextListener(autoFillTextListener);
}
}
@Override
protected void onPause() {
super.onPause();
// We don't want the task to callback to a dead activity and cause a memory leak, so null it here.
TaskFragment taskFragment = findTaskFragment();
if (taskFragment != null) {
taskFragment.task.setCallback(null);
}
}
@Override
protected void onStop() {
passwordInput.setAutoFillTextListener(null);
super.onStop();
}
@Override
protected void onDestroy() {
ProcessLifecycleOwner.get().getLifecycle()
.removeObserver(observer);
super.onDestroy();
}
@Override
protected boolean shouldDestroyOnScreenOff() {
return false;
}
/** Retained instance fragment to hold a running {@link AuthenticationTask} between configuration changes.*/
public static class TaskFragment extends Fragment {
AuthenticationTask task;
public TaskFragment() {
super();
setRetainInstance(true);
}
public void startTask(@NonNull AuthenticationTask task) {
this.task = task;
task.execute();
}
} |
<<<<<<<
import android.app.KeyguardManager;
import android.app.backup.BackupManager;
import android.app.backup.RestoreObserver;
=======
import android.app.AlertDialog;
import android.content.DialogInterface;
>>>>>>>
import android.app.KeyguardManager;
import android.app.backup.BackupManager;
import android.app.backup.RestoreObserver;
import android.app.AlertDialog;
import android.content.DialogInterface; |
<<<<<<<
import org.shadowice.flocke.andotp.Utilities.Constants;
=======
import org.shadowice.flocke.andotp.Utilities.EditorActionHelper;
>>>>>>>
import org.shadowice.flocke.andotp.Utilities.Constants;
import org.shadowice.flocke.andotp.Utilities.EditorActionHelper; |
<<<<<<<
NameCom(R.drawable.thumb_namecom),
=======
NameCheap(R.drawable.thumb_namecheap),
>>>>>>>
NameCheap(R.drawable.thumb_namecheap),
NameCom(R.drawable.thumb_namecom),
<<<<<<<
PaySafe(R.drawable.thumb_paysafecard),
=======
PayWithPrivacy(R.drawable.thumb_paywithprivacy),
>>>>>>>
PaySafe(R.drawable.thumb_paysafecard),
PayWithPrivacy(R.drawable.thumb_paywithprivacy),
<<<<<<<
RipeNNC(R.drawable.thumb_ripe_ncc),
=======
Robinhood(R.drawable.thumb_robinhood),
>>>>>>>
RipeNNC(R.drawable.thumb_ripe_ncc),
Robinhood(R.drawable.thumb_robinhood), |
<<<<<<<
import org.shadowice.flocke.andotp.View.AutoFillable.AutoFillableTextInputEditText;
=======
import org.shadowice.flocke.andotp.Utilities.EditorActionHelper;
>>>>>>>
import org.shadowice.flocke.andotp.Utilities.EditorActionHelper;
import org.shadowice.flocke.andotp.View.AutoFillable.AutoFillableTextInputEditText; |
<<<<<<<
CHINESE_SIMPLIFIED("zh", "CN", "Hans"),
CHINESE_TRADITIONAL("zh", "TW", "Hant"),
=======
CHINESE_SIMPLIFIED("zh"),
CHINESE_TRADITIONAL("zh"),
CZECH("cs"),
>>>>>>>
CHINESE_SIMPLIFIED("zh", "CN", "Hans"),
CHINESE_TRADITIONAL("zh", "TW", "Hant"),
CZECH("cs"), |
<<<<<<<
// DRAFTS(TestFragment.class, R.string.menu_drafts, R.drawable.menu_drafts, false),
OPEN_APK(LoadApkFragment.class, R.string.menu_load_apks, R.drawable.ic_android, false),
=======
DRAFTS(DraftsFragment.class, R.string.menu_drafts, R.drawable.menu_drafts, false),
>>>>>>>
OPEN_APK(LoadApkFragment.class, R.string.menu_load_apks, R.drawable.ic_android, false),
DRAFTS(DraftsFragment.class, R.string.menu_drafts, R.drawable.menu_drafts, false), |
<<<<<<<
import android.support.v4.content.ContextCompat;
=======
import android.preference.PreferenceManager;
>>>>>>>
import android.support.v4.content.ContextCompat;
import android.preference.PreferenceManager;
<<<<<<<
=======
private SharedPreferences prefs;
private static final String PREF_SORT = "sortType";
public static final int SORT_TYPE_MODIFIED = 0;
public static final int SORT_TYPE_NAME = 1;
public static final int SORT_TYPE_AUTHOR = 2;
private int selectedPosition = -1;
>>>>>>>
private SharedPreferences prefs;
private static final String PREF_SORT = "sortType";
public static final int SORT_TYPE_MODIFIED = 0;
public static final int SORT_TYPE_NAME = 1;
public static final int SORT_TYPE_AUTHOR = 2;
private int selectedPosition = -1;
<<<<<<<
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
super.onCreateOptionsMenu(menu, inflater);
=======
public void onPrepareOptionsMenu(Menu menu) {
super.onPrepareOptionsMenu(menu);
menu.clear();
>>>>>>>
public void onPrepareOptionsMenu(Menu menu) {
super.onPrepareOptionsMenu(menu);
menu.clear();
<<<<<<<
dialog.dismiss();
deleteItem(mAdapter.getSelectedPosition());
=======
dialogDelete.dismiss();
deleteItem(selectedPosition);
>>>>>>>
dialogDelete.dismiss();
deleteItem(selectedPosition); |
<<<<<<<
this(AddressUtil.parseAddress(new String(address.get(), StandardCharsets.UTF_8), false), session.toString());
=======
this(AddressUtil.parseAddress(new String(address.get(), UTF_8), false), session.toString());
>>>>>>>
this(AddressUtil.parseAddress(new String(address.get(), UTF_8), false), session.toString());
<<<<<<<
private Value asMutationValue() {
return new Value(getLocation().toString().getBytes(StandardCharsets.UTF_8));
=======
public Value asMutationValue() {
return new Value(getLocation().toString().getBytes(UTF_8));
>>>>>>>
private Value asMutationValue() {
return new Value(getLocation().toString().getBytes(UTF_8)); |
<<<<<<<
* @param bytes bytes of value
=======
* @param bytes May not be null
>>>>>>>
* @param bytes May not be null
<<<<<<<
/**
* Creates a Value using the bytes in a buffer as the initial value. Makes
* a defensive copy.
*
* @param bytes bytes of value
*/
=======
/**
* Create a Value using a copy of the ByteBuffer's content.
*
* @param bytes May not be null
*/
>>>>>>>
/**
* Creates a Value using the bytes in a buffer as the initial value. Makes
* a defensive copy.
*
* @param bytes May not be null
*/
<<<<<<<
/**
* Creates a Value using a byte array as the initial value.
*
* @param bytes bytes of value
* @param copy false to use the given byte array directly as the backing
* array, true to force a copy
*/
=======
/**
* Create a Value based on the given bytes.
* @param bytes may not be null
* @param copy signal if Value must make its own copy of bytes, or if it can use the array directly.
*/
>>>>>>>
/**
* Creates a Value using a byte array as the initial value.
*
* @param bytes may not be null
* @param copy false to use the given byte array directly as the backing
* array, true to force a copy
*/
<<<<<<<
* @param ibw original Value
=======
* @param ibw may not be null.
>>>>>>>
* @param ibw may not be null.
<<<<<<<
* @param newData byte array containing value bytes
* @param offset the offset in newData to start with for valye bytes
* @param length the number of bytes in the value
* @throws IndexOutOfBoundsException if offset or length are invalid
=======
* @param newData source of copy, may not be null
* @param offset
* the offset in newData to start at
* @param length
* the number of bytes to copy
>>>>>>>
* @param newData source of copy, may not be null
* @param offset the offset in newData to start with for valye bytes
* @param length the number of bytes in the value
* @throws IndexOutOfBoundsException if offset or length are invalid
<<<<<<<
* Gets the byte data of this value.
*
* @return value bytes
* @throws IllegalStateException if this object is uninitialized because it
* was not read correctly from a data stream
=======
* @return the underlying byte array directly.
>>>>>>>
* Gets the byte data of this value.
*
* @return the underlying byte array directly.
<<<<<<<
* Sets the byte data of this value. The given byte array is used directly as
* the backing array, so later changes made to the array reflect into this
* Value.
*
* @param b bytes of value
=======
* @param b Use passed bytes as backing array for this instance, may not be null.
>>>>>>>
* Sets the byte data of this value. The given byte array is used directly as
* the backing array, so later changes made to the array reflect into this
* Value.
*
* @param b may not be null
<<<<<<<
* Sets the byte data of this value. The given byte array is copied.
*
* @param b bytes of value
=======
*
* @param b copy the given byte array, may not be null.
>>>>>>>
* Sets the byte data of this value. The given byte array is copied.
*
* @param b may not be null
<<<<<<<
* Gets the size of this value.
*
* @return size in bytes
* @throws IllegalStateException if this object is uninitialized because it
* was not read correctly from a data stream
=======
* @return the current size of the underlying buffer.
>>>>>>>
* Gets the size of this value.
*
* @return size in bytes |
<<<<<<<
=======
// ignore nodes that are not initialized or dead.
if (node.getNodeStage() != NodeStage.DONE) {
logger.trace("NODE {}: stage is not DONE: {}", node.getNodeId(), node.getNodeStage());
return;
}
>>>>>>> |
<<<<<<<
=======
if (trimmedLine.substring(1).contains(":")) {
String pid = StringUtils.substringBefore(trimmedLine, ":");
String rest = trimmedLine.substring(pid.length() + 1);
if (!pid.contains(".")) {
pid = "org.openhab." + pid;
}
if (!rest.isEmpty() && rest.substring(1).contains("=")) {
String property = StringUtils.substringBefore(rest, "=");
String value = rest.substring(property.length() + 1);
String[] parsedLine = { pid.trim(), property.trim(), value.trim() };
logger.debug("Parsed configuration line {}:{}={}", (Object[]) parsedLine);
return parsedLine;
}
}
logger.warn("Cannot parse line '{}' of main configuration file '{}'.", line, filePath);
return null;
}
>>>>>>> |
<<<<<<<
import org.openhab.core.items.ItemChangeListener;
=======
import org.openhab.core.items.Item;
>>>>>>>
import org.openhab.core.items.ItemChangeListener;
import org.openhab.core.items.Item; |
<<<<<<<
import org.openhab.core.library.types.StringType;
=======
import org.openhab.core.library.types.OnOffType;
>>>>>>>
import org.openhab.core.library.types.OnOffType;
import org.openhab.core.library.types.StringType; |
<<<<<<<
import tuwien.auto.calimero.knxnetip.KNXnetIPConnection;
=======
import tuwien.auto.calimero.link.KNXNetworkLink;
import tuwien.auto.calimero.link.KNXNetworkLinkFT12;
>>>>>>>
import tuwien.auto.calimero.knxnetip.KNXnetIPConnection;
import tuwien.auto.calimero.link.KNXNetworkLink;
import tuwien.auto.calimero.link.KNXNetworkLinkFT12;
<<<<<<<
import tuwien.auto.calimero.link.medium.TPSettings;
=======
import tuwien.auto.calimero.link.medium.KNXMediumSettings;
import tuwien.auto.calimero.link.medium.TPSettings;
>>>>>>>
import tuwien.auto.calimero.link.medium.TPSettings;
<<<<<<<
/** KNXnet/IP port number */
private static int port;
/** local endpoint to specify the multicast interface. no port is used */
private static String localIp;
/** time in milliseconds of how long should be paused between two read requests to the bus during initialization. Defaultvalue is <code>50</Code> */
=======
/** the serial port to use for connecting to the KNX bus */
private static String port;
/**
* time in milliseconds of how long should be paused between two read
* requests to the bus during initialization. Defaultvalue is
* <code>50</Code>
*/
>>>>>>>
/** KNXnet/IP port number */
private static int port;
/** local endpoint to specify the multicast interface. no port is used */
private static String localIp;
/** the serial port to use for connecting to the KNX bus */
private static String serialPort;
/** time in milliseconds of how long should be paused between two read requests to the bus during initialization. Defaultvalue is <code>50</Code> */
<<<<<<<
InetSocketAddress localEndPoint = null;
if (localIp != null && !localIp.isEmpty()) {
localEndPoint = new InetSocketAddress(localIp,0);
} else {
localEndPoint = new InetSocketAddress(InetAddress.getLocalHost(), 0);
}
link = new KNXNetworkLinkIP(KNXNetworkLinkIP.TUNNEL, localEndPoint, new InetSocketAddress(ip, port), false, TPSettings.TP1);
=======
if (ip != null) {
link = new KNXNetworkLinkIP(ip,
new KNXMediumSettings(null) {
public short getMedium() {
return KNXMediumSettings.MEDIUM_TP1;
}
});
} else {
link = new KNXNetworkLinkFT12(Integer.parseInt(port),
new TPSettings(true));
}
>>>>>>>
if(ip!=null) {
// we have an IP address, so we use KNX/IP
InetSocketAddress localEndPoint = null;
if (localIp != null && !localIp.isEmpty()) {
localEndPoint = new InetSocketAddress(localIp,0);
} else {
localEndPoint = new InetSocketAddress(InetAddress.getLocalHost(), 0);
}
link = new KNXNetworkLinkIP(KNXNetworkLinkIP.TUNNEL, localEndPoint, new InetSocketAddress(ip, port), false, TPSettings.TP1);
} else {
// we try the connection via the FT1.2 serial interface
try {
RXTXVersion.getVersion();
link = new KNXNetworkLinkFT12(serialPort, new TPSettings(true));
} catch(NoClassDefFoundError e) {
throw new KNXException("The serial FT1.2 KNX connection requires the serial binding to be installed!");
} catch(KNXException e) {
if(e.getMessage().startsWith("can not open serial port")) {
StringBuilder sb = new StringBuilder("Available ports are:\n");
Enumeration portList = CommPortIdentifier.getPortIdentifiers();
while (portList.hasMoreElements()) {
CommPortIdentifier id = (CommPortIdentifier) portList.nextElement();
if (id.getPortType() == CommPortIdentifier.PORT_SERIAL) {
sb.append(id.getName() + "\n");
}
}
sb.deleteCharAt(sb.length()-1);
e = new KNXException("Serial port '" + serialPort + "' could not be opened. " + sb.toString());
}
throw e;
}
}
<<<<<<<
String portConfig = (String) config.get("port");
if (portConfig != null && !portConfig.isEmpty()) {
port = Integer.parseInt(portConfig);
} else {
port = KNXnetIPConnection.IP_PORT;
}
localIp = (String) config.get("localIp");
=======
if (ip == null) {
port = (String) config.get("port");
}
>>>>>>>
String portConfig = (String) config.get("port");
if (portConfig != null && !portConfig.isEmpty()) {
port = Integer.parseInt(portConfig);
} else {
port = KNXnetIPConnection.IP_PORT;
}
localIp = (String) config.get("localIp");
serialPort = (String) config.get("serialPort"); |
<<<<<<<
public final static String VERSION = EHadoopVersion4Drivers.HDP_2_3.getVersionValue();
=======
>>>>>>>
public final static String VERSION = EHadoopVersion4Drivers.HDP_2_3.getVersionValue();
<<<<<<<
@Override
public boolean doSupportCustomMRApplicationCP() {
return true;
}
@Override
public String getCustomMRApplicationCP() {
return CUSTOM_MR_APPLICATION_CLASSPATH;
}
=======
@Override
public boolean doSupportSecurity() {
return true;
}
>>>>>>>
@Override
public boolean doSupportCustomMRApplicationCP() {
return true;
}
@Override
public String getCustomMRApplicationCP() {
return CUSTOM_MR_APPLICATION_CLASSPATH;
}
@Override
public boolean doSupportSecurity() {
return true;
} |
<<<<<<<
public boolean doSupportCustomMRApplicationCP() {
return false;
}
public String getCustomMRApplicationCP() {
return ""; //$NON-NLS-1$
}
public boolean doSupportSparkYarnClusterMode() {
return false;
}
public boolean doSupportS3() {
return false;
}
public boolean doSupportS3V4() {
return false;
}
/**
*
* for Hive
*/
public boolean doSupportEmbeddedMode() {
// the embedded mode is not working for TOP
if (PluginChecker.isOnlyTopLoaded()) { // don't support in TOS for DQ product.
return false;
}
return true;
}
/**
*
* for Hive
*/
public boolean doSupportStandaloneMode() {
return true;
}
/**
*
* load default
*/
public String getDefaultConfig(String... keys) {
if (keys != null && keys.length > 0) {
// check distribution
final String keyDistr = keys[0];
final String distribution = getDistribution();
if (distribution.equals(keyDistr)) {
final String version = getVersion();
Object object = defaultConfigsMap.get(distribution, version);
if (object == null) { // init
JSONObject defaultConfig = loadDefaultConfigurations();
if (defaultConfig != null) {
object = defaultConfig;
defaultConfigsMap.put(distribution, version, defaultConfig);
}
}
if (object instanceof JSONObject) {
JSONObject json = (JSONObject) object;
String[] keysWithoutDistribution = (String[]) ArrayUtils.remove(keys, 0);
if (keysWithoutDistribution.length == 0) {// no key yet,
return DefaultConfigurationManager.getValue(json, ""); //$NON-NLS-1$
}
return DefaultConfigurationManager.getValue(json, keysWithoutDistribution);
}
}
}
return null;
}
protected JSONObject loadDefaultConfigurations() {
// the class must be AbstractDistribution for load default config in current bundle
JSONObject globalJson = DefaultConfigurationManager.loadDefaultFile(AbstractDistribution.class, getDistribution()
.toLowerCase());
// the class is the version of distribution
if (getVersion() != null) {
JSONObject versionJson = DefaultConfigurationManager.loadDefaultFile(this.getClass(), getVersion().toLowerCase());
return JSONUtil.merge(versionJson, globalJson);
}
return globalJson;
}
public boolean doSupportSSLwithKerberos() {
return false;
}
public boolean doSupportAtlas() {
return false;
}
=======
public boolean doSupportParquetOutput() {
return false;
}
>>>>>>>
public boolean doSupportCustomMRApplicationCP() {
return false;
}
public String getCustomMRApplicationCP() {
return ""; //$NON-NLS-1$
}
public boolean doSupportSparkYarnClusterMode() {
return false;
}
public boolean doSupportS3() {
return false;
}
public boolean doSupportS3V4() {
return false;
}
/**
*
* for Hive
*/
public boolean doSupportEmbeddedMode() {
// the embedded mode is not working for TOP
if (PluginChecker.isOnlyTopLoaded()) { // don't support in TOS for DQ product.
return false;
}
return true;
}
/**
*
* for Hive
*/
public boolean doSupportStandaloneMode() {
return true;
}
/**
*
* load default
*/
public String getDefaultConfig(String... keys) {
if (keys != null && keys.length > 0) {
// check distribution
final String keyDistr = keys[0];
final String distribution = getDistribution();
if (distribution.equals(keyDistr)) {
final String version = getVersion();
Object object = defaultConfigsMap.get(distribution, version);
if (object == null) { // init
JSONObject defaultConfig = loadDefaultConfigurations();
if (defaultConfig != null) {
object = defaultConfig;
defaultConfigsMap.put(distribution, version, defaultConfig);
}
}
if (object instanceof JSONObject) {
JSONObject json = (JSONObject) object;
String[] keysWithoutDistribution = (String[]) ArrayUtils.remove(keys, 0);
if (keysWithoutDistribution.length == 0) {// no key yet,
return DefaultConfigurationManager.getValue(json, ""); //$NON-NLS-1$
}
return DefaultConfigurationManager.getValue(json, keysWithoutDistribution);
}
}
}
return null;
}
protected JSONObject loadDefaultConfigurations() {
// the class must be AbstractDistribution for load default config in current bundle
JSONObject globalJson = DefaultConfigurationManager.loadDefaultFile(AbstractDistribution.class, getDistribution()
.toLowerCase());
// the class is the version of distribution
if (getVersion() != null) {
JSONObject versionJson = DefaultConfigurationManager.loadDefaultFile(this.getClass(), getVersion().toLowerCase());
return JSONUtil.merge(versionJson, globalJson);
}
return globalJson;
}
public boolean doSupportSSLwithKerberos() {
return false;
}
public boolean doSupportAtlas() {
return false;
}
public boolean doSupportParquetOutput() {
return false;
} |
<<<<<<<
/**
* @return true if the distribution implementation is responsible for importing the Dynamo DB dependencies. If
* false, the components themselves are going to import a default version of the dependencies
*/
public boolean doImportDynamoDBDependencies();
=======
/**
* @return true if the distribution implementation is responsible for importing the spark hive context dependencies.
* If false, the components themselves are going to import the default version of dependencies on tSqlRow with module name SPARK-HIVECONTEXT-LIB-ALL_LATEST
*/
public boolean doImportSparkHiveContextDependencies();
>>>>>>>
/**
* @return true if the distribution implementation is responsible for importing the Dynamo DB dependencies. If
* false, the components themselves are going to import a default version of the dependencies
*/
public boolean doImportDynamoDBDependencies();
/**
* @return true if the distribution implementation is responsible for importing the spark hive context dependencies.
* If false, the components themselves are going to import the default version of dependencies on tSqlRow with module name SPARK-HIVECONTEXT-LIB-ALL_LATEST
*/
public boolean doImportSparkHiveContextDependencies(); |
<<<<<<<
if(imm!=null)
imm.showInputMethodPicker();
//prevent onKey from running
switchedKeyboard=true;
=======
if(imm!=null)
imm.showInputMethodPicker();
>>>>>>>
if(imm!=null)
imm.showInputMethodPicker();
switchedKeyboard=true; |
<<<<<<<
<<<<<<< HEAD
import java.util.Calendar;
=======
import java.util.Collection;
>>>>>>> c6f948de960abf900199cf82aa55656397a09ad7
=======
import java.util.Collection;
>>>>>>>
import java.util.Calendar;
import java.util.Collection; |
<<<<<<<
doNamespaceFateOperation(FateOperation.NAMESPACE_CREATE, Arrays.asList(ByteBuffer.wrap(namespace.getBytes(UTF_8))),
Collections.<String,String> emptyMap());
=======
doNamespaceFateOperation(FateOperation.NAMESPACE_CREATE, Arrays.asList(ByteBuffer.wrap(namespace.getBytes())), Collections.<String,String> emptyMap(),
namespace);
>>>>>>>
doNamespaceFateOperation(FateOperation.NAMESPACE_CREATE, Arrays.asList(ByteBuffer.wrap(namespace.getBytes(UTF_8))),
Collections.<String,String> emptyMap(), namespace); |
<<<<<<<
Summarizer<IExplodedBasicBlock> s = new Summarizer<IExplodedBasicBlock>(
appJar);
=======
// boolean isStatic = false;
// if (args[2].equals("static")) {
// isStatic = true;
// }
Summarizer<IExplodedBasicBlock> s = new Summarizer<IExplodedBasicBlock>(appJar);
>>>>>>>
// boolean isStatic = false;
// if (args[2].equals("static")) {
// isStatic = true;
// }
Summarizer<IExplodedBasicBlock> s = new Summarizer<IExplodedBasicBlock>(appJar);
<<<<<<<
public void summarize(String methodDescriptor)
throws ClassHierarchyException, CallGraphBuilderCancelException,
IOException, ParserConfigurationException {
MethodReference methodRef = StringStuff
.makeMethodReference(methodDescriptor);
Map<FlowType<IExplodedBasicBlock>, Set<FlowType<IExplodedBasicBlock>>> dfAnalysis = runDFAnalysis(methodRef);
logger.debug(dfAnalysis.toString());
MethodSummary summary = new MethodSummary(methodRef);
=======
public void summarize(String methodDescriptor) throws ClassHierarchyException,
CallGraphBuilderCancelException, IOException,
ParserConfigurationException {
MethodReference methodRef = StringStuff.makeMethodReference(methodDescriptor);
>>>>>>>
public void summarize(String methodDescriptor)
throws ClassHierarchyException, CallGraphBuilderCancelException,
IOException, ParserConfigurationException {
MethodReference methodRef = StringStuff
.makeMethodReference(methodDescriptor);
<<<<<<<
=======
MethodSummary summary = new MethodSummary(methodRef);
summary.setStatic(imethod.isStatic());
Map<FlowType<IExplodedBasicBlock>, Set<FlowType<IExplodedBasicBlock>>> dfAnalysis = runDFAnalysis(summary);
logger.debug(dfAnalysis.toString());
>>>>>>>
MethodSummary summary = new MethodSummary(methodRef);
summary.setStatic(imethod.isStatic());
Map<FlowType<IExplodedBasicBlock>, Set<FlowType<IExplodedBasicBlock>>> dfAnalysis = runDFAnalysis(summary);
logger.debug(dfAnalysis.toString());
<<<<<<<
private Map<FlowType<IExplodedBasicBlock>, Set<FlowType<IExplodedBasicBlock>>> runDFAnalysis(
MethodReference methodRef) throws IOException,
ClassHierarchyException, CallGraphBuilderCancelException {
=======
private Map<FlowType<IExplodedBasicBlock>, Set<FlowType<IExplodedBasicBlock>>>
runDFAnalysis(MethodSummary mSummary)
throws IOException, ClassHierarchyException, CallGraphBuilderCancelException {
MethodReference methodRef = (MethodReference) mSummary.getMethod();
>>>>>>>
private Map<FlowType<IExplodedBasicBlock>, Set<FlowType<IExplodedBasicBlock>>>
runDFAnalysis(MethodSummary mSummary)
throws IOException, ClassHierarchyException, CallGraphBuilderCancelException {
MethodReference methodRef = (MethodReference) mSummary.getMethod();
<<<<<<<
graph = ICFGSupergraph.make(cg, builder.getAnalysisCache());
ISpecs specs = new MethodSummarySpecs(methodRef);
=======
graph = ICFGSupergraph.make(cg, builder.getAnalysisCache());
ISpecs specs = new MethodSummarySpecs(mSummary);
>>>>>>>
graph = ICFGSupergraph.make(cg, builder.getAnalysisCache());
ISpecs specs = new MethodSummarySpecs(mSummary); |
<<<<<<<
public class DefaultBatchingCassandraBolt extends BatchingCassandraBolt
implements CassandraConstants {
private RowKeyDeterminable rkDeterminable;
public DefaultBatchingCassandraBolt(
ColumnFamilyDeterminable cfDeterminable,
RowKeyDeterminable rkDeterminable) {
super(cfDeterminable);
this.rkDeterminable = rkDeterminable;
}
public DefaultBatchingCassandraBolt(String columnFamily, String rowKey) {
this(new DefaultColumnFamilyDeterminable(columnFamily),
new DefaultRowKeyDeterminable(rowKey));
}
private static final Logger LOG = LoggerFactory
.getLogger(DefaultBatchingCassandraBolt.class);
@Override
public void executeBatch(List<Tuple> inputs) {
try {
this.writeTuples(inputs, this.cfDeterminable, this.rkDeterminable);
// NOTE: Changed this to ack on all or none since that is how the
// mutation executes.
if (this.ackStrategy == AckStrategy.ACK_ON_WRITE) {
for (Tuple tupleToAck : inputs) {
this.collector.ack(tupleToAck);
}
}
} catch (Throwable e) {
LOG.warn("Unable to write batch.", e);
for (Tuple tupleToAck : inputs) {
this.collector.fail(tupleToAck);
}
}
}
=======
public class DefaultBatchingCassandraBolt extends BatchingCassandraBolt implements CassandraConstants, Serializable {
public DefaultBatchingCassandraBolt(ColumnFamilyMapper cfDeterminable, RowKeyMapper rkDeterminable,
ColumnsMapper colsDeterminable) {
super(cfDeterminable, rkDeterminable, colsDeterminable);
}
public DefaultBatchingCassandraBolt(String columnFamily, String rowKey) {
this(new DefaultColumnFamilyMapper(columnFamily), new DefaultRowKeyMapper(rowKey),
new DefaultColumnsMapper());
}
private static final Logger LOG = LoggerFactory.getLogger(DefaultBatchingCassandraBolt.class);
@Override
public void executeBatch(List<Tuple> inputs) {
LOG.info("Executing batch [" + inputs.size() + "]");
try {
this.writeTuples(inputs);
if (this.ackStrategy == AckStrategy.ACK_ON_WRITE) {
for (Tuple tupleToAck : inputs) {
this.collector.ack(tupleToAck);
}
}
} catch (Throwable e) {
LOG.error("Unable to write batch.", e);
}
}
>>>>>>>
public class DefaultBatchingCassandraBolt extends BatchingCassandraBolt implements CassandraConstants, Serializable {
public DefaultBatchingCassandraBolt(ColumnFamilyMapper cfDeterminable, RowKeyMapper rkDeterminable,
ColumnsMapper colsDeterminable) {
super(cfDeterminable, rkDeterminable, colsDeterminable);
}
public DefaultBatchingCassandraBolt(String columnFamily, String rowKey) {
this(new DefaultColumnFamilyMapper(columnFamily), new DefaultRowKeyMapper(rowKey),
new DefaultColumnsMapper());
}
private static final Logger LOG = LoggerFactory.getLogger(DefaultBatchingCassandraBolt.class);
@Override
public void executeBatch(List<Tuple> inputs) {
try {
this.writeTuples(inputs);
// NOTE: Changed this to ack on all or none since that is how the
// mutation executes.
if (this.ackStrategy == AckStrategy.ACK_ON_WRITE) {
for (Tuple tupleToAck : inputs) {
this.collector.ack(tupleToAck);
}
}
} catch (Throwable e) {
LOG.warn("Unable to write batch.", e);
for (Tuple tupleToAck : inputs) {
this.collector.fail(tupleToAck);
}
}
} |
<<<<<<<
=======
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import backtype.storm.contrib.cassandra.bolt.mapper.TupleCounterMapper;
>>>>>>>
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import backtype.storm.contrib.cassandra.bolt.mapper.TupleCounterMapper; |
<<<<<<<
bw = connector.createBatchWriter("test_ingest", 20000000l, 60000l, 10);
connector.securityOperations().changeUserAuthorizations(rootCredentials.user, AUTHS);
=======
bw = connector.createBatchWriter("test_ingest", new BatchWriterConfig());
>>>>>>>
bw = connector.createBatchWriter("test_ingest", new BatchWriterConfig());
connector.securityOperations().changeUserAuthorizations(rootCredentials.user, AUTHS); |
<<<<<<<
import java.util.Map;
import me.prettyprint.cassandra.serializers.StringSerializer;
import me.prettyprint.hector.api.factory.HFactory;
import me.prettyprint.hector.api.mutation.Mutator;
=======
>>>>>>>
import java.util.Map;
<<<<<<<
import backtype.storm.contrib.cassandra.bolt.determinable.ColumnFamilyDeterminable;
import backtype.storm.contrib.cassandra.bolt.determinable.DefaultColumnFamilyDeterminable;
import backtype.storm.contrib.cassandra.bolt.determinable.DefaultRowKeyDeterminable;
import backtype.storm.contrib.cassandra.bolt.determinable.RowKeyDeterminable;
import backtype.storm.tuple.Fields;
=======
import backtype.storm.contrib.cassandra.bolt.mapper.ColumnFamilyMapper;
import backtype.storm.contrib.cassandra.bolt.mapper.ColumnsMapper;
import backtype.storm.contrib.cassandra.bolt.mapper.DefaultColumnFamilyMapper;
import backtype.storm.contrib.cassandra.bolt.mapper.DefaultColumnsMapper;
import backtype.storm.contrib.cassandra.bolt.mapper.DefaultRowKeyMapper;
import backtype.storm.contrib.cassandra.bolt.mapper.RowKeyMapper;
>>>>>>>
import backtype.storm.tuple.Fields;
import backtype.storm.contrib.cassandra.bolt.mapper.ColumnFamilyMapper;
import backtype.storm.contrib.cassandra.bolt.mapper.ColumnsMapper;
import backtype.storm.contrib.cassandra.bolt.mapper.DefaultColumnFamilyMapper;
import backtype.storm.contrib.cassandra.bolt.mapper.DefaultColumnsMapper;
import backtype.storm.contrib.cassandra.bolt.mapper.DefaultRowKeyMapper;
import backtype.storm.contrib.cassandra.bolt.mapper.RowKeyMapper;
<<<<<<<
@Override
public Map<String, Object> getComponentConfiguration() {
return null;
}
=======
>>>>>>>
@Override
public Map<String, Object> getComponentConfiguration() {
return null;
} |
<<<<<<<
import com.example.android.sunshine.app.data.WeatherContract;
=======
import com.example.android.sunshine.app.gcm.RegistrationIntentService;
>>>>>>>
import com.example.android.sunshine.app.data.WeatherContract;
import com.example.android.sunshine.app.gcm.RegistrationIntentService; |
<<<<<<<
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
=======
import android.preference.PreferenceManager;
import android.support.v7.app.ActionBarActivity;
>>>>>>>
import android.preference.PreferenceManager;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar; |
<<<<<<<
import field.core.plugins.snip.TreeBrowserPlugin;
=======
import field.core.ui.FieldMenus2;
import field.core.ui.FieldMenus2.Sheet;
>>>>>>>
import field.core.plugins.snip.TreeBrowserPlugin;
import field.core.ui.FieldMenus2;
import field.core.ui.FieldMenus2.Sheet; |
<<<<<<<
if (SystemProperties.getIntProperty("nocursor", 0) == 1) {
// getCanvas().setCursor(Launcher.display.getSystemCursor(SWT.));
// ImageData dd = new ImageData("/Users/nick/Documents/black.png");
// Cursor c = new Cursor(Launcher.display, dd, 0, 0);
// getCanvas().setCursor(c);
Color white = Launcher.getLauncher().display.getSystemColor(SWT.COLOR_WHITE);
Color black= Launcher.getLauncher().display.getSystemColor(SWT.COLOR_BLACK);
PaletteData palette = new PaletteData(new RGB[]{white.getRGB(), black.getRGB()});
ImageData sourceData = new ImageData(16,16,1, palette);
sourceData.transparentPixel=0;
Cursor cursor = new Cursor(Launcher.getLauncher().display, sourceData, 0, 0);
frame.setCursor(cursor);
// int[] pixels = new int[16 * 16];
// Image image =
// Toolkit.getDefaultToolkit().createImage(new
// MemoryImageSource(16, 16, pixels, 0, 16));
// Cursor transparentCursor =
// Toolkit.getDefaultToolkit().createCustomCursor(image,
// new Point(0, 0), "nothing");
// frame.setCursor(transparentCursor);
// canvas.setCursor(transparentCursor);
}
=======
>>>>>>>
if (SystemProperties.getIntProperty("nocursor", 0) == 1) {
Color white = Launcher.getLauncher().display.getSystemColor(SWT.COLOR_WHITE);
Color black= Launcher.getLauncher().display.getSystemColor(SWT.COLOR_BLACK);
PaletteData palette = new PaletteData(new RGB[]{white.getRGB(), black.getRGB()});
ImageData sourceData = new ImageData(16,16,1, palette);
sourceData.transparentPixel=0;
Cursor cursor = new Cursor(Launcher.getLauncher().display, sourceData, 0, 0);
frame.setCursor(cursor);
} |
<<<<<<<
FreeStyleProject freestyle = j.createFreeStyleProject("project1");
MatrixProject matrix = j.createMatrixProject("matrix1");
=======
j.createFreeStyleProject("project1");
MatrixProject matrix = createMatrixProject("matrix1");
>>>>>>>
FreeStyleProject freestyle = j.createFreeStyleProject("project1");
MatrixProject matrix = createMatrixProject("matrix1"); |
<<<<<<<
public CopyArtifact(String projectName, String parameters, BuildSelector selector, String filter, String target,
boolean flatten, boolean optional) {
=======
public CopyArtifact(String projectName, BuildSelector selector, String filter, String target,
boolean flatten, boolean optional, boolean fingerprintArtifacts) {
>>>>>>>
public CopyArtifact(String projectName, String parameters, BuildSelector selector, String filter, String target,
boolean flatten, boolean optional, boolean fingerprintArtifacts) {
<<<<<<<
private boolean upgradeIfNecessary(AbstractProject<?,?> job) throws IOException {
if (isUpgradeNeeded()) {
int i = projectName.lastIndexOf('/');
if (i != -1 && projectName.indexOf('=', i) != -1 && /* not matrix */Jenkins.getInstance().getItem(projectName, job.getParent(), Job.class) == null) {
project = projectName.substring(0, i);
parameters = projectName.substring(i + 1);
} else {
project = projectName;
parameters = null;
}
LOGGER.log(Level.INFO, "Split {0} into {1} with parameters {2}", new Object[] {projectName, project, parameters});
projectName = null;
job.save();
return true;
} else {
return false;
}
}
private boolean isUpgradeNeeded() {
return (projectName != null);
}
=======
public boolean isFingerprintArtifacts() {
return fingerprintArtifacts != null && fingerprintArtifacts;
}
>>>>>>>
private boolean upgradeIfNecessary(AbstractProject<?,?> job) throws IOException {
if (isUpgradeNeeded()) {
int i = projectName.lastIndexOf('/');
if (i != -1 && projectName.indexOf('=', i) != -1 && /* not matrix */Jenkins.getInstance().getItem(projectName, job.getParent(), Job.class) == null) {
project = projectName.substring(0, i);
parameters = projectName.substring(i + 1);
} else {
project = projectName;
parameters = null;
}
LOGGER.log(Level.INFO, "Split {0} into {1} with parameters {2}", new Object[] {projectName, project, parameters});
projectName = null;
job.save();
return true;
} else {
return false;
}
}
private boolean isUpgradeNeeded() {
return (projectName != null);
}
public boolean isFingerprintArtifacts() {
return fingerprintArtifacts != null && fingerprintArtifacts;
} |
<<<<<<<
import org.fusesource.restygwt.client.basic.CachingTestGwt;
import org.fusesource.restygwt.client.basic.FailingTestGwt;
import org.fusesource.restygwt.client.basic.FlakyTestGwt;
import org.fusesource.restygwt.client.basic.GenericsTestGwt;
import org.fusesource.restygwt.client.basic.JsonCreatorWithSubtypes;
import org.fusesource.restygwt.client.basic.ParameterizedTypeDTO;
import org.fusesource.restygwt.client.basic.ParameterizedTypeServiceInterfaces;
import org.fusesource.restygwt.client.basic.PathParamTestGwt;
import org.fusesource.restygwt.client.basic.QueryParamTestGwt;
import org.fusesource.restygwt.client.basic.ResourcePassesHeadersTestGwt;
import org.fusesource.restygwt.client.basic.ResourceTestGwt;
import org.fusesource.restygwt.client.basic.SubResourceClientGeneration;
import org.fusesource.restygwt.client.basic.TimeoutTestGwt;
=======
import org.fusesource.restygwt.client.basic.*;
>>>>>>>
import org.fusesource.restygwt.client.basic.CachingTestGwt;
import org.fusesource.restygwt.client.basic.FailingTestGwt;
import org.fusesource.restygwt.client.basic.FlakyTestGwt;
import org.fusesource.restygwt.client.basic.GenericsTestGwt;
import org.fusesource.restygwt.client.basic.JsonCreatorWithSubtypes;
import org.fusesource.restygwt.client.basic.ParameterizedTypeDTO;
import org.fusesource.restygwt.client.basic.ParameterizedTypeServiceInterfaces;
import org.fusesource.restygwt.client.basic.PathParamTestGwt;
import org.fusesource.restygwt.client.basic.QueryParamTestGwt;
import org.fusesource.restygwt.client.basic.ResourcePassesHeadersTestGwt;
import org.fusesource.restygwt.client.basic.ResourceTestGwt;
import org.fusesource.restygwt.client.basic.SubResourceClientGeneration;
import org.fusesource.restygwt.client.basic.TimeoutTestGwt;
<<<<<<<
suite.addTestSuite(PathParamTestGwt.class);
suite.addTestSuite(QueryParamTestGwt.class);
=======
suite.addTestSuite(DirectRestServiceTestGwt.class);
>>>>>>>
suite.addTestSuite(PathParamTestGwt.class);
suite.addTestSuite(QueryParamTestGwt.class);
suite.addTestSuite(DirectRestServiceTestGwt.class); |
<<<<<<<
import org.fusesource.restygwt.client.codec.PolymorphicEncoderDecoderTestGwt;
=======
import org.fusesource.restygwt.client.complex.AutodetectPlainTextStringEncoderDecoderTestGwt;
>>>>>>>
import org.fusesource.restygwt.client.codec.PolymorphicEncoderDecoderTestGwt;
import org.fusesource.restygwt.client.complex.AutodetectPlainTextStringEncoderDecoderTestGwt;
<<<<<<<
suite.addTestSuite(PolymorphicEncoderDecoderTestGwt.class);
=======
>>>>>>>
suite.addTestSuite(PolymorphicEncoderDecoderTestGwt.class); |
<<<<<<<
protected String toStringExpression(JParameter arg) {
Attribute attribute = arg.getAnnotation(Attribute.class);
if(attribute != null){
return arg.getName() + "." + attribute.value();
}
return toStringExpression(arg.getType(), arg.getName());
}
protected String toStringExpression(JType type, String expr) {
=======
private <T extends Annotation> T findAnnotationOnMethodOrEnclosingType(final JMethod method, final Class<T> annotationType) {
T annotation = method.getAnnotation(annotationType);
if (annotation == null) {
annotation = method.getEnclosingType().getAnnotation(annotationType);
}
return annotation;
}
private String toStringExpression(JType type, String expr) {
>>>>>>>
private <T extends Annotation> T findAnnotationOnMethodOrEnclosingType(final JMethod method, final Class<T> annotationType) {
T annotation = method.getAnnotation(annotationType);
if (annotation == null) {
annotation = method.getEnclosingType().getAnnotation(annotationType);
}
return annotation;
}
protected String toStringExpression(JParameter arg) {
Attribute attribute = arg.getAnnotation(Attribute.class);
if(attribute != null){
return arg.getName() + "." + attribute.value();
}
return toStringExpression(arg.getType(), arg.getName());
}
protected String toStringExpression(JType type, String expr) { |
<<<<<<<
import de.charite.compbio.exomiser.core.factories.VariantAnnotationsFactory;
=======
import de.charite.compbio.exomiser.core.dao.DefaultDiseaseDao;
import de.charite.compbio.exomiser.core.dao.DiseaseDao;
import de.charite.compbio.exomiser.core.dao.HumanPhenotypeOntologyDao;
import de.charite.compbio.exomiser.core.dao.MousePhenotypeOntologyDao;
import de.charite.compbio.exomiser.core.dao.ZebraFishPhenotypeOntologyDao;
import de.charite.compbio.exomiser.core.factories.VariantAnnotator;
>>>>>>>
import de.charite.compbio.exomiser.core.dao.DefaultDiseaseDao;
import de.charite.compbio.exomiser.core.dao.DiseaseDao;
import de.charite.compbio.exomiser.core.dao.HumanPhenotypeOntologyDao;
import de.charite.compbio.exomiser.core.dao.MousePhenotypeOntologyDao;
import de.charite.compbio.exomiser.core.dao.ZebraFishPhenotypeOntologyDao;
import de.charite.compbio.exomiser.core.factories.VariantAnnotator;
<<<<<<<
import htsjdk.tribble.readers.TabixReader;
import java.io.IOException;
=======
>>>>>>>
import htsjdk.tribble.readers.TabixReader;
import java.io.IOException;
<<<<<<<
@Lazy
@Bean
public TabixReader indelTabixReader() {
String indelCaddPathValue = getValueOfProperty("indelCaddPath");
TabixReader inDelTabixReader = null;
try {
inDelTabixReader = new TabixReader(indelCaddPathValue);
} catch (IOException e) {
throw new RuntimeException("inDel CADD file not found ", e);
}
return inDelTabixReader;
}
@Lazy
@Bean
public TabixReader snvTabixReader() {
String snvCaddPathValue = getValueOfProperty("snvCaddPath");
TabixReader snvTabixReader = null;
try {
snvTabixReader = new TabixReader(snvCaddPathValue);
} catch (IOException e) {
throw new RuntimeException("SNV CADD file not found ", e);
}
return snvTabixReader;
}
=======
>>>>>>>
@Lazy
@Bean
public TabixReader indelTabixReader() {
String indelCaddPathValue = getValueOfProperty("indelCaddPath");
TabixReader inDelTabixReader = null;
try {
inDelTabixReader = new TabixReader(indelCaddPathValue);
} catch (IOException e) {
throw new RuntimeException("inDel CADD file not found ", e);
}
return inDelTabixReader;
}
@Lazy
@Bean
public TabixReader snvTabixReader() {
String snvCaddPathValue = getValueOfProperty("snvCaddPath");
TabixReader snvTabixReader = null;
try {
snvTabixReader = new TabixReader(snvCaddPathValue);
} catch (IOException e) {
throw new RuntimeException("SNV CADD file not found ", e);
}
return snvTabixReader;
} |
<<<<<<<
import de.charite.compbio.exomiser.core.prioritisers.util.ModelService;
import de.charite.compbio.exomiser.core.prioritisers.util.ModelServiceImpl;
import de.charite.compbio.exomiser.core.prioritisers.util.OntologyService;
import de.charite.compbio.exomiser.core.prioritisers.util.OntologyServiceImpl;
import de.charite.compbio.exomiser.core.prioritisers.util.PriorityService;
=======
import de.charite.compbio.jannovar.io.JannovarDataSerializer;
import de.charite.compbio.jannovar.io.SerializationException;
>>>>>>>
import de.charite.compbio.exomiser.core.prioritisers.util.ModelService;
import de.charite.compbio.exomiser.core.prioritisers.util.ModelServiceImpl;
import de.charite.compbio.exomiser.core.prioritisers.util.OntologyService;
import de.charite.compbio.exomiser.core.prioritisers.util.OntologyServiceImpl;
import de.charite.compbio.exomiser.core.prioritisers.util.PriorityService;
import de.charite.compbio.jannovar.io.JannovarDataSerializer;
import de.charite.compbio.jannovar.io.SerializationException; |
<<<<<<<
import jannovar.common.Constants;
=======
>>>>>>>
<<<<<<<
=======
import de.charite.compbio.exomiser.core.Constants;
>>>>>>> |
<<<<<<<
import htsjdk.variant.vcf.VCFHeader;
=======
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.thymeleaf.TemplateEngine;
>>>>>>>
import htsjdk.variant.vcf.VCFHeader;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.thymeleaf.TemplateEngine;
<<<<<<<
/**
* Build {@link ResultsWriter} for the given {@link VCFReader} and {@link OutputFormat}.
*
* @param header
* from the input file, to base output header upon
* @param outputFormat
* the format to use for the output
* @return the constructed {@link ResultsWriter} implementation
*/
public static ResultsWriter getResultsWriter(VCFHeader header, OutputFormat outputFormat) {
=======
@Autowired
private TemplateEngine templateEngine;
public ResultsWriter getResultsWriter(OutputFormat outputFormat) {
>>>>>>>
@Autowired
private TemplateEngine templateEngine;
/**
* Build {@link ResultsWriter} for the given {@link VCFReader} and {@link OutputFormat}.
*
* @param header
* from the input file, to base output header upon
* @param outputFormat
* the format to use for the output
* @return the constructed {@link ResultsWriter} implementation
*/
public ResultsWriter getResultsWriter(VCFHeader header, OutputFormat outputFormat) {
<<<<<<<
protected static ResultsWriter getVcfResultsWriter(VCFHeader header) {
return new VcfResultsWriter(header);
=======
protected ResultsWriter getVcfResultsWriter() {
return new VcfResultsWriter();
>>>>>>>
protected static ResultsWriter getVcfResultsWriter(VCFHeader header) {
return new VcfResultsWriter(header); |
<<<<<<<
FileSKVIterator importIterator = FileOperations.getInstance().newReaderBuilder().forFile(importStatus.getPath().toString(), fs, fs.getConf())
.withTableConfiguration(DefaultConfiguration.getInstance()).seekToBeginning().build();
=======
FileSKVIterator importIterator = FileOperations.getInstance().newReaderBuilder()
.forFile(importStatus.getPath().toString(), fs, fs.getConf())
.withTableConfiguration(AccumuloConfiguration.getDefaultConfiguration())
.seekToBeginning().build();
>>>>>>>
FileSKVIterator importIterator = FileOperations.getInstance().newReaderBuilder()
.forFile(importStatus.getPath().toString(), fs, fs.getConf())
.withTableConfiguration(DefaultConfiguration.getInstance()).seekToBeginning().build(); |
<<<<<<<
// Redstone helper
public void setAllControlRodInsertionValues(int newValue) {
if(this.assemblyState != AssemblyState.Assembled) { return; }
TileEntity te;
TileEntityReactorControlRod cr;
for(CoordTriplet coord : attachedControlRods) {
te = this.worldObj.getBlockTileEntity(coord.x, coord.y, coord.z);
if(te instanceof TileEntityReactorControlRod) {
cr = (TileEntityReactorControlRod)te;
cr.setControlRodInsertion((short)newValue);
}
}
}
public CoordTriplet[] getControlRodLocations() {
CoordTriplet[] coords = new CoordTriplet[this.attachedControlRods.size()];
int i = 0;
for(CoordTriplet coord : this.attachedControlRods) {
coords[i++] = coord.copy();
}
return coords;
}
=======
public int getMaxEnergyPerTick() {
return this.maxEnergyStored;
}
>>>>>>>
public int getMaxEnergyPerTick() {
return this.maxEnergyStored;
}
// Redstone helper
public void setAllControlRodInsertionValues(int newValue) {
if(this.assemblyState != AssemblyState.Assembled) { return; }
TileEntity te;
TileEntityReactorControlRod cr;
for(CoordTriplet coord : attachedControlRods) {
te = this.worldObj.getBlockTileEntity(coord.x, coord.y, coord.z);
if(te instanceof TileEntityReactorControlRod) {
cr = (TileEntityReactorControlRod)te;
cr.setControlRodInsertion((short)newValue);
}
}
}
public CoordTriplet[] getControlRodLocations() {
CoordTriplet[] coords = new CoordTriplet[this.attachedControlRods.size()];
int i = 0;
for(CoordTriplet coord : this.attachedControlRods) {
coords[i++] = coord.copy();
}
return coords;
} |
<<<<<<<
import xyz.zedler.patrick.grocy.NavGraphDirections;
=======
import info.guardianproject.netcipher.proxy.OrbotHelper;
>>>>>>>
import xyz.zedler.patrick.grocy.NavGraphDirections;
import info.guardianproject.netcipher.proxy.OrbotHelper;
<<<<<<<
);*/
=======
);
} else if((requestCode == Constants.REQUEST.SCAN_BATCH)
&& resultCode == Activity.RESULT_CANCELED
&& fragmentCurrent.getClass() == StockFragment.class
) {
((StockFragment) fragmentCurrent).refresh();
}
}
private void setUp(Bundle savedInstanceState) {
String serverUrl = sharedPrefs.getString(Constants.PREF.SERVER_URL, null);
if(serverUrl != null && serverUrl.contains(".onion") && !OrbotHelper.get(this).init()) {
showMessage(Snackbar.make(
binding.frameMainContainer,
getString(R.string.error_orbot_not_installed),
Snackbar.LENGTH_LONG
));
}
ConfigUtil.loadInfo(
new DownloadHelper(this, TAG),
grocyApi,
sharedPrefs,
null,
null
);
// FRAGMENT
if(savedInstanceState != null) {
String tag = savedInstanceState.getString(Constants.ARGUMENT.CURRENT_FRAGMENT);
if(tag != null) {
fragmentCurrent = fragmentManager.getFragment(savedInstanceState, tag);
}
} else { // default is stock
fragmentCurrent = new StockFragment();
Bundle bundleNoAnim = new Bundle();
bundleNoAnim.putBoolean(Constants.ARGUMENT.ANIMATED, false);
fragmentCurrent.setArguments(bundleNoAnim);
fragmentManager.beginTransaction().replace(
R.id.frame_main_container,
fragmentCurrent,
Constants.UI.STOCK
).commit();
}
// SHORTCUT
String action = getIntent() != null ? getIntent().getAction() : null;
if(action != null) {
// no animation for shortcut fragments
Bundle bundleNoAnim = new Bundle();
bundleNoAnim.putBoolean(Constants.ARGUMENT.ANIMATED, false);
switch (action) {
case Constants.SHORTCUT_ACTION.CONSUME:
Intent intentConsume = new Intent(this, ScanBatchActivity.class);
intentConsume.putExtra(Constants.ARGUMENT.TYPE, Constants.ACTION.CONSUME);
startActivityForResult(intentConsume, Constants.REQUEST.SCAN_BATCH);
break;
case Constants.SHORTCUT_ACTION.PURCHASE:
Intent intentPurchase = new Intent(this, ScanBatchActivity.class);
intentPurchase.putExtra(Constants.ARGUMENT.TYPE, Constants.ACTION.PURCHASE);
startActivityForResult(intentPurchase, Constants.REQUEST.SCAN_BATCH);
break;
case Constants.SHORTCUT_ACTION.SHOPPING_LIST:
replaceFragment(Constants.UI.SHOPPING_LIST, bundleNoAnim, false);
break;
case Constants.SHORTCUT_ACTION.ADD_ENTRY:
replaceFragment(Constants.UI.SHOPPING_LIST, bundleNoAnim, false);
Bundle bundleCreate = new Bundle();
bundleCreate.putString(Constants.ARGUMENT.TYPE, Constants.ACTION.CREATE);
bundleCreate.putBoolean(Constants.ARGUMENT.ANIMATED, false);
replaceFragment(
Constants.UI.SHOPPING_LIST_ITEM_EDIT,
bundleCreate,
false
);
break;
case Constants.SHORTCUT_ACTION.SHOPPING_MODE:
replaceFragment(Constants.UI.SHOPPING_LIST, bundleNoAnim, false);
startActivity(new Intent(this, ShoppingActivity.class));
break;
}
getIntent().setAction(null);
}
}
@Override
protected void onSaveInstanceState(@NonNull Bundle outState) {
super.onSaveInstanceState(outState);
String tag = fragmentCurrent != null ? fragmentCurrent.toString() : null;
if(tag != null) {
fragmentManager.putFragment(outState, tag, fragmentCurrent);
outState.putString(Constants.ARGUMENT.CURRENT_FRAGMENT, tag);
>>>>>>>
);*/ |
<<<<<<<
import xyz.zedler.patrick.grocy.fragment.bottomSheetDialog.LogoutBottomSheet;
=======
import xyz.zedler.patrick.grocy.fragment.bottomSheetDialog.CompatibilityBottomSheetDialogFragment;
import xyz.zedler.patrick.grocy.fragment.bottomSheetDialog.DrawerBottomSheetDialogFragment;
import xyz.zedler.patrick.grocy.fragment.bottomSheetDialog.ExitMissingBatchBottomSheetDialogFragment;
import xyz.zedler.patrick.grocy.fragment.bottomSheetDialog.LogoutBottomSheetDialogFragment;
import xyz.zedler.patrick.grocy.fragment.bottomSheetDialog.UpdateInfoBottomSheetDialogFragment;
>>>>>>>
import xyz.zedler.patrick.grocy.fragment.bottomSheetDialog.CompatibilityBottomSheetDialogFragment;
import xyz.zedler.patrick.grocy.fragment.bottomSheetDialog.LogoutBottomSheet;
import xyz.zedler.patrick.grocy.fragment.bottomSheetDialog.UpdateInfoBottomSheetDialogFragment;
<<<<<<<
public void handleShortcutAction() {
if(getIntent() == null || getIntent().getAction() == null) return;
=======
private void setUp(Bundle savedInstanceState) {
String serverUrl = sharedPrefs.getString(Constants.PREF.SERVER_URL, null);
if(serverUrl != null && serverUrl.contains(".onion") && !OrbotHelper.get(this).init()) {
showMessage(Snackbar.make(
binding.frameMainContainer,
getString(R.string.error_orbot_not_installed),
Snackbar.LENGTH_LONG
));
}
ConfigUtil.loadInfo(
new DownloadHelper(this, TAG),
grocyApi,
sharedPrefs,
() -> {
String version = sharedPrefs.getString(Constants.PREF.GROCY_VERSION, "");
if(version.isEmpty()) return;
ArrayList<String> supportedVersions = new ArrayList<>(
Arrays.asList(
getResources().getStringArray(
R.array.compatible_grocy_versions
)
)
);
if(supportedVersions.contains(version)) {
if(!isDemo() && !sharedPrefs.getBoolean(
Constants.PREF.UPDATE_INFO_READ,
false
)) showBottomSheet(new UpdateInfoBottomSheetDialogFragment(), null);
return;
}
// If user already ignored warning, do not display again
String ignoredVersion = sharedPrefs.getString(
Constants.PREF.VERSION_COMPATIBILITY_IGNORED, null
);
if(ignoredVersion != null && ignoredVersion.equals(version)) return;
Bundle bundle = new Bundle();
bundle.putString(Constants.ARGUMENT.VERSION, version);
bundle.putStringArrayList(
Constants.ARGUMENT.SUPPORTED_VERSIONS,
supportedVersions
);
showBottomSheet(
new CompatibilityBottomSheetDialogFragment(),
bundle
);
},
null
);
>>>>>>>
public void handleShortcutAction() {
if(getIntent() == null || getIntent().getAction() == null) return; |
<<<<<<<
String input = binding.autoCompletePurchaseProduct.getText().toString().trim();
if(viewModel.getProductNames() != null
&& !viewModel.getProductNames().isEmpty()
&& !viewModel.getProductNames().contains(input)
&& !input.isEmpty()
) {
showInputNameBottomSheet(input);
=======
String input = binding.autoCompletePurchaseProduct.getText().toString();
if(!productNames.isEmpty() && !productNames.contains(input) && !input.isEmpty()) {
Bundle bundle = new Bundle();
bundle.putString(Constants.ARGUMENT.TYPE, Constants.ACTION.CREATE_THEN_PURCHASE);
bundle.putString(Constants.ARGUMENT.PRODUCT_NAME, input);
activity.showBottomSheet(
new InputNameBottomSheetDialogFragment(), bundle
);
>>>>>>>
String input = binding.autoCompletePurchaseProduct.getText().toString();
if(viewModel.getProductNames() != null
&& !viewModel.getProductNames().isEmpty()
&& !viewModel.getProductNames().contains(input)
&& !input.isEmpty()
) {
showInputNameBottomSheet(input);
<<<<<<<
String input = binding.autoCompletePurchaseProduct.getText().toString().trim();
if(viewModel.getProductNames() != null && !viewModel.getProductNames().isEmpty()
&& !viewModel.getProductNames().contains(input) && !input.isEmpty()
) {
showInputNameBottomSheet(input);
=======
String input = binding.autoCompletePurchaseProduct.getText().toString();
if(!productNames.isEmpty() && !productNames.contains(input) && !input.isEmpty()) {
Bundle bundle = new Bundle();
bundle.putString(Constants.ARGUMENT.TYPE, Constants.ACTION.CREATE_THEN_PURCHASE);
bundle.putString(Constants.ARGUMENT.PRODUCT_NAME, input);
activity.showBottomSheet(
new InputNameBottomSheetDialogFragment(), bundle
);
>>>>>>>
String input = binding.autoCompletePurchaseProduct.getText().toString();
if(viewModel.getProductNames() != null && !viewModel.getProductNames().isEmpty()
&& !viewModel.getProductNames().contains(input) && !input.isEmpty()
) {
showInputNameBottomSheet(input); |
<<<<<<<
onRequestLoading();
=======
int socketTimeout = 30000;//30 seconds - timeout
RetryPolicy policy = new DefaultRetryPolicy(socketTimeout, DefaultRetryPolicy.DEFAULT_MAX_RETRIES, DefaultRetryPolicy.DEFAULT_BACKOFF_MULT);
request.setRetryPolicy(policy);
>>>>>>>
onRequestLoading();
int socketTimeout = 30000;//30 seconds - timeout
RetryPolicy policy = new DefaultRetryPolicy(socketTimeout, DefaultRetryPolicy.DEFAULT_MAX_RETRIES, DefaultRetryPolicy.DEFAULT_BACKOFF_MULT);
request.setRetryPolicy(policy);
<<<<<<<
onRequestLoading();
=======
int socketTimeout = 30000;//30 seconds - timeout
RetryPolicy policy = new DefaultRetryPolicy(socketTimeout, DefaultRetryPolicy.DEFAULT_MAX_RETRIES, DefaultRetryPolicy.DEFAULT_BACKOFF_MULT);
request.setRetryPolicy(policy);
>>>>>>>
onRequestLoading();
int socketTimeout = 30000;//30 seconds - timeout
RetryPolicy policy = new DefaultRetryPolicy(socketTimeout, DefaultRetryPolicy.DEFAULT_MAX_RETRIES, DefaultRetryPolicy.DEFAULT_BACKOFF_MULT);
request.setRetryPolicy(policy);
<<<<<<<
onRequestLoading();
=======
int socketTimeout = 30000;//30 seconds - timeout
RetryPolicy policy = new DefaultRetryPolicy(socketTimeout, DefaultRetryPolicy.DEFAULT_MAX_RETRIES, DefaultRetryPolicy.DEFAULT_BACKOFF_MULT);
request.setRetryPolicy(policy);
>>>>>>>
onRequestLoading();
int socketTimeout = 30000;//30 seconds - timeout
RetryPolicy policy = new DefaultRetryPolicy(socketTimeout, DefaultRetryPolicy.DEFAULT_MAX_RETRIES, DefaultRetryPolicy.DEFAULT_BACKOFF_MULT);
request.setRetryPolicy(policy);
<<<<<<<
onRequestLoading();
=======
int socketTimeout = 30000;//30 seconds - timeout
RetryPolicy policy = new DefaultRetryPolicy(socketTimeout, DefaultRetryPolicy.DEFAULT_MAX_RETRIES, DefaultRetryPolicy.DEFAULT_BACKOFF_MULT);
request.setRetryPolicy(policy);
>>>>>>>
onRequestLoading();
int socketTimeout = 30000;//30 seconds - timeout
RetryPolicy policy = new DefaultRetryPolicy(socketTimeout, DefaultRetryPolicy.DEFAULT_MAX_RETRIES, DefaultRetryPolicy.DEFAULT_BACKOFF_MULT);
request.setRetryPolicy(policy);
<<<<<<<
onRequestLoading();
=======
int socketTimeout = 30000;//30 seconds - timeout
RetryPolicy policy = new DefaultRetryPolicy(socketTimeout, DefaultRetryPolicy.DEFAULT_MAX_RETRIES, DefaultRetryPolicy.DEFAULT_BACKOFF_MULT);
request.setRetryPolicy(policy);
>>>>>>>
onRequestLoading();
int socketTimeout = 30000;//30 seconds - timeout
RetryPolicy policy = new DefaultRetryPolicy(socketTimeout, DefaultRetryPolicy.DEFAULT_MAX_RETRIES, DefaultRetryPolicy.DEFAULT_BACKOFF_MULT);
request.setRetryPolicy(policy);
<<<<<<<
onRequestLoading();
=======
int socketTimeout = 30000;//30 seconds - timeout
RetryPolicy policy = new DefaultRetryPolicy(socketTimeout, DefaultRetryPolicy.DEFAULT_MAX_RETRIES, DefaultRetryPolicy.DEFAULT_BACKOFF_MULT);
request.setRetryPolicy(policy);
>>>>>>>
onRequestLoading();
int socketTimeout = 30000;//30 seconds - timeout
RetryPolicy policy = new DefaultRetryPolicy(socketTimeout, DefaultRetryPolicy.DEFAULT_MAX_RETRIES, DefaultRetryPolicy.DEFAULT_BACKOFF_MULT);
request.setRetryPolicy(policy); |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.