From 14d94dafe0b537f859532e7fb02dbfedec8a41c7 Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Mon, 9 Jan 2012 18:09:55 -0800 Subject: [PATCH] Cosmetics. --- .../core/dom/parser/c/CVariableReadWriteFlags.java | 6 ++---- .../cpp/semantics/CPPVariableReadWriteFlags.java | 4 +--- .../eclipse/cdt/internal/ui/search/CSearchUtil.java | 10 ++++------ .../cdt/internal/ui/search/LineSearchElement.java | 3 ++- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CVariableReadWriteFlags.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CVariableReadWriteFlags.java index 67704164d75..36d4e63ccbd 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CVariableReadWriteFlags.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CVariableReadWriteFlags.java @@ -28,7 +28,6 @@ import org.eclipse.cdt.internal.core.dom.parser.VariableReadWriteFlags; * with the variable. */ public final class CVariableReadWriteFlags extends VariableReadWriteFlags { - private static CVariableReadWriteFlags INSTANCE= new CVariableReadWriteFlags(); public static int getReadWriteFlags(IASTName variable) { @@ -73,15 +72,14 @@ public final class CVariableReadWriteFlags extends VariableReadWriteFlags { if (indirection == 0) { return READ; } - while(indirection > 0 && (type instanceof IPointerType)) { + while (indirection > 0 && (type instanceof IPointerType)) { type= ((IPointerType) type).getType(); indirection--; } if (indirection == 0) { if (type instanceof IQualifierType) { return ((IQualifierType) type).isConst() ? READ : READ | WRITE; - } - else if (type instanceof IPointerType) { + } else if (type instanceof IPointerType) { return ((IPointerType) type).isConst() ? READ : READ | WRITE; } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVariableReadWriteFlags.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVariableReadWriteFlags.java index 89862e99f52..d8d9464f7dc 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVariableReadWriteFlags.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVariableReadWriteFlags.java @@ -35,7 +35,6 @@ import org.eclipse.cdt.internal.core.dom.parser.VariableReadWriteFlags; * with the variable. */ public final class CPPVariableReadWriteFlags extends VariableReadWriteFlags { - private static CPPVariableReadWriteFlags INSTANCE= new CPPVariableReadWriteFlags(); public static int getReadWriteFlags(IASTName variable) { @@ -109,8 +108,7 @@ public final class CPPVariableReadWriteFlags extends VariableReadWriteFlags { if (indirection == 0) { if (type instanceof IQualifierType) { return ((IQualifierType) type).isConst() ? READ : READ | WRITE; - } - else if (type instanceof IPointerType) { + } else if (type instanceof IPointerType) { return ((IPointerType) type).isConst() ? READ : READ | WRITE; } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchUtil.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchUtil.java index 0d839f76902..0995da90ff2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchUtil.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchUtil.java @@ -21,7 +21,6 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVariableReadWri import org.eclipse.cdt.internal.core.pdom.dom.PDOMName; public class CSearchUtil { - public static int LRU_WORKINGSET_LIST_SIZE= 3; private static LRUWorkingSets workingSetsCache; @@ -44,10 +43,10 @@ public class CSearchUtil { } public static String toString(IWorkingSet[] workingSets) { - if( workingSets != null && workingSets.length > 0 ){ + if (workingSets != null && workingSets.length > 0) { String string = new String(); - for( int i = 0; i < workingSets.length; i++ ){ - if( i > 0 ) + for (int i = 0; i < workingSets.length; i++) { + if (i > 0) string += ", "; //$NON-NLS-1$ string += workingSets[i].getName(); } @@ -62,8 +61,7 @@ public class CSearchUtil { boolean isWrite; if (binding instanceof ICPPVariable) { isWrite = ((CPPVariableReadWriteFlags.getReadWriteFlags(node) & PDOMName.WRITE_ACCESS) != 0); - } - else { + } else { isWrite = ((CVariableReadWriteFlags.getReadWriteFlags(node) & PDOMName.WRITE_ACCESS) != 0); } return isWrite; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/LineSearchElement.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/LineSearchElement.java index e2379e7edf4..0f8e661b951 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/LineSearchElement.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/LineSearchElement.java @@ -39,7 +39,8 @@ public class LineSearchElement extends PDOMSearchElement { private final ICElement fEnclosingElement; private final boolean fIsWriteAccess; - public Match(int offset, int length, boolean isPolymorphicCall, ICElement enclosingElement, boolean isWriteAccess) { + public Match(int offset, int length, boolean isPolymorphicCall, ICElement enclosingElement, + boolean isWriteAccess) { fOffset = offset; fLength = length; fIsPolymorphicCall = isPolymorphicCall;