8000 Merge branch 'develop' · Silent-Fred/iTrySQL@a42b483 · GitHub
[go: up one dir, main page]
Skip to content

Commit a42b483

Browse files
Silent-FredSilent-Fred
committed
Merge branch 'develop'
2 parents e730cfa + bb85e37 commit a42b483

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+842
-735
lines changed

‎LICENSE.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
Copyright (c) 2013-2017, Michael Kühweg
2+
All rights reserved.
3+
4+
Redistribution and use in source and binary forms, with or without
5+
modification, are permitted provided that the following conditions are met:
6+
7+
* Redistributions of source code must retain the above copyright notice, this
8+
list of conditions and the following disclaimer.
9+
* Redistributions in binary form must reproduce the above copyright notice,
 9E88
10+
this list of conditions and the following disclaimer in the documentation
11+
and/or other materials provided with the distribution.
12+
13+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
14+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
16+
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
17+
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
18+
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
19+
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
20+
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
21+
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
22+
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
23+
POSSIBILITY OF SUCH DAMAGE.

‎build.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
<property name="BundleOutputPath" value="${BuildPath}/deploy" />
77
<property name="ReferencedLibrariesPath" value="${user.home}/JavaProjects" />
88

9+
<property name="HSQLDBVersion" value="2.4.0" />
910
<target name="get-dependencies">
10-
<get src="http://central.maven.org/maven2/org/hsqldb/hsqldb/2.3.3/hsqldb-2.3.3.jar" dest="${ReferencedLibrariesPath}/hsqldb-2.3.3.jar" usetimestamp="false" ignoreerrors="true" />
11+
<get src="http://central.maven.org/maven2/org/hsqldb/hsqldb/${HSQLDBVersion}/hsqldb-${HSQLDBVersion}.jar" dest="${ReferencedLibrariesPath}/hsqldb-${HSQLDBVersion}.jar" usetimestamp="false" ignoreerrors="true" />
1112
</target>
1213

1314
<target name="init-fx-tasks">
@@ -31,7 +32,7 @@
3132

3233
<copy todir="${BuildPath}/externalLibs">
3334
<fileset dir="${ReferencedLibrariesPath}">
34-
<filename name="hsqldb-2.3.3.jar" />
35+
<filename name="hsqldb-${HSQLDBVersion}.jar" />
3536
</fileset>
3637
</copy>
3738

@@ -60,7 +61,7 @@
6061
<!-- Copy project-libs references -->
6162
<copy todir="${BuildPath}/build/libs">
6263
<fileset dir="${BuildPath}/externalLibs">
63-
<include name="hsqldb-2.3.3.jar" />
64+
<include name="hsqldb-${HSQLDBVersion}.jar" />
6465
</fileset>
6566
</copy>
6667

‎mem.properties

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#HSQL Database Engine 2.3.3
2+
#Sun Apr 23 14:31:49 CEST 2017
3+
version=2.3.3
4+
modified=no
5+
tx_timestamp=0

‎mem.script

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
SET DATABASE UNIQUE NAME HSQLDB5669649A14
2+
SET DATABASE GC 0
3+
SET DATABASE DEFAULT RESULT MEMORY ROWS 0
4+
SET DATABASE EVENT LOG LEVEL 0
5+
SET DATABASE TRANSACTION CONTROL MVCC
6+
SET DATABASE DEFAULT ISOLATION LEVEL READ COMMITTED
7+
SET DATABASE TRANSACTION ROLLBACK ON CONFLICT TRUE
8+
SET DATABASE TEXT TABLE DEFAULTS ''
9+
SET DATABASE SQL NAMES FALSE
10+
SET DATABASE SQL REFERENCES FALSE
11+
SET DATABASE SQL SIZE TRUE
12+
SET DATABASE SQL TYPES FALSE
13+
SET DATABASE SQL TDC DELETE TRUE
14+
SET DATABASE SQL TDC UPDATE TRUE
15+
SET DATABASE SQL TRANSLATE TTI TYPES TRUE
16+
SET DATABASE SQL CONCAT NULLS TRUE
17+
SET DATABASE SQL UNIQUE NULLS TRUE
18+
SET DATABASE SQL CONVERT TRUNCATE TRUE
19+
SET DATABASE SQL AVG SCALE 0
20+
SET DATABASE SQL DOUBLE NAN TRUE
21+
SET FILES WRITE DELAY 500 MILLIS
22+
SET FILES BACKUP INCREMENT TRUE
23+
SET FILES CACHE SIZE 10000
24+
SET FILES CACHE ROWS 50000
25+
SET FILES SCALE 32
26+
SET FILES LOB SCALE 32
27+
SET FILES DEFRAG 0
28+
SET FILES NIO TRUE
29+
SET FILES NIO SIZE 256
30+
SET FILES LOG TRUE
31+
SET FILES LOG SIZE 50
32+
CREATE USER "JOHN_DOE" PASSWORD DIGEST '5ebe2294ecd0e0f08eab7690d2a6ee69'
33+
ALTER USER "JOHN_DOE" SET LOCAL TRUE
34+
CREATE SCHEMA PUBLIC AUTHORIZATION DBA
35+
ALTER SEQUENCE SYSTEM_LOBS.LOB_ID RESTART WITH 1
36+
SET DATABASE DEFAULT INITIAL SCHEMA PUBLIC
37+
GRANT USAGE ON DOMAIN INFORMATION_SCHEMA.SQL_IDENTIFIER TO PUBLIC
38+
GRANT USAGE ON DOMAIN INFORMATION_SCHEMA.YES_OR_NO TO PUBLIC
39+
GRANT USAGE ON DOMAIN INFORMATION_SCHEMA.TIME_STAMP TO PUBLIC
40+
GRANT USAGE ON DOMAIN INFORMATION_SCHEMA.CARDINAL_NUMBER TO PUBLIC
41+
GRANT USAGE ON DOMAIN INFORMATION_SCHEMA.CHARACTER_DATA TO PUBLIC
42+
GRANT DBA TO "JOHN_DOE"
43+
SET SCHEMA SYSTEM_LOBS
44+
INSERT INTO BLOCKS VALUES(0,2147483647,0)

