Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipe Mulet2001-08-07 07:17:33 -0400
committerPhilipe Mulet2001-08-07 07:17:33 -0400
commitc06555674038b0a829a0207484cc16e77bccb8ed (patch)
tree7c6a9cb5af509d3b2f264c036b6e5e5d7cb7d9b9
parentfe0589daa77c35c2d529f4eb28b4a64d2d819b86 (diff)
downloadeclipse.jdt.core-c06555674038b0a829a0207484cc16e77bccb8ed.tar.gz
eclipse.jdt.core-c06555674038b0a829a0207484cc16e77bccb8ed.tar.xz
eclipse.jdt.core-c06555674038b0a829a0207484cc16e77bccb8ed.zip
*** empty log message ***v_0_128_08_(2_0_stream)_options
-rw-r--r--org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/impl/FormatterOptions.java13
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.ini2
2 files changed, 10 insertions, 5 deletions
diff --git a/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/impl/FormatterOptions.java b/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/impl/FormatterOptions.java
index 68b104d7a5..a7a4030e97 100644
--- a/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/impl/FormatterOptions.java
+++ b/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/impl/FormatterOptions.java
@@ -145,7 +145,6 @@ public void setOption(ConfigurableOption setting) {
String componentName = CodeFormatter.class.getName();
String optionID = setting.getID();
- //String value = setting.getValue();
if(optionID.equals(componentName+".newlineOpeningBrace"/*nonNLS*/)){
setNewLineBeforeOpeningBraceMode(setting.getValueIndex() == 0);
@@ -158,13 +157,19 @@ public void setOption(ConfigurableOption setting) {
}else if(optionID.equals(componentName+".newlineEmptyBlock"/*nonNLS*/)){
setNewLineInEmptyBlockMode(setting.getValueIndex() == 0);
}else if(optionID.equals(componentName+".lineSplit"/*nonNLS*/)){
- setMaxLineLength(Integer.parseInt(setting.getValue()));
- }else if(optionID.equals(componentName+".styleCompactAssignment"/*nonNLS*/)){
+ try {
+ setMaxLineLength(Integer.parseInt(setting.getValue()));
+ } catch(NumberFormatException e){
+ }
+ }else if(optionID.equals(componentName+".compactAssignment"/*nonNLS*/)){
setCompactAssignmentMode(setting.getValueIndex() == 0);
}else if(optionID.equals(componentName+".tabulationChar"/*nonNLS*/)){
setIndentationUsesTab(setting.getValueIndex() == 0);
}else if(optionID.equals(componentName+".tabulationSize"/*nonNLS*/)){
- setTabSize(Integer.parseInt(setting.getValue()));
+ try {
+ setTabSize(Integer.parseInt(setting.getValue()));
+ } catch(NumberFormatException e){
+ }
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.ini b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.ini
index 1da26ddf86..33600dc602 100644
--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.ini
+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.ini
@@ -346,7 +346,7 @@ org.eclipse.jdt.internal.formatter.CodeFormatter.lineSplit=80
# ===============================================================
# FORMATTER / Compacting Assignment
# ===============================================================
-org.eclipse.jdt.internal.formatter.CodeFormatter.styleCompactAssignment=1
+org.eclipse.jdt.internal.formatter.CodeFormatter.compactAssignment=1
# Assignments can be formatted asymmetrically, e.g. 'int x= 2;', when Normal, a space
# is inserted before the assignment operator

Back to the top