You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by al...@apache.org on 2006/11/28 23:23:00 UTC
svn commit: r480246 - in
/incubator/uima/uimaj/trunk/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp:
JgPluginRunner.java MergerImpl.java
Author: alally
Date: Tue Nov 28 14:22:59 2006
New Revision: 480246
URL: http://svn.apache.org/viewvc?view=rev&rev=480246
Log:
UIMA-48: reformatted code due to previously incorrect setting
for the indent after line wrapping.
http://issues.apache.org/jira/browse/UIMA-48
Modified:
incubator/uima/uimaj/trunk/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/JgPluginRunner.java
incubator/uima/uimaj/trunk/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/MergerImpl.java
Modified: incubator/uima/uimaj/trunk/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/JgPluginRunner.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/JgPluginRunner.java?view=diff&rev=480246&r1=480245&r2=480246
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/JgPluginRunner.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/JgPluginRunner.java Tue Nov 28 14:22:59 2006
@@ -45,7 +45,7 @@
IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
public void run(IProgressMonitor progressMonitor) throws CoreException {
jg.main0(arguments, new MergerImpl(), null, // no progressMonitor,
- new EP_LogThrowErrorImpl());
+ new EP_LogThrowErrorImpl());
}
};
workspace.run(runnable, null);
Modified: incubator/uima/uimaj/trunk/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/MergerImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/MergerImpl.java?view=diff&rev=480246&r1=480245&r2=480246
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/MergerImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/MergerImpl.java Tue Nov 28 14:22:59 2006
@@ -36,11 +36,11 @@
static JControlModel jControlModelInstance = null;
public void doMerge(Jg jg, IProgressMonitor progressMonitor, String sourceContents,
- String targetContainer, String targetPath, String targetClassName, File targetFile)
- throws IOException {
+ String targetContainer, String targetPath, String targetClassName, File targetFile)
+ throws IOException {
JMerger jMerger = new JMerger();
IDOMCompilationUnit sourceCompilationUnit = jMerger
- .createCompilationUnitForContents(sourceContents);
+ .createCompilationUnitForContents(sourceContents);
if (targetFile.exists()) {
progressMonitor.subTask(jg.getString("updatingTarget", new Object[] { targetClassName }));
@@ -60,7 +60,7 @@
jMerger.setTargetCompilationUnit(jMerger.createCompilationUnitForURI(targetPath));
} catch (NullPointerException e) {
jg.error.newError(IError.ERROR, jg.getString("nullPtr", new Object[] { targetClassName }),
- e);
+ e);
}
// jMerger.getTargetPatternDictionary().dump();