Commit 5b58b33d authored by Fred Eisele's avatar Fred Eisele
Browse files

Merge branch 'master' of https://github.com/CategoricalData/fql

parents 4d192b3e 520e2496

lib/commons-cli-1.4.jar

0 → 100644
+52.6 KiB

File added.

No diff preview for this file type.

View file

src/main/java/catdata/BinRelMap.java

+1 −1
Changes for src/main/java/catdata/BinRelMap.java: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ public class BinRelMap<X, Y> implements Iterable<Pair<X, Y>> { 
	}



	public BinRelMap() {

		R = new LinkedHashMap<>(1000000);

		R = new LinkedHashMap<>();

	}



	public boolean add(X x, Y y) {

src/main/java/catdata/aql/Chase.java

+2 −2
Changes for src/main/java/catdata/aql/Chase.java: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -351,13 +351,13 @@ public class Chase<Ty, En1, Sym, Fk1, Att1, En2, Fk2, Att2, Gen, Sk, X, Y> { 


		int i = 0;

		T = new Content(I);

		// System.out.println(T);

		// System.out.println(T.sizes());

		for (;;) {

			boolean changed = step(i == 0);

			if (!changed) {

				return;

			}

			// System.out.println(T);

		//	 System.out.println(T.sizes());

			i++;

		}

src/main/java/catdata/aql/exp/InstExpJdbc.java

+1 −0
Changes for src/main/java/catdata/aql/exp/InstExpJdbc.java: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ public class InstExpJdbc extends InstExpImport<Connection, String> { 
		if (jdbcString.trim().isEmpty()) {

			toGet = (String) op.getOrDefault(AqlOption.jdbc_default_string);

		}

		//.driver.DriverManager.

		return DriverManager.getConnection(toGet);	

	}

src/main/java/catdata/ide/CodeTextPanel.java

+2 −0
Changes for src/main/java/catdata/ide/CodeTextPanel.java: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ public class CodeTextPanel extends JPanel { 
	public void setText(String s) {

		area.setText(s);

		area.setCaretPosition(0);

		System.out.println(s.substring(0, Integer.min(5, s.length())));

	}



	public String getText() {
@@ -61,6 +62,7 @@ public class CodeTextPanel extends JPanel { 
		// area.setEditable(false);



		UndoManager m = new UndoManager();

		m.setLimit(16); //since common case is lots of dots in bottom panels

		// area.setundoManager = new UndoManager();

		Document doc = area.getDocument();

		doc.addUndoableEditListener((UndoableEditEvent e) -> m.addEdit(e.getEdit()));