summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2011-11-29 13:10:19 +0000
committerKHobbits <rob@khobbits.co.uk>2011-11-29 13:10:19 +0000
commitb721a510c551bf9773188b77703884ea8d0cb63d (patch)
treed2abecf49455100a9a54af54c5a801524899773d
parenta9e59e7a40b1e9f76ba6bc373610bf8ee7b190f5 (diff)
parent46e6da296b1e7f3125059bf9dfc1e068204f1b37 (diff)
downloadEssentials-b721a510c551bf9773188b77703884ea8d0cb63d.tar
Essentials-b721a510c551bf9773188b77703884ea8d0cb63d.tar.gz
Essentials-b721a510c551bf9773188b77703884ea8d0cb63d.tar.lz
Essentials-b721a510c551bf9773188b77703884ea8d0cb63d.tar.xz
Essentials-b721a510c551bf9773188b77703884ea8d0cb63d.zip
Merge branch 'master' of github.com:essentials/Essentials
-rw-r--r--Essentials/nbproject/project.properties9
1 files changed, 8 insertions, 1 deletions
diff --git a/Essentials/nbproject/project.properties b/Essentials/nbproject/project.properties
index 3e78aedc7..0d7673bbd 100644
--- a/Essentials/nbproject/project.properties
+++ b/Essentials/nbproject/project.properties
@@ -27,14 +27,21 @@ auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.align
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTryResources=true
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesAfterClassHeader=0
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesBeforeClass=2
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement=NEW_LINE
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs=false
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.importGroupsOrder=*
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width=4
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indentCasesFromSwitch=false
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement=NEW_LINE
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement=NEW_LINE
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeCatchOnNewLine=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeElseOnNewLine=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeFinallyOnNewLine=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeWhileOnNewLine=true
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.separateImportGroups=false
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceAfterTypeCast=false
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab=4
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size=4
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.wrapEnumConstants=WRAP_ALWAYS
build.classes.dir=${build.dir}/classes
build.classes.excludes=**/*.java,**/*.form
# This directory is removed when the project is cleaned: