Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Herrmann2013-01-22 22:11:05 +0000
committerStephan Herrmann2013-01-22 22:11:05 +0000
commitb30e1f630a37054f2945fc86bef64e2686e14b1b (patch)
tree7122265a3a6c956fcf0ca345ff1e82ede3273e6a
parent27f3487cac9616f3cda7e7d6e3d091b84f562a1b (diff)
downloadorg.eclipse.objectteams-b30e1f630a37054f2945fc86bef64e2686e14b1b.tar.gz
org.eclipse.objectteams-b30e1f630a37054f2945fc86bef64e2686e14b1b.tar.xz
org.eclipse.objectteams-b30e1f630a37054f2945fc86bef64e2686e14b1b.zip
Bug 397192 - Prepare OTDT for new (dynamic) weaver:
Align error messages for not-found team from teamconfig file.
-rw-r--r--plugins/org.eclipse.objectteams.runtime/src/org/eclipse/objectteams/otre/ObjectTeamsTransformation.java3
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/regression/DevelopmentExamples.java6
2 files changed, 2 insertions, 7 deletions
diff --git a/plugins/org.eclipse.objectteams.runtime/src/org/eclipse/objectteams/otre/ObjectTeamsTransformation.java b/plugins/org.eclipse.objectteams.runtime/src/org/eclipse/objectteams/otre/ObjectTeamsTransformation.java
index d6bb6583b..1463e2a37 100644
--- a/plugins/org.eclipse.objectteams.runtime/src/org/eclipse/objectteams/otre/ObjectTeamsTransformation.java
+++ b/plugins/org.eclipse.objectteams.runtime/src/org/eclipse/objectteams/otre/ObjectTeamsTransformation.java
@@ -674,9 +674,6 @@ public abstract class ObjectTeamsTransformation
teamClass = RepositoryAccess.lookupClassFully(nextTeam);
} catch (ClassNotFoundException cfne) {
System.err.println("Config error: Team class '"+nextTeam+ "' in config file '"+ TEAM_CONFIG_FILE+"' can not be found!");
- System.err.println("Main class = "+main_class_name+
- ", class loader = "+(this.loader!=null?this.loader.getClass().getName():"null")+
- ", transformer = "+this.getClass().getName());
continue;
}
ClassGen teamClassGen = new ClassGen(teamClass);
diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/regression/DevelopmentExamples.java b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/regression/DevelopmentExamples.java
index 0ba059b3b..3856e07b6 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/regression/DevelopmentExamples.java
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/regression/DevelopmentExamples.java
@@ -4760,8 +4760,7 @@ public class DevelopmentExamples extends AbstractOTJLDTest {
false/*expectingCompileErrors*/,
null/*expectedCompilerLog*/,
"MyBase.bm()"/*expectedOutputString*/,
- "Config error: Team class \'p19.TeamX19tcf5NOTEXISTING\' in config file \'"+OUTPUT_DIR+"/p19/config5.txt\' can not be found!\n" +
- "Main class = X19tcfMain5, class loader = sun.misc.Launcher$AppClassLoader, transformer = org.eclipse.objectteams.otre.SubBoundBaseMethodRedefinition"/*exepectedErrorString*/,
+ "Config error: Team class \'p19.TeamX19tcf5NOTEXISTING\' in config file \'"+OUTPUT_DIR+"/p19/config5.txt\' can not be found!" /*exepectedErrorString*/,
false/*forceExecution*/,
null/*classLibraries*/,
false/*shouldFlushOutputDirectory*/,
@@ -4822,8 +4821,7 @@ public class DevelopmentExamples extends AbstractOTJLDTest {
"MyTeam.MyRole.rm()\n" +
"MyBase.bm()\n" +
"MyTeam.MyRole.rm()"/*expectedOutputString*/,
- "Config error: Team class 'p19.TeamX19tcf5aNOTEXISTING' in config file '"+OUTPUT_DIR+"/p19/config5a.txt' can not be found!\n" +
- "Main class = X19tcfMain5a, class loader = sun.misc.Launcher$AppClassLoader, transformer = org.eclipse.objectteams.otre.SubBoundBaseMethodRedefinition"/*expectedErrorOutput*/,
+ "Config error: Team class 'p19.TeamX19tcf5aNOTEXISTING' in config file '"+OUTPUT_DIR+"/p19/config5a.txt' can not be found!",
false/*forceExecution*/,
null/*classLibraries*/,
false/*shouldFlushOutputDirectory*/,

Back to the top