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

Skip to content

Commit cb52e8c

Browse files
committed
Merge branch 'develop'
2 parents 2e777d7 + 3c46084 commit cb52e8c

File tree

121 files changed

+248
-255
lines changed

Some content is hidden

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

121 files changed

+248
-255
lines changed

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2013-2017, Michael Kühweg
1+
Copyright (c) 2017, Michael Kühweg
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without

build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
<fx:deploy embedJNLP="false" extension="false" includeDT="false" offlineAllowed="true" outdir="${BundleOutputPath}" outfile="iTrySQL" nativeBundles="dmg" updatemode="background">
139139

140140
<fx:platform basedir="${java.home}" />
141-
<fx:info title="iTrySQL" vendor="kuehweg.de" copyright="(c) 2013-2016" description="SQL Tutorial Client" />
141+
<fx:info title="iTrySQL" vendor="kuehweg.de" copyright="(c) 2017" description="SQL Tutorial Client" />
142142

143143
<fx:application refId="fxApplication" />
144144
<fx:resources refid="appRes" />

src/de/kuehweg/gamification/Achievement.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015-2017, Michael Kühweg
2+
* Copyright (c) 2015, Michael Kühweg
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without

src/de/kuehweg/gamification/ObfuscatedAchievementXmlFilePersister.java

Lines changed: 1 addition & 1 deletion
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, Michael Kühweg
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without

src/de/kuehweg/gamification/mystify/Zippo.java

Lines changed: 1 addition & 1 deletion
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, Michael Kühweg
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without

src/de/kuehweg/sqltool/common/DialogDictionary.java

Lines changed: 1 addition & 1 deletion
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, Michael Kühweg
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2013-2017, Michael Kühweg
2+
* Copyright (c) 2013, Michael Kühweg
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without

src/de/kuehweg/sqltool/common/ProvidedAudioClip.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014-2016, Michael Kühweg
2+
* Copyright (c) 2014, Michael Kühweg
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without

src/de/kuehweg/sqltool/common/RomanNumber.java

Lines changed: 15 additions & 4 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, Michael Kühweg
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -40,7 +40,19 @@ public RomanNumber(final long value) {
4040

4141
private enum Digit {
4242

43-
M(1000), CM(900), D(500), CD(400), C(100), XC(90), L(50), XL(40), X(10), IX(9), V(5), IV(4), I(1);
43+
M(1000),
44+
CM(900),
45+
D(500),
46+
CD(400),
47+
C(100),
48+
XC(90),
49+
L(50),
50+
XL(40),
51+
X(10),
52+
IX(9),
53+
V(5),
54+
IV(4),
55+
I(1);
4456
private int value;
4557

4658
Digit(final int value) {
@@ -62,9 +74,8 @@ public String toString() {
6274
try {
6375
final StringBuilder builder = new StringBuilder();
6476
long remainder = value;
65-
Digit romanDigit;
6677
do {
67-
romanDigit = Digit.fit(remainder);
78+
final Digit romanDigit = Digit.fit(remainder);
6879
builder.append(romanDigit.name());
6980
remainder -= romanDigit.value;
7081
} while (remainder > 0);

src/de/kuehweg/sqltool/common/UserPreferencesI.java

Lines changed: 1 addition & 1 deletion
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, Michael Kühweg
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without

0 commit comments

Comments
 (0)
0