Browse Source

Minor code cosmetics

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
pull/138/merge
Alexander Kriegisch 2 weeks ago
parent
commit
b48e5d71a9

+ 1
- 1
bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/JavaClass.java View File

@@ -402,7 +402,7 @@ public class JavaClass extends Modifiers implements Cloneable, Node {
}

/**
* @return sbsolute path to file where this class was read from
* @return absolute path to file where this class was read from
*/
public String getSourceFileName() {
return sourcefileName;

+ 1
- 1
bridge/src/main/java/org/aspectj/bridge/MessageUtil.java View File

@@ -827,7 +827,7 @@ public class MessageUtil {
for (Iterator<ISourceLocation> iter = message.getExtraSourceLocations().iterator(); iter.hasNext();) {
ISourceLocation element = iter.next();
if (element != null) {
writer.print("\tsee also: " + element.toString());
writer.print("\tsee also: " + element);
if (iter.hasNext()) {
writer.println();
}

+ 4
- 6
org.aspectj.matcher/src/main/java/org/aspectj/weaver/AbstractReferenceTypeDelegate.java View File

@@ -75,17 +75,15 @@ public abstract class AbstractReferenceTypeDelegate implements ReferenceTypeDele

public final void setSourcefilename(String sourceFileName) {
sourcefilename = sourceFileName;
if (sourceFileName != null && sourceFileName.equals(AbstractReferenceTypeDelegate.UNKNOWN_SOURCE_FILE)) {
if (AbstractReferenceTypeDelegate.UNKNOWN_SOURCE_FILE.equals(sourceFileName))
sourcefilename = "Type '" + getResolvedTypeX().getName() + "' (no debug info available)";
} else {
else {
String pname = getResolvedTypeX().getPackageName();
if (pname != null) {
if (pname != null)
sourcefilename = pname.replace('.', '/') + '/' + sourceFileName;
}
}
if (sourcefilename != null && sourceContext instanceof SourceContextImpl) {
if (sourcefilename != null && sourceContext instanceof SourceContextImpl)
((SourceContextImpl) sourceContext).setSourceFileName(sourcefilename);
}
}

public ISourceLocation getSourceLocation() {

+ 1
- 1
weaver/src/main/java/org/aspectj/weaver/bcel/BcelWorld.java View File

@@ -273,7 +273,7 @@ public class BcelWorld extends World implements Repository {
}
// if it's a binary file then also want to give the file name
if (isl.getSourceFileName() != null) {
nice.append("(from " + isl.getSourceFileName() + ")");
nice.append("(from ").append(isl.getSourceFileName()).append(")");
}
}
return nice.toString();

Loading…
Cancel
Save