‎src/de/kuehweg/gamification/Achievement.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015-2016, Michael Kühweg
2+
* Copyright (c) 2015-2017, Michael Kühweg
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -79,8 +79,8 @@ public String getName() {
7979
* Ereignisse werden ignoriert. (somit kann ein Event problemlos
8080
* an alle Achievements übergeben werden)
8181
*/
82-
public void event(final AchievementEvent event) {
83-
event(event, 1);
82+
public void fire(final AchievementEvent event) {
83+
fire(event, 1);
8484
}
8585

8686
/**
@@ -96,7 +96,7 @@ public void event(final AchievementEvent event) {
9696
* Berechnungen; dann kann z.B. eine Berechnung mit 25ms durch
9797
* einen Aufruf mit count = 25 registriert werden
9898
*/
99-
public void event(final AchievementEvent event, final int count) {
99+
public void fire(final AchievementEvent event, final int count) {
100100
final AchievementCounter countdown = eventsWithCurrentCountdown.get(event);
101101
if (countdown != null && countdown.getCounter() > 0) {
102102
setChanged();

‎src/de/kuehweg/sqltool/common/FileUtil.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2013-2016, Michael Kühweg
2+
* Copyright (c) 2013-2017, Michael Kühweg
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -127,14 +127,14 @@ public static String readResourceFile(final String resourceName) throws IOExcept
127127
final InputStream tutorialStream = FileUtil.class.getResourceAsStream(resourceName);
128128
final StringBuffer b;
129129
final InputStreamReader reader = new InputStreamReader(tutorialStream, CHARSET_UTF_8);
130-
final BufferedReader bufferedReader = new BufferedReader(reader);
131-
b = new StringBuffer();
132-
String s = null;
133-
while ((s = bufferedReader.readLine()) != null) {
134-
b.append(s);
135-
b.append('\n');
130+
try (BufferedReader bufferedReader = new BufferedReader(reader)) {
131+
b = new StringBuffer();
132+
String s = null;
133+
while ((s = bufferedReader.readLine()) != null) {
134+
b.append(s);
135+
b.append('\n');
136+
}
136137
}
137-
138138
return b.toString();
139139
}
140140

‎src/de/kuehweg/sqltool/common/achievement/AchievementManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015-2016, Michael Kühweg
2+
* Copyright (c) 2015-2017, Michael Kühweg
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -101,7 +101,7 @@ public void resetAllAchievements() {
101101
*/
102102
public void fireEvent(final AchievementEvent event, final int count) {
103103
for (final Achievement achievement : achievements) {
104-
achievement.event(event, count);
104+
achievement.fire(event, count);
105105
}
106106
}
107107

‎src/de/kuehweg/sqltool/dialog/action/ExecuteAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public void attach(final ExecutionTracker... trackers) {
5353
}
5454

5555
public void detach(final ExecutionTracker... trackers) {
56-
this.trackers.remove(Arrays.asList(trackers));
56+
this.trackers.removeAll(Arrays.asList(trackers));
5757
}
5858

5959
public void setLimitMaxRows(final boolean limitMaxRows) {

‎src/de/kuehweg/sqltool/dialog/base/FontSizeZoomable.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,12 @@
2626

2727
package de.kuehweg.sqltool.dialog.base;
2828

29+
import java.io.Serializable;
30+
2931
/**
3032
* @author Michael Kühweg
3133
*/
32-
public interface FontSizeZoomable {
34+
public interface FontSizeZoomable extends Serializable {
3335

3436
int getFontSize();
3537

0 commit comments

Comments
 (0)
0