Bug 509439 - The jet builder generates a different code than committed
code
Change-Id: I34b8b63224d09029cbcc4e4e48578c21f60ed008
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java
index f511bd0..0f1e1f6 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java
@@ -24,13 +24,13 @@
public String generate(Object argument)
{
final StringBuffer stringBuffer = new StringBuffer();
- JavaClass domainClass = (JavaClass)argument;
+ JavaClass domainClass = (JavaClass)argument;
stringBuffer.append(TEXT_1);
- if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) {
+ if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) {
stringBuffer.append(TEXT_2);
stringBuffer.append( domainClass.getPackageFragment().getElementName() );
stringBuffer.append(TEXT_3);
- }
+ }
stringBuffer.append(TEXT_4);
stringBuffer.append( domainClass.getName() );
stringBuffer.append(TEXT_5);
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java
index 7d4a09e..20a79b8 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java
@@ -29,27 +29,27 @@
public String generate(Object argument)
{
final StringBuffer stringBuffer = new StringBuffer();
- DynamicMenuContributionClass domainClass = (DynamicMenuContributionClass)argument;
+ DynamicMenuContributionClass domainClass = (DynamicMenuContributionClass)argument;
stringBuffer.append(TEXT_1);
- if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) {
+ if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) {
stringBuffer.append(TEXT_2);
stringBuffer.append( domainClass.getPackageFragment().getElementName() );
stringBuffer.append(TEXT_3);
- }
+ }
stringBuffer.append(TEXT_4);
- if( domainClass.isUseAboutToHide() ) {
+ if( domainClass.isUseAboutToHide() ) {
stringBuffer.append(TEXT_5);
- }
+ }
stringBuffer.append(TEXT_6);
stringBuffer.append( domainClass.getName() );
stringBuffer.append(TEXT_7);
stringBuffer.append( domainClass.getAboutToShowMethodName() );
stringBuffer.append(TEXT_8);
- if( domainClass.isUseAboutToHide() ) {
+ if( domainClass.isUseAboutToHide() ) {
stringBuffer.append(TEXT_9);
stringBuffer.append( domainClass.getAboutToHideMethodName() );
stringBuffer.append(TEXT_10);
- }
+ }
stringBuffer.append(TEXT_11);
return stringBuffer.toString();
}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
index 6f11b13..f9cfd2c 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
@@ -29,27 +29,27 @@
public String generate(Object argument)
{
final StringBuffer stringBuffer = new StringBuffer();
- HandlerClass domainClass = (HandlerClass)argument;
+ HandlerClass domainClass = (HandlerClass)argument;
stringBuffer.append(TEXT_1);
- if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) {
+ if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) {
stringBuffer.append(TEXT_2);
stringBuffer.append( domainClass.getPackageFragment().getElementName() );
stringBuffer.append(TEXT_3);
- }
+ }
stringBuffer.append(TEXT_4);
- if( domainClass.isUseCanExecute() ) {
+ if( domainClass.isUseCanExecute() ) {
stringBuffer.append(TEXT_5);
- }
+ }
stringBuffer.append(TEXT_6);
stringBuffer.append( domainClass.getName() );
stringBuffer.append(TEXT_7);
stringBuffer.append( domainClass.getExecuteMethodName() );
stringBuffer.append(TEXT_8);
- if( domainClass.isUseCanExecute() ) {
+ if( domainClass.isUseCanExecute() ) {
stringBuffer.append(TEXT_9);
stringBuffer.append( domainClass.getCanExecuteMethodName() );
stringBuffer.append(TEXT_10);
- }
+ }
stringBuffer.append(TEXT_11);
return stringBuffer.toString();
}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
index 975a84d..20843b9 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
@@ -41,54 +41,54 @@
public String generate(Object argument)
{
final StringBuffer stringBuffer = new StringBuffer();
- PartClass domainClass = (PartClass)argument;
+ PartClass domainClass = (PartClass)argument;
stringBuffer.append(TEXT_1);
- if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) {
+ if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) {
stringBuffer.append(TEXT_2);
stringBuffer.append( domainClass.getPackageFragment().getElementName() );
stringBuffer.append(TEXT_3);
- }
+ }
stringBuffer.append(TEXT_4);
- if( domainClass.isUsePostConstruct() ) {
+ if( domainClass.isUsePostConstruct() ) {
stringBuffer.append(TEXT_5);
- }
- if( domainClass.isUsePredestroy() ) {
+ }
+ if( domainClass.isUsePredestroy() ) {
stringBuffer.append(TEXT_6);
- }
- if( domainClass.isUseFocus() ) {
+ }
+ if( domainClass.isUseFocus() ) {
stringBuffer.append(TEXT_7);
- }
- if( domainClass.isUsePersist() ) {
+ }
+ if( domainClass.isUsePersist() ) {
stringBuffer.append(TEXT_8);
- }
+ }
stringBuffer.append(TEXT_9);
stringBuffer.append( domainClass.getName() );
stringBuffer.append(TEXT_10);
stringBuffer.append( domainClass.getName() );
stringBuffer.append(TEXT_11);
- if( domainClass.isUsePostConstruct() ) {
+ if( domainClass.isUsePostConstruct() ) {
stringBuffer.append(TEXT_12);
stringBuffer.append( domainClass.getPostConstructMethodName() );
stringBuffer.append(TEXT_13);
- }
+ }
stringBuffer.append(TEXT_14);
- if( domainClass.isUsePredestroy() ) {
+ if( domainClass.isUsePredestroy() ) {
stringBuffer.append(TEXT_15);
stringBuffer.append( domainClass.getPreDestroyMethodName() );
stringBuffer.append(TEXT_16);
- }
+ }
stringBuffer.append(TEXT_17);
- if( domainClass.isUseFocus() ) {
+ if( domainClass.isUseFocus() ) {
stringBuffer.append(TEXT_18);
stringBuffer.append( domainClass.getFocusMethodName() );
stringBuffer.append(TEXT_19);
- }
+ }
stringBuffer.append(TEXT_20);
- if( domainClass.isUsePersist() ) {
+ if( domainClass.isUsePersist() ) {
stringBuffer.append(TEXT_21);
stringBuffer.append( domainClass.getPersistMethodName() );
stringBuffer.append(TEXT_22);
- }
+ }
stringBuffer.append(TEXT_23);
return stringBuffer.toString();
}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java
index 55f02da..5a0405f 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java
@@ -28,24 +28,24 @@
public String generate(Object argument)
{
final StringBuffer stringBuffer = new StringBuffer();
- ToolControlClass domainClass = (ToolControlClass)argument;
- if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) {
+ ToolControlClass domainClass = (ToolControlClass)argument;
+ if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) {
stringBuffer.append(TEXT_1);
stringBuffer.append( domainClass.getPackageFragment().getElementName() );
stringBuffer.append(TEXT_2);
- }
+ }
stringBuffer.append(TEXT_3);
- if( domainClass.isCreateDefaultConstructor() ) {
+ if( domainClass.isCreateDefaultConstructor() ) {
stringBuffer.append(TEXT_4);
- }
+ }
stringBuffer.append(TEXT_5);
stringBuffer.append( domainClass.getName() );
stringBuffer.append(TEXT_6);
- if( domainClass.isCreateDefaultConstructor() ) {
+ if( domainClass.isCreateDefaultConstructor() ) {
stringBuffer.append(TEXT_7);
stringBuffer.append( domainClass.getName() );
stringBuffer.append(TEXT_8);
- }
+ }
stringBuffer.append(TEXT_9);
stringBuffer.append( domainClass.getCreateGuiMethodName() );
stringBuffer.append(TEXT_10);
