Cleanup after comments for https://git.eclipse.org/r/#/c/23544/
Change-Id: I099d048952bc89700890dc3e6c630264d3ac4185
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/util/Generator.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/util/Generator.java
index 1dac6d5..cad5783 100644
--- a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/util/Generator.java
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/util/Generator.java
@@ -649,7 +649,7 @@
}
private void generateEditPartProvider() throws UnexpectedBehaviourException, InterruptedException {
- internalGenerateJavaClass(myEmitters.getEditPartProviderEmitter(), myDiagram.getProvidersPackageName(), myDiagram.getEditPartProviderClassName(), myDiagram);
+ doGenerateJavaClass(myEmitters.getEditPartProviderEmitter(), myDiagram.getProvidersPackageName(), myDiagram.getEditPartProviderClassName(), myDiagram);
}
private void generateModelingAssistantProvider() throws UnexpectedBehaviourException, InterruptedException {
@@ -717,7 +717,7 @@
}
private void generateDiagramEditorUtil() throws UnexpectedBehaviourException, InterruptedException {
- internalGenerateJavaClass(myEmitters.getDiagramEditorUtilEmitter(), myEditorGen.getEditor().getPackageName(), myDiagram.getDiagramEditorUtilClassName(), myDiagram);
+ doGenerateJavaClass(myEmitters.getDiagramEditorUtilEmitter(), myEditorGen.getEditor().getPackageName(), myDiagram.getDiagramEditorUtilClassName(), myDiagram);
}
private void generateVisualIDRegistry() throws InterruptedException {
@@ -1163,15 +1163,8 @@
// util
- /**
- * Passes initialized ImportManager as second template argument
- */
- private void internalGenerateJavaClass(TextEmitter emitter, String packageName, String className, Object argument) throws InterruptedException {
- doGenerateJavaClass(emitter, packageName, className, argument);
- }
-
- private void internalGenerateJavaClass(TextEmitter emitter, String qualifiedName, Object argument) throws InterruptedException {
- internalGenerateJavaClass(emitter, CodeGenUtil.getPackageName(qualifiedName), CodeGenUtil.getSimpleClassName(qualifiedName), argument);
+ private void internalGenerateJavaClass(TextEmitter emitter, String qualifiedName, EObject input) throws InterruptedException {
+ doGenerateJavaClass(emitter, CodeGenUtil.getPackageName(qualifiedName), CodeGenUtil.getSimpleClassName(qualifiedName), input);
}
private IPath guessProjectLocation(String projectName) {
diff --git a/plugins/org.eclipse.gmf.common/src/org/eclipse/gmf/internal/common/codegen/GeneratorBase.java b/plugins/org.eclipse.gmf.common/src/org/eclipse/gmf/internal/common/codegen/GeneratorBase.java
index 3e73dea..9c27136 100644
--- a/plugins/org.eclipse.gmf.common/src/org/eclipse/gmf/internal/common/codegen/GeneratorBase.java
+++ b/plugins/org.eclipse.gmf.common/src/org/eclipse/gmf/internal/common/codegen/GeneratorBase.java
@@ -65,15 +65,22 @@
public abstract class GeneratorBase implements Runnable {
private CodeFormatter myCodeFormatter;
- private OrganizeImportsPostprocessor myImportsPostprocessor;
+
+ private OrganizeImportsPostprocessor myImportsPostprocessor;
+
private IProgressMonitor myProgress = new NullProgressMonitor();
// myDestRoot.getJavaProject().getElementName() == myDestProject.getName()
private IPackageFragmentRoot myDestRoot;
+
private IProject myDestProject;
+
private final List<IStatus> myExceptions;
+
private IStatus myRunStatus = Status.CANCEL_STATUS;
+
private TextMerger myMerger;
+
private final boolean isToRestoreExistingImports = true;
protected abstract void customRun() throws InterruptedException, UnexpectedBehaviourException;
@@ -186,7 +193,7 @@
* @see #initializeEditorProject(String, IPath, List)
*/
protected final void initializeEditorProject(String pluginId, IPath projectLocation) throws UnexpectedBehaviourException, InterruptedException {
- initializeEditorProject(pluginId, projectLocation, Collections.<IProject>emptyList());
+ initializeEditorProject(pluginId, projectLocation, Collections.<IProject> emptyList());
}
/**
@@ -240,7 +247,7 @@
throw new UnexpectedBehaviourException("no source root can be found");
}
}
-
+
/**
* Generate ordinary file.
* @param emitter template to use
@@ -330,17 +337,16 @@
return new ImportUtil(packageName, className, myDestRoot);
}
-
protected final void doGenerate(JavaClassEmitter emitter, Object... input) throws InterruptedException, UnexpectedBehaviourException {
if (emitter != null) {
doGenerateJavaClass(emitter, emitter.getQualifiedClassName(input), input);
}
}
-
+
protected final void doGenerateJavaClass(TextEmitter emitter, String qualifiedClassName, Object... input) throws InterruptedException {
if (emitter != null) {
doGenerateJavaClass(emitter, CodeGenUtil.getPackageName(qualifiedClassName), CodeGenUtil.getSimpleClassName(qualifiedClassName), input);
- }
+ }
}
/**
@@ -349,64 +355,66 @@
* return qualified class names.
*/
protected final void doGenerateJavaClass(TextEmitter emitter, String packageName, String className, Object... input) throws InterruptedException {
- if (emitter != null) {
- IProgressMonitor pm = getNextStepMonitor();
- try {
- setProgressTaskName(className);
- pm.beginTask(null, 7);
- String genText = emitter.generate(new SubProgressMonitor(pm, 2), input);
- IPackageFragment pf = myDestRoot.createPackageFragment(packageName, true, new SubProgressMonitor(pm, 1));
- ICompilationUnit cu = pf.getCompilationUnit(className + ".java"); //$NON-NLS-1$
- if (cu.exists()) {
- ICompilationUnit workingCopy = null;
+ IProgressMonitor pm = getNextStepMonitor();
+ setProgressTaskName(className);
+ pm.beginTask(null, 7);
+ if (emitter == null) {
+ pm.done();
+ return;
+ }
+ try {
+ String genText = emitter.generate(new SubProgressMonitor(pm, 2), input);
+ IPackageFragment pf = myDestRoot.createPackageFragment(packageName, true, new SubProgressMonitor(pm, 1));
+ ICompilationUnit cu = pf.getCompilationUnit(className + ".java"); //$NON-NLS-1$
+ if (cu.exists()) {
+ ICompilationUnit workingCopy = null;
+ try {
+ workingCopy = cu.getWorkingCopy(new SubProgressMonitor(pm, 1));
+ final String oldContents = workingCopy.getSource();
+ IImportDeclaration[] declaredImports = workingCopy.getImports();
+ workingCopy.getBuffer().setContents(genText);
+ workingCopy.reconcile(ICompilationUnit.NO_AST, false, null, null);
try {
- workingCopy = cu.getWorkingCopy(new SubProgressMonitor(pm, 1));
- final String oldContents = workingCopy.getSource();
- IImportDeclaration[] declaredImports = workingCopy.getImports();
- workingCopy.getBuffer().setContents(genText);
- workingCopy.reconcile(ICompilationUnit.NO_AST, false, null, null);
- try {
- //Since we do organizeImports prior to merge, we must ensure imports added manually are known to OrganizeImportsProcessor
- String[] declaredImportsAsStrings = new String[declaredImports.length];
- for (int i=0; i<declaredImports.length; i++) {
- declaredImportsAsStrings[i] = declaredImports[i].getElementName();
- }
- getImportsPostrocessor().organizeImports(workingCopy, declaredImportsAsStrings, new SubProgressMonitor(pm, 1));
- } catch (CoreException e) {
- workingCopy.commitWorkingCopy(true, new SubProgressMonitor(pm, 1)); // save to investigate contents
- throw e;
+ //Since we do organizeImports prior to merge, we must ensure imports added manually are known to OrganizeImportsProcessor
+ String[] declaredImportsAsStrings = new String[declaredImports.length];
+ for (int i = 0; i < declaredImports.length; i++) {
+ declaredImportsAsStrings[i] = declaredImports[i].getElementName();
}
- genText = mergeJavaCode(oldContents, workingCopy.getSource(), new SubProgressMonitor(pm, 1));
- genText = formatCode(genText);
- if (!genText.equals(oldContents)) {
- workingCopy.getBuffer().setContents(genText);
- workingCopy.reconcile(ICompilationUnit.NO_AST, false, null, null);
- workingCopy.commitWorkingCopy(true, new SubProgressMonitor(pm, 1));
- } else {
- // discard changes - would happen in finally, nothing else to do
- pm.worked(1);
- }
- } finally {
- workingCopy.discardWorkingCopy();
+ getImportsPostrocessor().organizeImports(workingCopy, declaredImportsAsStrings, new SubProgressMonitor(pm, 1));
+ } catch (CoreException e) {
+ workingCopy.commitWorkingCopy(true, new SubProgressMonitor(pm, 1)); // save to investigate contents
+ throw e;
}
- } else {
- cu = pf.createCompilationUnit(cu.getElementName(), genText, true, new SubProgressMonitor(pm, 1));
- getImportsPostrocessor().organizeImports(cu, null, new SubProgressMonitor(pm, 1));
- String newContents = formatCode(cu.getSource());
- cu.getBuffer().setContents(newContents);
- cu.save(new SubProgressMonitor(pm, 2), true);
+ genText = mergeJavaCode(oldContents, workingCopy.getSource(), new SubProgressMonitor(pm, 1));
+ genText = formatCode(genText);
+ if (!genText.equals(oldContents)) {
+ workingCopy.getBuffer().setContents(genText);
+ workingCopy.reconcile(ICompilationUnit.NO_AST, false, null, null);
+ workingCopy.commitWorkingCopy(true, new SubProgressMonitor(pm, 1));
+ } else {
+ // discard changes - would happen in finally, nothing else to do
+ pm.worked(1);
+ }
+ } finally {
+ workingCopy.discardWorkingCopy();
}
- } catch (NullPointerException ex) {
- handleException(ex);
- } catch (InvocationTargetException ex) {
- handleException(ex.getCause());
- } catch (UnexpectedBehaviourException ex) {
- handleUnexpected(ex);
- } catch (CoreException ex) {
- handleException(ex);
- } finally {
- pm.done();
+ } else {
+ cu = pf.createCompilationUnit(cu.getElementName(), genText, true, new SubProgressMonitor(pm, 1));
+ getImportsPostrocessor().organizeImports(cu, null, new SubProgressMonitor(pm, 1));
+ String newContents = formatCode(cu.getSource());
+ cu.getBuffer().setContents(newContents);
+ cu.save(new SubProgressMonitor(pm, 2), true);
}
+ } catch (NullPointerException ex) {
+ handleException(ex);
+ } catch (InvocationTargetException ex) {
+ handleException(ex.getCause());
+ } catch (UnexpectedBehaviourException ex) {
+ handleUnexpected(ex);
+ } catch (CoreException ex) {
+ handleException(ex);
+ } finally {
+ pm.done();
}
}
@@ -492,6 +500,7 @@
try {
setupProgressMonitor();
ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
+
public void run(IProgressMonitor monitor) throws CoreException {
try {
customRun();
@@ -503,7 +512,7 @@
} catch (UnexpectedBehaviourException ex) {
myRunStatus = new Status(Status.ERROR, Activator.getID(), 0, Messages.unexpected, ex);
} catch (InterruptedException ex) {
- myRunStatus = new Status(IStatus.CANCEL, Activator.getID(), 0, Messages.interrupted, ex);
+ myRunStatus = new Status(IStatus.CANCEL, Activator.getID(), 0, Messages.interrupted, ex);
}
}
}, null);
@@ -532,7 +541,7 @@
return myImportsPostprocessor;
}
- private final void clearExceptionsList(){
+ private final void clearExceptionsList() {
myExceptions.clear();
}
@@ -546,8 +555,11 @@
}
public static final class Counter {
+
private final HashMap<EClass, Integer> myCounters = new HashMap<EClass, Integer>();
+
private final HashMap<EClass, Integer> myCache = new HashMap<EClass, Integer>();
+
private final Integer CACHE_MISS = new Integer(0);
public Counter() {
