mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 09:46:02 +02:00
Code Issues Wiki Activity

Improve formatter preview code

Browse source
This commit is contained in:
Anton Leherbauer 2007-04-04 16:03:23 +00:00
parent d2c7393544
commit ca26fe7a9d
3 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/BracesTabPage.java
View file

@ -36,7 +36,9 @@ public class BracesTabPage extends ModifyDialogTabPage {
*/ */
private final static String PREVIEW= private final static String PREVIEW=
createPreviewHeader(FormatterMessages.BracesTabPage_preview_header) + createPreviewHeader(FormatterMessages.BracesTabPage_preview_header) +
"#include <math.h>\n" + //$NON-NLS-1$ "#include <math.h>\n\n" + //$NON-NLS-1$
"int digits[]= { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };" + //$NON-NLS-1$
"\n\n" + //$NON-NLS-1$
"class Point {" + //$NON-NLS-1$ "class Point {" + //$NON-NLS-1$
"public:" + //$NON-NLS-1$ "public:" + //$NON-NLS-1$
"Point(double xc, double yc) : x(xc), y(yc) {}" + //$NON-NLS-1$ "Point(double xc, double yc) : x(xc), y(yc) {}" + //$NON-NLS-1$
@ -45,11 +47,13 @@ public class BracesTabPage extends ModifyDialogTabPage {
"double x;" + //$NON-NLS-1$ "double x;" + //$NON-NLS-1$
"double y;" + //$NON-NLS-1$ "double y;" + //$NON-NLS-1$
"};" + //$NON-NLS-1$ "};" + //$NON-NLS-1$
"\n\n" + //$NON-NLS-1$
"double Point::distance(const Point& other) const {" + //$NON-NLS-1$ "double Point::distance(const Point& other) const {" + //$NON-NLS-1$
"double dx = x - other.x;" + //$NON-NLS-1$ "double dx = x - other.x;" + //$NON-NLS-1$
"double dy = y - other.y;" + //$NON-NLS-1$ "double dy = y - other.y;" + //$NON-NLS-1$
"return sqrt(dx * dx + dy * dy);" + //$NON-NLS-1$ "return sqrt(dx * dx + dy * dy);" + //$NON-NLS-1$
"}"+ //$NON-NLS-1$ "}"+ //$NON-NLS-1$
"\n\n" + //$NON-NLS-1$
"int Point::compareX(const Point& other) const {" + //$NON-NLS-1$ "int Point::compareX(const Point& other) const {" + //$NON-NLS-1$
"if(x < other.x) {" + //$NON-NLS-1$ "if(x < other.x) {" + //$NON-NLS-1$
"return -1;" + //$NON-NLS-1$ "return -1;" + //$NON-NLS-1$
@ -59,6 +63,7 @@ public class BracesTabPage extends ModifyDialogTabPage {
"return 0;" + //$NON-NLS-1$ "return 0;" + //$NON-NLS-1$
"}"+ //$NON-NLS-1$ "}"+ //$NON-NLS-1$
"}"+ //$NON-NLS-1$ "}"+ //$NON-NLS-1$
"\n\n" + //$NON-NLS-1$
"namespace FOO {"+ //$NON-NLS-1$ "namespace FOO {"+ //$NON-NLS-1$
"int foo(int bar) const {" + //$NON-NLS-1$ "int foo(int bar) const {" + //$NON-NLS-1$
"switch(bar) {" + //$NON-NLS-1$ "switch(bar) {" + //$NON-NLS-1$

6
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CodeFormatterConfigurationBlock.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2000, 2006 IBM Corporation and others. * Copyright (c) 2000, 2007 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -71,14 +71,16 @@ public class CodeFormatterConfigurationBlock extends ProfileConfigurationBlock {
"/*\n* " + //$NON-NLS-1$ "/*\n* " + //$NON-NLS-1$
FormatterMessages.CodingStyleConfigurationBlock_preview_title + FormatterMessages.CodingStyleConfigurationBlock_preview_title +
"\n*/\n" + //$NON-NLS-1$ "\n*/\n" + //$NON-NLS-1$
"#include <math.h>\n" + //$NON-NLS-1$ "#include <math.h>\n\n" + //$NON-NLS-1$
"class Point {" + //$NON-NLS-1$ "class Point {" + //$NON-NLS-1$
"public:" + //$NON-NLS-1$ "public:" + //$NON-NLS-1$
"Point(double xc, double yc) : x(xc), y(yc) {}" + //$NON-NLS-1$ "Point(double xc, double yc) : x(xc), y(yc) {}" + //$NON-NLS-1$
"double distance(const Point& other) const;" + //$NON-NLS-1$ "double distance(const Point& other) const;" + //$NON-NLS-1$
"\n\n" + //$NON-NLS-1$
"double x;" + //$NON-NLS-1$ "double x;" + //$NON-NLS-1$
"double y;" + //$NON-NLS-1$ "double y;" + //$NON-NLS-1$
"};" + //$NON-NLS-1$ "};" + //$NON-NLS-1$
"\n\n" + //$NON-NLS-1$
"double Point::distance(const Point& other) const {" + //$NON-NLS-1$ "double Point::distance(const Point& other) const {" + //$NON-NLS-1$
"double dx = x - other.x;" + //$NON-NLS-1$ "double dx = x - other.x;" + //$NON-NLS-1$
"double dy = y - other.y;" + //$NON-NLS-1$ "double dy = y - other.y;" + //$NON-NLS-1$

11
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/IndentationTabPage.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2000, 2006 IBM Corporation and others. * Copyright (c) 2000, 2007 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -41,20 +41,24 @@ public class IndentationTabPage extends ModifyDialogTabPage {
*/ */
private final static String PREVIEW= private final static String PREVIEW=
createPreviewHeader(FormatterMessages.IndentationTabPage_preview_header) + createPreviewHeader(FormatterMessages.IndentationTabPage_preview_header) +
"#include <math.h>\n" + //$NON-NLS-1$ "#include <math.h>\n\n" + //$NON-NLS-1$
"class Point {" + //$NON-NLS-1$ "class Point {" + //$NON-NLS-1$
"public:" + //$NON-NLS-1$ "public:" + //$NON-NLS-1$
"Point(double xc, double yc) : x(xc), y(yc) {}" + //$NON-NLS-1$ "Point(double xc, double yc) : x(xc), y(yc) {}" + //$NON-NLS-1$
"\n\n" + //$NON-NLS-1$
"double distance(const Point& other) const;" + //$NON-NLS-1$ "double distance(const Point& other) const;" + //$NON-NLS-1$
"int compareX(const Point& other) const;" + //$NON-NLS-1$ "int compareX(const Point& other) const;" + //$NON-NLS-1$
"double x;" + //$NON-NLS-1$ "double x;" + //$NON-NLS-1$
"double y;" + //$NON-NLS-1$ "double y;" + //$NON-NLS-1$
"};" + //$NON-NLS-1$ "};" + //$NON-NLS-1$
"\n\n" + //$NON-NLS-1$
"double Point::distance(const Point& other) const {" + //$NON-NLS-1$ "double Point::distance(const Point& other) const {" + //$NON-NLS-1$
"double dx = x - other.x;" + //$NON-NLS-1$ "double dx = x - other.x;" + //$NON-NLS-1$
"double dy = y - other.y;" + //$NON-NLS-1$ "double dy = y - other.y;" + //$NON-NLS-1$
"\n\n" + //$NON-NLS-1$
"return sqrt(dx * dx + dy * dy);" + //$NON-NLS-1$ "return sqrt(dx * dx + dy * dy);" + //$NON-NLS-1$
"}"+ //$NON-NLS-1$ "}"+ //$NON-NLS-1$
"\n\n" + //$NON-NLS-1$
"int Point::compareX(const Point& other) const {" + //$NON-NLS-1$ "int Point::compareX(const Point& other) const {" + //$NON-NLS-1$
"if(x < other.x) {" + //$NON-NLS-1$ "if(x < other.x) {" + //$NON-NLS-1$
"return -1;" + //$NON-NLS-1$ "return -1;" + //$NON-NLS-1$
@ -64,6 +68,7 @@ public class IndentationTabPage extends ModifyDialogTabPage {
"return 0;" + //$NON-NLS-1$ "return 0;" + //$NON-NLS-1$
"}"+ //$NON-NLS-1$ "}"+ //$NON-NLS-1$
"}"+ //$NON-NLS-1$ "}"+ //$NON-NLS-1$
"\n\n" + //$NON-NLS-1$
"namespace FOO {"+ //$NON-NLS-1$ "namespace FOO {"+ //$NON-NLS-1$
"int foo(int bar) const {" + //$NON-NLS-1$ "int foo(int bar) const {" + //$NON-NLS-1$
"switch(bar) {" + //$NON-NLS-1$ "switch(bar) {" + //$NON-NLS-1$