diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/Database.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/Database.java index 78c7670e9b5..4954161c346 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/Database.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/Database.java @@ -14,6 +14,14 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core.pdom.db; +import com.ibm.icu.text.MessageFormat; + +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.osgi.util.NLS; + import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; @@ -24,14 +32,6 @@ import java.nio.channels.ClosedChannelException; import java.nio.channels.FileChannel; import java.util.ArrayList; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.osgi.util.NLS; - -import com.ibm.icu.text.MessageFormat; - /** * Database encapsulates access to a flat binary format file with a memory-manager-like API for * obtaining and releasing areas of storage (memory). @@ -308,7 +308,7 @@ public class Database { long freeblock = 0; int useDeltas; for (useDeltas= needDeltas; useDeltas <= MAX_BLOCK_DELTAS; useDeltas++) { - freeblock = getFirstBlock(useDeltas*BLOCK_SIZE_DELTA); + freeblock = getFirstBlock(useDeltas * BLOCK_SIZE_DELTA); if (freeblock != 0) break; } @@ -322,24 +322,24 @@ public class Database { chunk = getChunk(freeblock); } else { chunk = getChunk(freeblock); - removeBlock(chunk, useDeltas*BLOCK_SIZE_DELTA, freeblock); + removeBlock(chunk, useDeltas * BLOCK_SIZE_DELTA, freeblock); } - final int unusedDeltas = useDeltas-needDeltas; + final int unusedDeltas = useDeltas - needDeltas; if (unusedDeltas >= MIN_BLOCK_DELTAS) { // Add in the unused part of our block. - addBlock(chunk, unusedDeltas*BLOCK_SIZE_DELTA, freeblock + needDeltas*BLOCK_SIZE_DELTA); + addBlock(chunk, unusedDeltas * BLOCK_SIZE_DELTA, freeblock + needDeltas * BLOCK_SIZE_DELTA); useDeltas= needDeltas; } // Make our size negative to show in use. - final int usedSize= useDeltas*BLOCK_SIZE_DELTA; + final int usedSize= useDeltas * BLOCK_SIZE_DELTA; chunk.putShort(freeblock, (short) -usedSize); // Clear out the block, lots of people are expecting this. - chunk.clear(freeblock + BLOCK_HEADER_SIZE, usedSize-BLOCK_HEADER_SIZE); + chunk.clear(freeblock + BLOCK_HEADER_SIZE, usedSize - BLOCK_HEADER_SIZE); - malloced+= usedSize; + malloced += usedSize; return freeblock + BLOCK_HEADER_SIZE; } @@ -352,7 +352,7 @@ public class Database { chunk.fDirty = true; if (newChunkIndex >= fChunksAllocated) { - int increment = Math.max(1024, fChunksAllocated/20); + int increment = Math.max(1024, fChunksAllocated / 20); Chunk[] newchunks = new Chunk[fChunksAllocated + increment]; System.arraycopy(fChunks, 0, newchunks, 0, fChunksAllocated); @@ -374,8 +374,8 @@ public class Database { if (address >= MAX_DB_SIZE) { Object bindings[] = { this.getLocation().getAbsolutePath(), MAX_DB_SIZE }; throw new CoreException(new Status(IStatus.ERROR, CCorePlugin.PLUGIN_ID, - CCorePlugin.STATUS_PDOM_TOO_LARGE, NLS.bind(CCorePlugin - .getResourceString("pdom.DatabaseTooLarge"), bindings), null)); //$NON-NLS-1$ + CCorePlugin.STATUS_PDOM_TOO_LARGE, NLS.bind( + CCorePlugin.getResourceString("pdom.DatabaseTooLarge"), bindings), null)); //$NON-NLS-1$ } return address; } @@ -388,7 +388,7 @@ public class Database { assert fExclusiveLock; synchronized (fCache) { final int oldLen= fChunks.length; - Chunk[] newchunks = new Chunk[oldLen+numChunks]; + Chunk[] newchunks = new Chunk[oldLen + numChunks]; System.arraycopy(fChunks, 0, newchunks, 0, oldLen); for (int i = oldLen; i < oldLen + numChunks; i++) { newchunks[i]= null; @@ -398,8 +398,8 @@ public class Database { newchunks[ oldLen + numChunks - 1 ] = chunk; fChunks= newchunks; fCache.add(chunk, true); - fChunksAllocated=oldLen+numChunks; - fChunksUsed=oldLen+numChunks; + fChunksAllocated=oldLen + numChunks; + fChunksUsed=oldLen + numChunks; return (long) (oldLen + numChunks - 1) * CHUNK_SIZE; } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPBase.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPBase.java index ca112bfc0c0..1be7f7fae84 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPBase.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPBase.java @@ -53,7 +53,7 @@ class PDOMCPPBase implements ICPPBase, ICPPInternalBase { this.linkage = linkage; this.record = db.malloc(RECORD_SIZE); db.putRecPtr(record + CLASS_DEFINITION, classDefName.getRecord()); - linkage.storeType(record+BASECLASS_TYPE, base.getBaseClassType()); + linkage.storeType(record + BASECLASS_TYPE, base.getBaseClassType()); byte flags = (byte)(base.getVisibility() | (base.isVirtual() ? 4 : 0)); db.putByte(record + FLAGS, flags); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassType.java index bbe9d762471..e9779d0127f 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassType.java @@ -15,10 +15,6 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core.pdom.dom.cpp; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.IPDOMVisitor; import org.eclipse.cdt.core.dom.ast.ASTTypeUtil; @@ -46,6 +42,10 @@ import org.eclipse.cdt.internal.core.pdom.dom.PDOMName; import org.eclipse.cdt.internal.core.pdom.dom.PDOMNode; import org.eclipse.core.runtime.CoreException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + /** * @author Doug Schaefer */ @@ -145,7 +145,7 @@ class PDOMCPPClassType extends PDOMCPPBinding implements IPDOMCPPClassType, IPDO } public void addBases(PDOMName classDefName, ICPPBase[] bases) throws CoreException { - getPDOM().removeCachedResult(record+PDOMCPPLinkage.CACHE_BASES); + getPDOM().removeCachedResult(record + PDOMCPPLinkage.CACHE_BASES); final PDOMLinkage linkage = getLinkage(); PDOMCPPBase firstBase = getFirstBase(); for (ICPPBase base : bases) { @@ -159,7 +159,7 @@ class PDOMCPPClassType extends PDOMCPPBinding implements IPDOMCPPClassType, IPDO public void removeBases(PDOMName classDefName) throws CoreException { final PDOM pdom = getPDOM(); final Database db = getDB(); - pdom.removeCachedResult(record+PDOMCPPLinkage.CACHE_BASES); + pdom.removeCachedResult(record + PDOMCPPLinkage.CACHE_BASES); PDOMCPPBase base= getFirstBase(); PDOMCPPBase prevBase= null; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPEnumeration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPEnumeration.java index 1c8c7b53f6a..dc00b59e45b 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPEnumeration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPEnumeration.java @@ -6,9 +6,9 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Doug Schaefer (QNX) - Initial API and implementation - * Markus Schorn (Wind River Systems) - * Sergey Prigogin (Google) + * Doug Schaefer (QNX) - Initial API and implementation + * Markus Schorn (Wind River Systems) + * Sergey Prigogin (Google) *******************************************************************************/ package org.eclipse.cdt.internal.core.pdom.dom.cpp; @@ -41,7 +41,6 @@ import org.eclipse.core.runtime.CoreException; * Enumerations in the index. */ class PDOMCPPEnumeration extends PDOMCPPBinding implements IPDOMCPPEnumType, IPDOMMemberOwner { - private static final int OFFSET_ENUMERATOR_LIST = PDOMBinding.RECORD_SIZE; private static final int OFFSET_MIN_VALUE= OFFSET_ENUMERATOR_LIST + Database.PTR_SIZE; private static final int OFFSET_MAX_VALUE= OFFSET_MIN_VALUE + 8; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFriend.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFriend.java index 3c67421d4ee..797abb27ede 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFriend.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFriend.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Markus Schorn - initial API and implementation + * Markus Schorn - initial API and implementation *******************************************************************************/ package org.eclipse.cdt.internal.core.pdom.dom.cpp; @@ -19,7 +19,6 @@ import org.eclipse.cdt.internal.core.pdom.dom.PDOMNode; import org.eclipse.core.runtime.CoreException; class PDOMCPPFriend extends PDOMNode { - private static final int FRIEND_SPECIFIER = PDOMNode.RECORD_SIZE + 0; private static final int NEXT_FRIEND = PDOMNode.RECORD_SIZE + 4; @@ -79,5 +78,4 @@ class PDOMCPPFriend extends PDOMNode { public void delete() throws CoreException { getDB().free(record); } - }