Commit graph

12 commits

Author SHA1 Message Date
Christoph Atteneder
0edbb1733c
Merge branch 'master' of github.com:bisq-network/bisq-desktop into redesign
# Conflicts:
#	desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.java
#	desktop/src/main/java/bisq/desktop/util/FormBuilder.java
2018-10-16 10:09:37 +02:00
Manfred Karrer
3689e4cbf1
Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	core/src/main/java/bisq/core/dao/state/SnapshotManager.java
2018-09-25 19:58:15 -05:00
Christoph Atteneder
2dfb0de1aa
Update code style 2018-09-19 09:06:35 +02:00
Christoph Atteneder
59551772a7
Redesign splash screen 2018-09-19 09:00:38 +02:00
Christoph Atteneder
11384ab807
Update imports for de.jensd.fx and optimize imports 2018-04-17 11:17:35 +02:00
Chris Beams
04bace7a28
Disable IDEA wrap on typing
See bisq-network/style#3
2018-03-23 23:29:57 +01:00
Chris Beams
730e583783
Add visual guide at 90-character Javadoc margin
Per bisq-network/style#5
2018-03-16 11:57:23 +01:00
Chris Beams
8f25bf3170
Wrap lines automatically at 120 character margin
Problem: bisq-network/style#3 indicates code should be wrapped at 120
characters, but it is likely that people will forget and that this habit
will only change slowly.

Solution: Configure IDEA to wrap lines automatically when typing past
120 characters, forcing the reminder to happen in real time. If this
becomes a nuisance, we can remove it later.

Note that this change also explicitly sets the RIGHT_MARGIN value to
120, even though this is already IDEA's default value. This is simply
to be explicit and self-documenting.
2018-03-16 11:40:33 +01:00
Chris Beams
35231e2ade
Preserve blank lines in .properties files
This setting is actually necessary only in bisq-common, but it has been
added to the shared codeStyles/Project.xml in bisq-network/dao so as to
be able to copy the same configuration file to all bisq-* projects.
2018-03-16 11:37:29 +01:00
Chris Beams
63a5aaedf4
Normalize .idea/codeStyles/*.xml EOF newlines
IDEA does strips EOF newlines in these files, so this commit adds an
exception to the usual rule about inserting them. This will avoid
spurious whitespace diffs on these files in the future.
2018-03-16 11:33:38 +01:00
Chris Beams
6e60f0aa74
Organize imports with common layout (bisq-network/style#2) 2018-03-14 21:02:11 +01:00
Chris Beams
dc8150e7df
Organize imports
This change adds a .idea/codeStyles/Project.xml file that orders all
imports from higher-level layers to lower-level layers, with blank lines
between different major packages.

The purpose of this approach is to allow the reader to scan the imports
in a file efficiently to understand what kind of work the class does,
what layers it touches, and so forth. Keeping imports clean and ordered
by layer can be a powerful tool in keeping a codebase well organized and
tangle-free over time.

bisq.* packages are always sorted at the top.
2018-03-12 15:21:02 +01:00