From: aclement <aclement>
Date: Wed, 4 Aug 2004 13:50:41 +0000 (+0000)
Subject: platform neutral path handling.
X-Git-Tag: for_ajdt1_1_12~53
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=88a602a39d9e8f6872b65c310b4c6c83028f074b;p=aspectj.git

platform neutral path handling.
---

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java
index 6612e66ce..b4acd55be 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java
@@ -373,18 +373,27 @@ public class AjLookupEnvironment extends LookupEnvironment {
 	private void reportDeclareParentsMessage(WeaveMessage.WeaveMessageKind wmk,SourceTypeBinding sourceType,ResolvedTypeX parent) {
 		if (!factory.getWorld().getMessageHandler().isIgnoring(IMessage.WEAVEINFO)) {
 			String filename = new String(sourceType.getFileName());
-			if (filename.lastIndexOf(File.separator)!=-1)
-			filename = filename.substring(filename.lastIndexOf(File.separator)+1);
+			
+			int takefrom = filename.lastIndexOf('/');
+			if (takefrom == -1 ) takefrom = filename.lastIndexOf('\\');
+			filename = filename.substring(takefrom+1);
 
 			factory.getWorld().getMessageHandler().handleMessage(
 			WeaveMessage.constructWeavingMessage(wmk,
 				new String[]{CharOperation.toString(sourceType.compoundName),
 						filename,
 						parent.getClassName(),
-						parent.getSourceLocation().getSourceFile().getName()}));
+						getShortname(parent.getSourceLocation().getSourceFile().getPath())}));
 		}
 	}
-
+	
+	private String getShortname(String path)  {
+		int takefrom = path.lastIndexOf('/');
+		if (takefrom == -1) {
+			takefrom = path.lastIndexOf('\\');
+		}
+		return path.substring(takefrom+1);
+	}
 
 	private void addParent(SourceTypeBinding sourceType, ResolvedTypeX parent) {
 		ReferenceBinding parentBinding = (ReferenceBinding)factory.makeTypeBinding(parent); 
diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java b/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java
index 4d031bcb9..f64d91c06 100644
--- a/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java
@@ -98,7 +98,8 @@ public class BcelTypeMunger extends ConcreteTypeMunger {
 		if (worthReporting  && munger!=null && !weaver.getWorld().getMessageHandler().isIgnoring(IMessage.WEAVEINFO)) {
 			String tName = weaver.getLazyClassGen().getType().getSourceLocation().getSourceFile().getName();
 			if (tName.indexOf("no debug info available")!=-1) tName = "no debug info available";
-			String fName = getAspectType().getSourceLocation().getSourceFile().getName();
+			else tName = getShortname(weaver.getLazyClassGen().getType().getSourceLocation().getSourceFile().getPath());
+			String fName = getShortname(getAspectType().getSourceLocation().getSourceFile().getPath());
         	if (munger.getKind().equals(ResolvedTypeMunger.Parent)) {
         		// This message will come out of AjLookupEnvironment.addParent if doing a source
         		// compilation.
@@ -122,6 +123,14 @@ public class BcelTypeMunger extends ConcreteTypeMunger {
 		
 		return changed;
 	}
+	
+	private String getShortname(String path)  {
+		int takefrom = path.lastIndexOf('/');
+		if (takefrom == -1) {
+			takefrom = path.lastIndexOf('\\');
+		}
+		return path.substring(takefrom+1);
+	}
 
 
 	private boolean mungeNewParent(BcelClassWeaver weaver, NewParentTypeMunger munger) {