summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Kriese2011-04-14 02:32:30 (EDT)
committerSteffen Kriese2011-04-14 02:32:30 (EDT)
commit59b3fc01736c60a5921a665a370c48a8b63e5a06 (patch)
tree0ddb7353736fc5f6d12eb550392721b0c90730a7
parent716fa3101933a04c79227c5174ab30949cf6799d (diff)
downloadorg.eclipse.riena.toolbox-59b3fc01736c60a5921a665a370c48a8b63e5a06.zip
org.eclipse.riena.toolbox-59b3fc01736c60a5921a665a370c48a8b63e5a06.tar.gz
org.eclipse.riena.toolbox-59b3fc01736c60a5921a665a370c48a8b63e5a06.tar.bz2
code cleaning riena toolbox
-rw-r--r--org.eclipse.riena.toolbox.previewer.customizer/src/org/eclipse/riena/toolbox/previewer/customizer/preferences/PreferenceConstants.java11
-rw-r--r--org.eclipse.riena.toolbox.previewer.customizer/src/org/eclipse/riena/toolbox/previewer/customizer/preferences/PreferenceInitializer.java7
-rw-r--r--org.eclipse.riena.toolbox.previewer/src/org/eclipse/riena/toolbox/previewer/WorkspaceClassLoader.java2
-rw-r--r--org.eclipse.riena.toolbox.previewer/src/org/eclipse/riena/toolbox/previewer/ui/Preview.java3
-rw-r--r--org.eclipse.riena.toolbox.previewer/src/org/eclipse/riena/toolbox/previewer/ui/WorkbenchUtil.java6
-rw-r--r--org.eclipse.riena.toolbox/.checkstyle8
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/Util.java6
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ModelService.java2
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/NodeFactory.java16
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ResourceChangeListener.java4
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/api/IAssemblyDataProvider.java12
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/api/ICodeGenerator.java8
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/api/IModelService.java6
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/UIControlsFactory.java6
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/preferences/PreferenceConstants.java6
-rw-r--r--org.eclipse.riena.ui.templates/.checkstyle8
-rw-r--r--org.eclipse.riena.ui.templates/src/org/eclipse/riena/ui/templates/RienaTemplateSection.java65
-rw-r--r--org.eclipse.riena.ui.templates/src/org/eclipse/riena/ui/templates/hello/HelloRienaTemplate.java97
-rw-r--r--org.eclipse.riena.ui.templates/src/org/eclipse/riena/ui/templates/mail/MailTemplate.java114
-rw-r--r--org.eclipse.riena.ui.wizard.cs/.settings/org.eclipse.jdt.core.prefs519
-rw-r--r--org.eclipse.riena.ui.wizard.cs/.settings/org.eclipse.jdt.ui.prefs4
-rw-r--r--org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/RienaApplicationPart.java8
-rw-r--r--org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/RienaApplicationWizard.java13
-rw-r--r--org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/RienaWizardImages.java8
-rw-r--r--org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/RienaWizardMessages.java14
-rw-r--r--org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/RienaWizardPlugin.java14
-rw-r--r--org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/generate/GenerateProjectOperation.java64
-rw-r--r--org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/generate/Generator.java83
-rw-r--r--org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/generate/GeneratorUtil.java11
-rw-r--r--org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/generate/preprocessor/NopPreprocessor.java2
-rw-r--r--org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/generate/preprocessor/PackageBean.java3
-rw-r--r--org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/generate/preprocessor/Preprocessor.java1
-rw-r--r--org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/generate/preprocessor/VelocityPreprocessor.java53
-rw-r--r--org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/pages/AbstractPage.java9
-rw-r--r--org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/pages/ClientPage.java34
-rw-r--r--org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/pages/ClientPageLayout.java11
-rw-r--r--org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/pages/GeneralPage.java59
-rw-r--r--org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/pages/GeneralPageLayout.java18
38 files changed, 724 insertions, 591 deletions
diff --git a/org.eclipse.riena.toolbox.previewer.customizer/src/org/eclipse/riena/toolbox/previewer/customizer/preferences/PreferenceConstants.java b/org.eclipse.riena.toolbox.previewer.customizer/src/org/eclipse/riena/toolbox/previewer/customizer/preferences/PreferenceConstants.java
index 4ca33c3..9c1d9e9 100644
--- a/org.eclipse.riena.toolbox.previewer.customizer/src/org/eclipse/riena/toolbox/previewer/customizer/preferences/PreferenceConstants.java
+++ b/org.eclipse.riena.toolbox.previewer.customizer/src/org/eclipse/riena/toolbox/previewer/customizer/preferences/PreferenceConstants.java
@@ -13,9 +13,12 @@ package org.eclipse.riena.toolbox.previewer.customizer.preferences;
/**
* Constant definitions for plug-in preferences
*/
-public class PreferenceConstants {
+public final class PreferenceConstants {
- public static final String LNF_CLASS_NAME = "lnfClassNamePreference";
- public static final String SHOW_RIDGET_IDS = "showRidgetIdsPreference";
-
+ public static final String LNF_CLASS_NAME = "lnfClassNamePreference"; //$NON-NLS-1$
+ public static final String SHOW_RIDGET_IDS = "showRidgetIdsPreference"; //$NON-NLS-1$
+
+ private PreferenceConstants() {
+ // private
+ }
}
diff --git a/org.eclipse.riena.toolbox.previewer.customizer/src/org/eclipse/riena/toolbox/previewer/customizer/preferences/PreferenceInitializer.java b/org.eclipse.riena.toolbox.previewer.customizer/src/org/eclipse/riena/toolbox/previewer/customizer/preferences/PreferenceInitializer.java
index 74a58f2..0458a8d 100644
--- a/org.eclipse.riena.toolbox.previewer.customizer/src/org/eclipse/riena/toolbox/previewer/customizer/preferences/PreferenceInitializer.java
+++ b/org.eclipse.riena.toolbox.previewer.customizer/src/org/eclipse/riena/toolbox/previewer/customizer/preferences/PreferenceInitializer.java
@@ -12,6 +12,7 @@ package org.eclipse.riena.toolbox.previewer.customizer.preferences;
import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
import org.eclipse.jface.preference.IPreferenceStore;
+
import org.eclipse.riena.toolbox.previewer.customizer.Activator;
/**
@@ -19,9 +20,11 @@ import org.eclipse.riena.toolbox.previewer.customizer.Activator;
*/
public class PreferenceInitializer extends AbstractPreferenceInitializer {
+ @Override
public void initializeDefaultPreferences() {
- IPreferenceStore store = Activator.getDefault().getPreferenceStore();
- store.setDefault(PreferenceConstants.LNF_CLASS_NAME, "org.eclipse.riena.ui.swt.lnf.rienadefault.RienaDefaultLnf");
+ final IPreferenceStore store = Activator.getDefault().getPreferenceStore();
+ store.setDefault(PreferenceConstants.LNF_CLASS_NAME,
+ "org.eclipse.riena.ui.swt.lnf.rienadefault.RienaDefaultLnf"); //$NON-NLS-1$
store.setDefault(PreferenceConstants.SHOW_RIDGET_IDS, true);
}
diff --git a/org.eclipse.riena.toolbox.previewer/src/org/eclipse/riena/toolbox/previewer/WorkspaceClassLoader.java b/org.eclipse.riena.toolbox.previewer/src/org/eclipse/riena/toolbox/previewer/WorkspaceClassLoader.java
index ef2fbf5..75bb542 100644
--- a/org.eclipse.riena.toolbox.previewer/src/org/eclipse/riena/toolbox/previewer/WorkspaceClassLoader.java
+++ b/org.eclipse.riena.toolbox.previewer/src/org/eclipse/riena/toolbox/previewer/WorkspaceClassLoader.java
@@ -35,7 +35,7 @@ import org.eclipse.riena.toolbox.internal.previewer.Activator;
import org.eclipse.riena.toolbox.previewer.model.ViewPartInfo;
import org.eclipse.riena.toolbox.previewer.ui.WorkbenchUtil;
-public class WorkspaceClassLoader {
+public final class WorkspaceClassLoader {
private static final String EXTENSION_JAVA = ".java"; //$NON-NLS-1$
private static WorkspaceClassLoader classFinder;
diff --git a/org.eclipse.riena.toolbox.previewer/src/org/eclipse/riena/toolbox/previewer/ui/Preview.java b/org.eclipse.riena.toolbox.previewer/src/org/eclipse/riena/toolbox/previewer/ui/Preview.java
index 4014347..4d0f0a7 100644
--- a/org.eclipse.riena.toolbox.previewer/src/org/eclipse/riena/toolbox/previewer/ui/Preview.java
+++ b/org.eclipse.riena.toolbox.previewer/src/org/eclipse/riena/toolbox/previewer/ui/Preview.java
@@ -37,9 +37,6 @@ import org.eclipse.riena.toolbox.previewer.WorkspaceClassLoader;
import org.eclipse.riena.toolbox.previewer.model.ViewPartInfo;
public class Preview extends ViewPart {
- /**
- *
- */
private static final String VIEW_TITLE = "Previewer";
public final static String ID = "org.eclipse.riena.toolbox.previewer.ui.Preview"; //$NON-NLS-1$
diff --git a/org.eclipse.riena.toolbox.previewer/src/org/eclipse/riena/toolbox/previewer/ui/WorkbenchUtil.java b/org.eclipse.riena.toolbox.previewer/src/org/eclipse/riena/toolbox/previewer/ui/WorkbenchUtil.java
index e0c5ae4..bfda0e4 100644
--- a/org.eclipse.riena.toolbox.previewer/src/org/eclipse/riena/toolbox/previewer/ui/WorkbenchUtil.java
+++ b/org.eclipse.riena.toolbox.previewer/src/org/eclipse/riena/toolbox/previewer/ui/WorkbenchUtil.java
@@ -19,7 +19,7 @@ import org.eclipse.ui.PlatformUI;
import org.eclipse.riena.toolbox.internal.previewer.Activator;
import org.eclipse.riena.toolbox.previewer.model.ViewPartInfo;
-public class WorkbenchUtil {
+public final class WorkbenchUtil {
public static void showView(final ViewPartInfo info) {
if (null == info) {
@@ -49,4 +49,8 @@ public class WorkbenchUtil {
throw new RuntimeException(e);
}
+ private WorkbenchUtil() {
+ // private
+ }
+
}
diff --git a/org.eclipse.riena.toolbox/.checkstyle b/org.eclipse.riena.toolbox/.checkstyle
new file mode 100644
index 0000000..73b67d8
--- /dev/null
+++ b/org.eclipse.riena.toolbox/.checkstyle
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
+ <fileset name="all" enabled="true" check-config-name="riena" local="false">
+ <file-match-pattern match-pattern="." include-pattern="true"/>
+ </fileset>
+ <filter name="NonSrcDirs" enabled="true"/>
+</fileset-config>
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/Util.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/Util.java
index 8afccec..89c2c7d 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/Util.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/Util.java
@@ -12,7 +12,7 @@ package org.eclipse.riena.toolbox;
import org.eclipse.riena.toolbox.assemblyeditor.model.AbstractAssemblyNode;
-public class Util {
+public final class Util {
public static boolean isGiven(final String in) {
return (null != in && in.trim().length() > 0);
}
@@ -60,4 +60,8 @@ public class Util {
return findParentOfType(current.getParent(), type);
}
+ private Util() {
+ // private
+ }
+
}
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ModelService.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ModelService.java
index f6d960a..cba5135 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ModelService.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ModelService.java
@@ -128,7 +128,7 @@ public class ModelService implements IModelService {
}
private interface AssemblyNodeVisitor {
- public boolean visit(AbstractTypedNode<?> node);
+ boolean visit(AbstractTypedNode<?> node);
}
}
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/NodeFactory.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/NodeFactory.java
index 12377df..1a38156 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/NodeFactory.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/NodeFactory.java
@@ -26,14 +26,14 @@ import org.eclipse.riena.toolbox.assemblyeditor.model.SubModuleNode;
public class NodeFactory implements INodeFactory {
private static final String SEP = "."; //$NON-NLS-1$
- private final String SUFFIX_ASSEMBLY = "assembly"; //$NON-NLS-1$
- private final String SUFFIX_SUBAPPLICATION = "subapp"; //$NON-NLS-1$
- private final String SUFFIX_MODULE_GROUP = "modulegroup"; //$NON-NLS-1$
- private final String SUFFIX_MODULE = "module"; //$NON-NLS-1$
- private final String SUFFIX_SUBMODULE = "submodule"; //$NON-NLS-1$
- private final String SUFFIX_PERSPECTIVE = "perspective"; //$NON-NLS-1$
-
- private final String CONST_NEW_IDENTIFIER = "NEW"; //$NON-NLS-1$
+ private static final String SUFFIX_ASSEMBLY = "assembly"; //$NON-NLS-1$
+ private static final String SUFFIX_SUBAPPLICATION = "subapp"; //$NON-NLS-1$
+ private static final String SUFFIX_MODULE_GROUP = "modulegroup"; //$NON-NLS-1$
+ private static final String SUFFIX_MODULE = "module"; //$NON-NLS-1$
+ private static final String SUFFIX_SUBMODULE = "submodule"; //$NON-NLS-1$
+ private static final String SUFFIX_PERSPECTIVE = "perspective"; //$NON-NLS-1$
+
+ private static final String CONST_NEW_IDENTIFIER = "NEW"; //$NON-NLS-1$
public AssemblyNode createAssembly(final BundleNode parentBundle) {
final AssemblyNode ass = new AssemblyNode(parentBundle);
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ResourceChangeListener.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ResourceChangeListener.java
index e3c11c2..cb7565e 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ResourceChangeListener.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ResourceChangeListener.java
@@ -18,7 +18,7 @@ import org.eclipse.core.resources.IProject;
*
*/
public interface ResourceChangeListener {
- public void pluginXmlChanged(IProject project);
+ void pluginXmlChanged(IProject project);
- public void projectAdded(IProject project);
+ void projectAdded(IProject project);
}
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/api/IAssemblyDataProvider.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/api/IAssemblyDataProvider.java
index 0c9f3e6..3372595 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/api/IAssemblyDataProvider.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/api/IAssemblyDataProvider.java
@@ -13,7 +13,7 @@ package org.eclipse.riena.toolbox.assemblyeditor.api;
import org.eclipse.riena.toolbox.assemblyeditor.model.AssemblyModel;
public interface IAssemblyDataProvider {
- public void saveData(AssemblyModel model);
+ void saveData(AssemblyModel model);
/**
* Iterates over all Projects in the workspace and parses the plugin.xml if
@@ -21,13 +21,13 @@ public interface IAssemblyDataProvider {
*
* @return the AssemblyModel
*/
- public AssemblyModel createData();
+ AssemblyModel createData();
- public IPluginXmlRenderer getXmlRenderer();
+ IPluginXmlRenderer getXmlRenderer();
- public void setXmlRenderer(IPluginXmlRenderer xmlRenderer);
+ void setXmlRenderer(IPluginXmlRenderer xmlRenderer);
- public IPluginXmlParser getXmlParser();
+ IPluginXmlParser getXmlParser();
- public void setXmlParser(IPluginXmlParser xmlParser);
+ void setXmlParser(IPluginXmlParser xmlParser);
}
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/api/ICodeGenerator.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/api/ICodeGenerator.java
index ba6faca..67a6647 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/api/ICodeGenerator.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/api/ICodeGenerator.java
@@ -14,11 +14,11 @@ import org.eclipse.riena.toolbox.assemblyeditor.model.RCPView;
import org.eclipse.riena.toolbox.assemblyeditor.model.SubModuleNode;
public interface ICodeGenerator {
- public RCPView generateView(SubModuleNode subModule);
+ RCPView generateView(SubModuleNode subModule);
- public String generateController(SubModuleNode subModule);
+ String generateController(SubModuleNode subModule);
- public void deleteControllerClass(SubModuleNode subModule);
+ void deleteControllerClass(SubModuleNode subModule);
- public void deleteViewClass(SubModuleNode subModule);
+ void deleteViewClass(SubModuleNode subModule);
}
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/api/IModelService.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/api/IModelService.java
index 5311e74..ba4c63f 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/api/IModelService.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/api/IModelService.java
@@ -23,9 +23,9 @@ import org.eclipse.riena.toolbox.assemblyeditor.model.SubModuleNode;
*
*/
public interface IModelService {
- public Set<String> getAllParentTypeIds(AssemblyModel model);
+ Set<String> getAllParentTypeIds(AssemblyModel model);
- public Set<String> getAllTypeIds(AssemblyModel model, AbstractTypedNode<?> nodesToIgnore);
+ Set<String> getAllTypeIds(AssemblyModel model, AbstractTypedNode<?> nodesToIgnore);
- public SubModuleNode findSubModuleByClassName(AssemblyModel model, IProject project, String className);
+ SubModuleNode findSubModuleByClassName(AssemblyModel model, IProject project, String className);
}
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/UIControlsFactory.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/UIControlsFactory.java
index 8f27b74..7e6ef2d 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/UIControlsFactory.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/UIControlsFactory.java
@@ -16,7 +16,7 @@ import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
-public class UIControlsFactory {
+public final class UIControlsFactory {
public static Label createLabel(final Composite parent, final String text) {
final Label lbl = new Label(parent, SWT.None);
lbl.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WHITE));
@@ -49,4 +49,8 @@ public class UIControlsFactory {
lnk.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WHITE));
return lnk;
}
+
+ private UIControlsFactory() {
+ // private
+ }
}
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/preferences/PreferenceConstants.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/preferences/PreferenceConstants.java
index a2146f7..56d5d24 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/preferences/PreferenceConstants.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/preferences/PreferenceConstants.java
@@ -13,11 +13,15 @@ package org.eclipse.riena.toolbox.assemblyeditor.ui.preferences;
/**
* Constant definitions for plug-in preferences
*/
-public class PreferenceConstants {
+public final class PreferenceConstants {
public static final String CONST_CUSTOM_UI_CONTROLS_FACTORY = "CustomUIControlsFactory"; //$NON-NLS-1$
public static final String CONST_CONFIGURE_RIDGETS_BLACKLIST = "configureRidgets Blacklist"; //$NON-NLS-1$
public static final String CONST_GENERATE_VIEW_PACKAGE_NAME = "Generate View packagename"; //$NON-NLS-1$
public static final String CONST_GENERATE_CONTROLLER_PACKAGE_NAME = "Generate Controller packagename"; //$NON-NLS-1$
+
+ private PreferenceConstants() {
+ // empty
+ }
}
diff --git a/org.eclipse.riena.ui.templates/.checkstyle b/org.eclipse.riena.ui.templates/.checkstyle
new file mode 100644
index 0000000..73b67d8
--- /dev/null
+++ b/org.eclipse.riena.ui.templates/.checkstyle
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
+ <fileset name="all" enabled="true" check-config-name="riena" local="false">
+ <file-match-pattern match-pattern="." include-pattern="true"/>
+ </fileset>
+ <filter name="NonSrcDirs" enabled="true"/>
+</fileset-config>
diff --git a/org.eclipse.riena.ui.templates/src/org/eclipse/riena/ui/templates/RienaTemplateSection.java b/org.eclipse.riena.ui.templates/src/org/eclipse/riena/ui/templates/RienaTemplateSection.java
index fb09705..efe8c44 100644
--- a/org.eclipse.riena.ui.templates/src/org/eclipse/riena/ui/templates/RienaTemplateSection.java
+++ b/org.eclipse.riena.ui.templates/src/org/eclipse/riena/ui/templates/RienaTemplateSection.java
@@ -19,13 +19,14 @@ import java.util.List;
import java.util.Locale;
import java.util.ResourceBundle;
+import org.osgi.framework.Bundle;
+
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Platform;
import org.eclipse.pde.core.plugin.IPluginReference;
import org.eclipse.pde.ui.templates.OptionTemplateSection;
import org.eclipse.pde.ui.templates.PluginReference;
-import org.osgi.framework.Bundle;
public abstract class RienaTemplateSection extends OptionTemplateSection {
@@ -37,34 +38,39 @@ public abstract class RienaTemplateSection extends OptionTemplateSection {
public static final String VALUE_PERSPECTIVE_NAME = "Riena Perspective"; //$NON-NLS-1$
public static final String VALUE_APPLICATION_ID = "application"; //$NON-NLS-1$
+ @Override
protected ResourceBundle getPluginResourceBundle() {
- Bundle bundle = Platform.getBundle(Activator.getDefault().getBundle().getSymbolicName());
+ final Bundle bundle = Platform.getBundle(Activator.getDefault().getBundle().getSymbolicName());
return Platform.getResourceBundle(bundle);
}
+ @Override
protected URL getInstallURL() {
return Activator.getDefault().getInstallURL();
}
+ @Override
public URL getTemplateLocation() {
try {
- String[] candidates = getDirectoryCandidates();
- for (int i = 0; i < candidates.length; i++) {
- if (Activator.getDefault().getBundle().getEntry(candidates[i]) != null) {
- URL candidate = new URL(getInstallURL(), candidates[i]);
+ final String[] candidates = getDirectoryCandidates();
+ for (final String candidate2 : candidates) {
+ if (Activator.getDefault().getBundle().getEntry(candidate2) != null) {
+ final URL candidate = new URL(getInstallURL(), candidate2);
return candidate;
}
}
- } catch (MalformedURLException e) { // do nothing
+ } catch (final MalformedURLException e) {
+ e.printStackTrace();
}
return null;
}
private String[] getDirectoryCandidates() {
- double version = getTargetVersion();
- List<String> result = new ArrayList<String>();
- if (version >= 3.4)
+ final double version = getTargetVersion();
+ final List<String> result = new ArrayList<String>();
+ if (version >= 3.4) {
result.add("templates_3.4" + "/" + getSectionId() + "/"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ }
return result.toArray(new String[result.size()]);
}
@@ -77,22 +83,25 @@ public abstract class RienaTemplateSection extends OptionTemplateSection {
return new String[0];
}
- protected String getFormattedPackageName(String id) {
- StringBuffer buffer = new StringBuffer();
+ protected String getFormattedPackageName(final String id) {
+ final StringBuffer buffer = new StringBuffer();
for (int i = 0; i < id.length(); i++) {
- char ch = id.charAt(i);
+ final char ch = id.charAt(i);
if (buffer.length() == 0) {
- if (Character.isJavaIdentifierStart(ch))
+ if (Character.isJavaIdentifierStart(ch)) {
buffer.append(Character.toLowerCase(ch));
+ }
} else {
- if (Character.isJavaIdentifierPart(ch) || ch == '.')
+ if (Character.isJavaIdentifierPart(ch) || ch == '.') {
buffer.append(ch);
+ }
}
}
return buffer.toString().toLowerCase(Locale.ENGLISH);
}
- protected void generateFiles(IProgressMonitor monitor) throws CoreException {
+ @Override
+ protected void generateFiles(final IProgressMonitor monitor) throws CoreException {
super.generateFiles(monitor);
// Copy the default splash screen if the branding option is selected
if (copyBrandingDirectory()) {
@@ -104,23 +113,23 @@ public abstract class RienaTemplateSection extends OptionTemplateSection {
return getBooleanOption(KEY_PRODUCT_BRANDING);
}
- public IPluginReference[] getCoreDependencies(String schemaVersion) {
- IPluginReference[] dep = new IPluginReference[1];
+ public IPluginReference[] getCoreDependencies(final String schemaVersion) {
+ final IPluginReference[] dep = new IPluginReference[1];
int i = 0;
dep[i++] = new PluginReference("org.eclipse.core.runtime", null, 0); //$NON-NLS-1$
return dep;
}
- public IPluginReference[] getCommonDependencies(String schemaVersion) {
- IPluginReference[] dep = new IPluginReference[2];
+ public IPluginReference[] getCommonDependencies(final String schemaVersion) {
+ final IPluginReference[] dep = new IPluginReference[2];
int i = 0;
dep[i++] = new PluginReference("org.eclipse.core.runtime", null, 0); //$NON-NLS-1$
dep[i++] = new PluginReference("org.eclipse.riena.communication.core", null, 0); //$NON-NLS-1$
return dep;
}
- public IPluginReference[] getHeadlessClientDependencies(String schemaVersion) {
- IPluginReference[] dep = new IPluginReference[4];
+ public IPluginReference[] getHeadlessClientDependencies(final String schemaVersion) {
+ final IPluginReference[] dep = new IPluginReference[4];
int i = 0;
dep[i++] = new PluginReference("org.eclipse.core.runtime", null, 0); //$NON-NLS-1$
dep[i++] = new PluginReference("org.eclipse.riena.core", null, 0); //$NON-NLS-1$
@@ -129,16 +138,16 @@ public abstract class RienaTemplateSection extends OptionTemplateSection {
return dep;
}
- public IPluginReference[] getUIDependencies(String schemaVersion) {
- IPluginReference[] dep = new IPluginReference[2];
+ public IPluginReference[] getUIDependencies(final String schemaVersion) {
+ final IPluginReference[] dep = new IPluginReference[2];
int i = 0;
dep[i++] = new PluginReference("org.eclipse.core.runtime", null, 0); //$NON-NLS-1$
dep[i++] = new PluginReference("org.eclipse.riena.client", null, 0); //$NON-NLS-1$
return dep;
}
- public IPluginReference[] getServiceDependencies(String schemaVersion) {
- IPluginReference[] dep = new IPluginReference[2];
+ public IPluginReference[] getServiceDependencies(final String schemaVersion) {
+ final IPluginReference[] dep = new IPluginReference[2];
int i = 0;
dep[i++] = new PluginReference("org.eclipse.core.runtime", null, 0); //$NON-NLS-1$
dep[i++] = new PluginReference("org.eclipse.riena.server", null, 0); //$NON-NLS-1$
@@ -146,7 +155,7 @@ public abstract class RienaTemplateSection extends OptionTemplateSection {
}
@Override
- protected boolean isOkToCreateFolder(File sourceFolder) {
+ protected boolean isOkToCreateFolder(final File sourceFolder) {
if (sourceFolder.getName().equals("CVS")) {
return false;
} else {
@@ -155,7 +164,7 @@ public abstract class RienaTemplateSection extends OptionTemplateSection {
}
@Override
- public String getReplacementString(String fileName, String key) {
+ public String getReplacementString(final String fileName, final String key) {
if ((fileName.endsWith(".launch") || fileName.endsWith(".java")) && key.startsWith("{") && key.contains("}")) {
return "$" + key;
}
diff --git a/org.eclipse.riena.ui.templates/src/org/eclipse/riena/ui/templates/hello/HelloRienaTemplate.java b/org.eclipse.riena.ui.templates/src/org/eclipse/riena/ui/templates/hello/HelloRienaTemplate.java
index 829a7cd..acdd637 100644
--- a/org.eclipse.riena.ui.templates/src/org/eclipse/riena/ui/templates/hello/HelloRienaTemplate.java
+++ b/org.eclipse.riena.ui.templates/src/org/eclipse/riena/ui/templates/hello/HelloRienaTemplate.java
@@ -20,6 +20,7 @@ import org.eclipse.pde.core.plugin.IPluginExtension;
import org.eclipse.pde.core.plugin.IPluginModelBase;
import org.eclipse.pde.core.plugin.IPluginReference;
import org.eclipse.pde.ui.IFieldData;
+
import org.eclipse.riena.ui.templates.RienaTemplateSection;
public class HelloRienaTemplate extends RienaTemplateSection {
@@ -32,8 +33,9 @@ public class HelloRienaTemplate extends RienaTemplateSection {
createOptions();
}
- public void addPages(Wizard wizard) {
- WizardPage page = createPage(0, "");// IHelpContextIds.TEMPLATE_RCP_MAIL);
+ @Override
+ public void addPages(final Wizard wizard) {
+ final WizardPage page = createPage(0, "");// IHelpContextIds.TEMPLATE_RCP_MAIL);
page.setTitle("Riena Hello World");
page.setDescription("Creates a small Riena application, with a navigation area and one view.");
wizard.addPage(page);
@@ -41,24 +43,26 @@ public class HelloRienaTemplate extends RienaTemplateSection {
}
private void createOptions() {
- addOption(KEY_WINDOW_TITLE, "Application window &title:", "Hello Riena", 0); //$NON-NLS-1$
+ addOption(KEY_WINDOW_TITLE, "Application window &title:", "Hello Riena", 0); //$NON-NLS-1$
addOption(KEY_PACKAGE_NAME, "Pa&ckage name:", (String) null, 0);
- addOption(KEY_APPLICATION_CLASS, "App&lication class:", "Application", 0); //$NON-NLS-1$
+ addOption(KEY_APPLICATION_CLASS, "App&lication class:", "Application", 0); //$NON-NLS-1$
// createBrandingOptions();
}
- protected void initializeFields(IFieldData data) {
+ @Override
+ protected void initializeFields(final IFieldData data) {
// In a new project wizard, we don't know this yet - the
// model has not been created
- String packageName = getFormattedPackageName(data.getId());
+ final String packageName = getFormattedPackageName(data.getId());
initializeOption(KEY_PACKAGE_NAME, packageName);
}
- public void initializeFields(IPluginModelBase model) {
- String packageName = getFormattedPackageName(model.getPluginBase().getId());
+ @Override
+ public void initializeFields(final IPluginModelBase model) {
+ final String packageName = getFormattedPackageName(model.getPluginBase().getId());
initializeOption(KEY_PACKAGE_NAME, packageName);
}
@@ -67,6 +71,7 @@ public class HelloRienaTemplate extends RienaTemplateSection {
*
* @see org.eclipse.pde.ui.templates.OptionTemplateSection#getSectionId()
*/
+ @Override
public String getSectionId() {
return "helloRiena"; //$NON-NLS-1$
}
@@ -78,55 +83,59 @@ public class HelloRienaTemplate extends RienaTemplateSection {
* org.eclipse.pde.ui.templates.AbstractTemplateSection#updateModel(org.
* eclipse.core.runtime.IProgressMonitor)
*/
- protected void updateModel(IProgressMonitor monitor) throws CoreException {
+ @Override
+ protected void updateModel(final IProgressMonitor monitor) throws CoreException {
createApplicationExtension();
createPerspectiveExtension();
createViewExtension();
createNavigationExtension();
- if (getBooleanOption(KEY_PRODUCT_BRANDING))
+ if (getBooleanOption(KEY_PRODUCT_BRANDING)) {
createProductExtension();
+ }
}
private void createApplicationExtension() throws CoreException {
- IPluginBase plugin = model.getPluginBase();
+ final IPluginBase plugin = model.getPluginBase();
- IPluginExtension extension = createExtension("org.eclipse.core.runtime.applications", true); //$NON-NLS-1$
+ final IPluginExtension extension = createExtension("org.eclipse.core.runtime.applications", true); //$NON-NLS-1$
extension.setId(VALUE_APPLICATION_ID);
- IPluginElement element = model.getPluginFactory().createElement(extension);
+ final IPluginElement element = model.getPluginFactory().createElement(extension);
element.setName("application"); //$NON-NLS-1$
extension.add(element);
- IPluginElement run = model.getPluginFactory().createElement(element);
+ final IPluginElement run = model.getPluginFactory().createElement(element);
run.setName("run"); //$NON-NLS-1$
run.setAttribute("class", getStringOption(KEY_PACKAGE_NAME) + "." + getStringOption(KEY_APPLICATION_CLASS)); //$NON-NLS-1$ //$NON-NLS-2$
element.add(run);
- if (!extension.isInTheModel())
+ if (!extension.isInTheModel()) {
plugin.add(extension);
+ }
}
private void createPerspectiveExtension() throws CoreException {
- IPluginBase plugin = model.getPluginBase();
+ final IPluginBase plugin = model.getPluginBase();
- IPluginExtension extension = createExtension("org.eclipse.ui.perspectives", true); //$NON-NLS-1$
- IPluginElement element = model.getPluginFactory().createElement(extension);
+ final IPluginExtension extension = createExtension("org.eclipse.ui.perspectives", true); //$NON-NLS-1$
+ final IPluginElement element = model.getPluginFactory().createElement(extension);
element.setName("perspective"); //$NON-NLS-1$
element.setAttribute("class", "org.eclipse.riena.navigation.ui.swt.views.SubApplicationView"); //$NON-NLS-1$ //$NON-NLS-2$
element.setAttribute("name", VALUE_PERSPECTIVE_NAME); //$NON-NLS-1$
element.setAttribute("id", "helloWorldSubApplication"); //$NON-NLS-1$ //$NON-NLS-2$
extension.add(element);
- if (!extension.isInTheModel())
+ if (!extension.isInTheModel()) {
plugin.add(extension);
+ }
}
private void createViewExtension() throws CoreException {
- IPluginBase plugin = model.getPluginBase();
- String id = plugin.getId();
- IPluginExtension extension = createExtension("org.eclipse.ui.views", true); //$NON-NLS-1$
+ final IPluginBase plugin = model.getPluginBase();
+ final String id = plugin.getId();
+ final IPluginExtension extension = createExtension("org.eclipse.ui.views", true); //$NON-NLS-1$
- IPluginElement view = model.getPluginFactory().createElement(extension);
+ final IPluginElement view = model.getPluginFactory().createElement(extension);
view.setName("view"); //$NON-NLS-1$
view.setAttribute("class", getStringOption(KEY_PACKAGE_NAME) + ".HelloWorldSubModuleView"); //$NON-NLS-1$ //$NON-NLS-2$
view.setAttribute("name", "View"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -134,42 +143,43 @@ public class HelloRienaTemplate extends RienaTemplateSection {
view.setAttribute("allowMultiple", "true");
extension.add(view);
- if (!extension.isInTheModel())
+ if (!extension.isInTheModel()) {
plugin.add(extension);
+ }
}
private void createNavigationExtension() throws CoreException {
- IPluginBase plugin = model.getPluginBase();
- String id = plugin.getId();
- IPluginExtension extension = createExtension("org.eclipse.riena.navigation.assemblies2", true);
+ final IPluginBase plugin = model.getPluginBase();
+ final String id = plugin.getId();
+ final IPluginExtension extension = createExtension("org.eclipse.riena.navigation.assemblies2", true);
- IPluginElement assembly = model.getPluginFactory().createElement(extension);
+ final IPluginElement assembly = model.getPluginFactory().createElement(extension);
assembly.setName("assembly2");
assembly.setAttribute("startOrder", "1");
assembly.setAttribute("parentNodeId", "application");
assembly.setAttribute("id", "assembly.1");
extension.add(assembly);
- IPluginElement subapplication = model.getPluginFactory().createElement(assembly);
+ final IPluginElement subapplication = model.getPluginFactory().createElement(assembly);
subapplication.setName("subApplication");
subapplication.setAttribute("name", "HelloWorldSubapplication");
subapplication.setAttribute("nodeId", "subapplication.1");
subapplication.setAttribute("perspectiveId", "helloWorldSubApplication");
assembly.add(subapplication);
- IPluginElement modulegroup = model.getPluginFactory().createElement(subapplication);
+ final IPluginElement modulegroup = model.getPluginFactory().createElement(subapplication);
modulegroup.setName("moduleGroup");
modulegroup.setAttribute("name", "modulegroup");
modulegroup.setAttribute("nodeId", "moduleGroup.1");
subapplication.add(modulegroup);
- IPluginElement module = model.getPluginFactory().createElement(modulegroup);
+ final IPluginElement module = model.getPluginFactory().createElement(modulegroup);
module.setName("module");
module.setAttribute("name", "Hello World");
module.setAttribute("nodeId", "module.1");
modulegroup.add(module);
- IPluginElement submodule = model.getPluginFactory().createElement(module);
+ final IPluginElement submodule = model.getPluginFactory().createElement(module);
submodule.setName("subModule");
submodule.setAttribute("controller", getStringOption(KEY_PACKAGE_NAME) + ".HelloWorldSubModuleController");
submodule.setAttribute("nodeId", "submodule.1");
@@ -177,18 +187,19 @@ public class HelloRienaTemplate extends RienaTemplateSection {
submodule.setAttribute("viewId", id + ".HelloWorldSubModuleView");
module.add(submodule);
- if (!extension.isInTheModel())
+ if (!extension.isInTheModel()) {
plugin.add(extension);
+ }
}
private void createProductExtension() throws CoreException {
- IPluginBase plugin = model.getPluginBase();
- IPluginExtension extension = createExtension("org.eclipse.core.runtime.products", true); //$NON-NLS-1$
+ final IPluginBase plugin = model.getPluginBase();
+ final IPluginExtension extension = createExtension("org.eclipse.core.runtime.products", true); //$NON-NLS-1$
extension.setId(VALUE_PRODUCT_ID);
- IPluginElement element = model.getFactory().createElement(extension);
+ final IPluginElement element = model.getFactory().createElement(extension);
element.setName("product"); //$NON-NLS-1$
- element.setAttribute("name", getStringOption(KEY_WINDOW_TITLE)); //$NON-NLS-1$
+ element.setAttribute("name", getStringOption(KEY_WINDOW_TITLE)); //$NON-NLS-1$
element.setAttribute("application", plugin.getId() + "." + VALUE_APPLICATION_ID); //$NON-NLS-1$ //$NON-NLS-2$
IPluginElement property = model.getFactory().createElement(element);
@@ -201,8 +212,9 @@ public class HelloRienaTemplate extends RienaTemplateSection {
extension.add(element);
- if (!extension.isInTheModel())
+ if (!extension.isInTheModel()) {
plugin.add(extension);
+ }
}
/*
@@ -221,6 +233,7 @@ public class HelloRienaTemplate extends RienaTemplateSection {
* @seeorg.eclipse.pde.ui.templates.BaseOptionTemplateSection#
* isDependentOnParentWizard()
*/
+ @Override
public boolean isDependentOnParentWizard() {
return true;
}
@@ -232,6 +245,7 @@ public class HelloRienaTemplate extends RienaTemplateSection {
* org.eclipse.pde.ui.templates.AbstractTemplateSection#getNumberOfWorkUnits
* ()
*/
+ @Override
public int getNumberOfWorkUnits() {
return super.getNumberOfWorkUnits() + 1;
}
@@ -243,7 +257,8 @@ public class HelloRienaTemplate extends RienaTemplateSection {
* org.eclipse.pde.ui.templates.AbstractTemplateSection#getDependencies(
* java.lang.String)
*/
- public IPluginReference[] getDependencies(String schemaVersion) {
+ @Override
+ public IPluginReference[] getDependencies(final String schemaVersion) {
return getUIDependencies(schemaVersion);
}
@@ -253,9 +268,11 @@ public class HelloRienaTemplate extends RienaTemplateSection {
* @see
* org.eclipse.pde.internal.ui.templates.PDETemplateSection#getNewFiles()
*/
+ @Override
public String[] getNewFiles() {
- if (copyBrandingDirectory())
+ if (copyBrandingDirectory()) {
return new String[] { "icons/", "splash.bmp" }; //$NON-NLS-1$ //$NON-NLS-2$
+ }
return super.getNewFiles();
}
}
diff --git a/org.eclipse.riena.ui.templates/src/org/eclipse/riena/ui/templates/mail/MailTemplate.java b/org.eclipse.riena.ui.templates/src/org/eclipse/riena/ui/templates/mail/MailTemplate.java
index 46822fd..806568b 100644
--- a/org.eclipse.riena.ui.templates/src/org/eclipse/riena/ui/templates/mail/MailTemplate.java
+++ b/org.eclipse.riena.ui.templates/src/org/eclipse/riena/ui/templates/mail/MailTemplate.java
@@ -22,6 +22,7 @@ import org.eclipse.pde.core.plugin.IPluginModelBase;
import org.eclipse.pde.core.plugin.IPluginReference;
import org.eclipse.pde.internal.ui.IHelpContextIds;
import org.eclipse.pde.ui.IFieldData;
+
import org.eclipse.riena.ui.templates.RienaTemplateSection;
public class MailTemplate extends RienaTemplateSection {
@@ -34,11 +35,11 @@ public class MailTemplate extends RienaTemplateSection {
createOptions();
}
- public void addPages(Wizard wizard) {
- WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_RCP_MAIL);
+ @Override
+ public void addPages(final Wizard wizard) {
+ final WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_RCP_MAIL);
page.setTitle("Riena Mail Template");
- page
- .setDescription("Creates a Riena application based on the Mail example, complete with navigation, views, menu and toolbar actions, keybindings and a product definition.");
+ page.setDescription("Creates a Riena application based on the Mail example, complete with navigation, views, menu and toolbar actions, keybindings and a product definition.");
wizard.addPage(page);
markPagesAdded();
}
@@ -46,20 +47,22 @@ public class MailTemplate extends RienaTemplateSection {
private void createOptions() {
addOption(KEY_PRODUCT_NAME, "&Product name:", VALUE_PRODUCT_NAME, 0);
- addOption(KEY_PACKAGE_NAME, "Pa&ckage name:", (String) null, 0); //
+ addOption(KEY_PACKAGE_NAME, "Pa&ckage name:", (String) null, 0); //
- addOption(KEY_APPLICATION_CLASS, "App&lication class:", "Application", 0); //$NON-NLS-1$
+ addOption(KEY_APPLICATION_CLASS, "App&lication class:", "Application", 0); //$NON-NLS-1$
}
- protected void initializeFields(IFieldData data) {
+ @Override
+ protected void initializeFields(final IFieldData data) {
// In a new project wizard, we don't know this yet - the
// model has not been created
- String packageName = getFormattedPackageName(data.getId());
+ final String packageName = getFormattedPackageName(data.getId());
initializeOption(KEY_PACKAGE_NAME, packageName);
}
- public void initializeFields(IPluginModelBase model) {
- String packageName = getFormattedPackageName(model.getPluginBase().getId());
+ @Override
+ public void initializeFields(final IPluginModelBase model) {
+ final String packageName = getFormattedPackageName(model.getPluginBase().getId());
initializeOption(KEY_PACKAGE_NAME, packageName);
}
@@ -68,6 +71,7 @@ public class MailTemplate extends RienaTemplateSection {
*
* @see org.eclipse.pde.ui.templates.OptionTemplateSection#getSectionId()
*/
+ @Override
public String getSectionId() {
return "mail"; //$NON-NLS-1$
}
@@ -79,7 +83,8 @@ public class MailTemplate extends RienaTemplateSection {
* org.eclipse.pde.ui.templates.AbstractTemplateSection#updateModel(org.
* eclipse.core.runtime.IProgressMonitor)
*/
- protected void updateModel(IProgressMonitor monitor) throws CoreException {
+ @Override
+ protected void updateModel(final IProgressMonitor monitor) throws CoreException {
createApplicationExtension();
createPerspectiveExtension();
createViewExtension();
@@ -91,45 +96,47 @@ public class MailTemplate extends RienaTemplateSection {
}
private void createApplicationExtension() throws CoreException {
- IPluginBase plugin = model.getPluginBase();
+ final IPluginBase plugin = model.getPluginBase();
- IPluginExtension extension = createExtension("org.eclipse.core.runtime.applications", true); //$NON-NLS-1$
+ final IPluginExtension extension = createExtension("org.eclipse.core.runtime.applications", true); //$NON-NLS-1$
extension.setId(VALUE_APPLICATION_ID);
- IPluginElement element = model.getPluginFactory().createElement(extension);
+ final IPluginElement element = model.getPluginFactory().createElement(extension);
element.setName("application"); //$NON-NLS-1$
extension.add(element);
- IPluginElement run = model.getPluginFactory().createElement(element);
+ final IPluginElement run = model.getPluginFactory().createElement(element);
run.setName("run"); //$NON-NLS-1$
run.setAttribute("class", getStringOption(KEY_PACKAGE_NAME) + "." + getStringOption(KEY_APPLICATION_CLASS)); //$NON-NLS-1$ //$NON-NLS-2$
element.add(run);
- if (!extension.isInTheModel())
+ if (!extension.isInTheModel()) {
plugin.add(extension);
+ }
}
private void createPerspectiveExtension() throws CoreException {
- IPluginBase plugin = model.getPluginBase();
+ final IPluginBase plugin = model.getPluginBase();
- IPluginExtension extension = createExtension("org.eclipse.ui.perspectives", true); //$NON-NLS-1$
- IPluginElement element = model.getPluginFactory().createElement(extension);
+ final IPluginExtension extension = createExtension("org.eclipse.ui.perspectives", true); //$NON-NLS-1$
+ final IPluginElement element = model.getPluginFactory().createElement(extension);
element.setName("perspective"); //$NON-NLS-1$
element.setAttribute("class", "org.eclipse.riena.navigation.ui.swt.views.SubApplicationView"); //$NON-NLS-1$ //$NON-NLS-2$
element.setAttribute("name", VALUE_PERSPECTIVE_NAME); //$NON-NLS-1$
element.setAttribute("id", "rcp.mail.perspective"); //$NON-NLS-1$ //$NON-NLS-2$
extension.add(element);
- if (!extension.isInTheModel())
+ if (!extension.isInTheModel()) {
plugin.add(extension);
+ }
}
private void createViewExtension() throws CoreException {
- IPluginBase plugin = model.getPluginBase();
+ final IPluginBase plugin = model.getPluginBase();
// String id = plugin.getId();
- IPluginExtension extension = createExtension("org.eclipse.ui.views", true); //$NON-NLS-1$
+ final IPluginExtension extension = createExtension("org.eclipse.ui.views", true); //$NON-NLS-1$
- IPluginElement view = model.getPluginFactory().createElement(extension);
+ final IPluginElement view = model.getPluginFactory().createElement(extension);
view.setName("view"); //$NON-NLS-1$
view.setAttribute("allowMultiple", "true"); //$NON-NLS-1$ //$NON-NLS-2$
view.setAttribute("icon", "icons/sample2.gif"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -138,14 +145,15 @@ public class MailTemplate extends RienaTemplateSection {
view.setAttribute("id", "rcp.mail.view"); //$NON-NLS-1$ //$NON-NLS-2$
extension.add(view);
- if (!extension.isInTheModel())
+ if (!extension.isInTheModel()) {
plugin.add(extension);
+ }
}
private void createCommandExtension() throws CoreException {
- IPluginBase plugin = model.getPluginBase();
- String id = plugin.getId();
- IPluginExtension extension = createExtension("org.eclipse.ui.commands", true); //$NON-NLS-1$
+ final IPluginBase plugin = model.getPluginBase();
+ final String id = plugin.getId();
+ final IPluginExtension extension = createExtension("org.eclipse.ui.commands", true); //$NON-NLS-1$
IPluginElement element = model.getPluginFactory().createElement(extension);
element.setName("category"); //$NON-NLS-1$
@@ -171,14 +179,15 @@ public class MailTemplate extends RienaTemplateSection {
element.setAttribute("defaultHandler", getStringOption(KEY_PACKAGE_NAME) + ".MessagePopupHandler");
extension.add(element);
- if (!extension.isInTheModel())
+ if (!extension.isInTheModel()) {
plugin.add(extension);
+ }
}
private void createBindingsExtension() throws CoreException {
- IPluginBase plugin = model.getPluginBase();
+ final IPluginBase plugin = model.getPluginBase();
// String id = plugin.getId();
- IPluginExtension extension = createExtension("org.eclipse.ui.bindings", true); //$NON-NLS-1$
+ final IPluginExtension extension = createExtension("org.eclipse.ui.bindings", true); //$NON-NLS-1$
IPluginElement element = model.getPluginFactory().createElement(extension);
element.setName("key"); //$NON-NLS-1$
@@ -204,20 +213,21 @@ public class MailTemplate extends RienaTemplateSection {
element.setAttribute("contextId", "org.eclipse.ui.contexts.window");
extension.add(element);
- if (!extension.isInTheModel())
+ if (!extension.isInTheModel()) {
plugin.add(extension);
+ }
}
private void createUIMenusExtension() throws CoreException {
- IPluginBase plugin = model.getPluginBase();
- IPluginExtension extension = createExtension("org.eclipse.ui.menus", true);
+ final IPluginBase plugin = model.getPluginBase();
+ final IPluginExtension extension = createExtension("org.eclipse.ui.menus", true);
- IPluginElement element = model.getPluginFactory().createElement(extension);
+ final IPluginElement element = model.getPluginFactory().createElement(extension);
element.setName("menuContribution");
element.setAttribute("locationURI", "toolbar:org.eclipse.ui.main.toolbar?after=additions");
extension.add(element);
- IPluginElement toolbar = model.getPluginFactory().createElement(element);
+ final IPluginElement toolbar = model.getPluginFactory().createElement(element);
toolbar.setName("toolbar");
toolbar.setAttribute("id", "riena.rcp.toolbar");
element.add(toolbar);
@@ -236,12 +246,12 @@ public class MailTemplate extends RienaTemplateSection {
command.setAttribute("style", "push");
toolbar.add(command);
- IPluginElement element2 = model.getPluginFactory().createElement(extension);
+ final IPluginElement element2 = model.getPluginFactory().createElement(extension);
element2.setName("menuContribution");
element2.setAttribute("locationURI", "menu:org.eclipse.ui.main.menu");
extension.add(element2);
- IPluginElement fileMenu = model.getPluginFactory().createElement(element);
+ final IPluginElement fileMenu = model.getPluginFactory().createElement(element);
fileMenu.setName("menu");
fileMenu.setAttribute("label", "&File");
element2.add(fileMenu);
@@ -273,7 +283,7 @@ public class MailTemplate extends RienaTemplateSection {
command.setAttribute("style", "push");
fileMenu.add(command);
- IPluginElement helpMenu = model.getPluginFactory().createElement(element);
+ final IPluginElement helpMenu = model.getPluginFactory().createElement(element);
helpMenu.setName("menu");
helpMenu.setAttribute("label", "&Help");
element2.add(helpMenu);
@@ -285,18 +295,19 @@ public class MailTemplate extends RienaTemplateSection {
command.setAttribute("style", "push");
helpMenu.add(command);
- if (!extension.isInTheModel())
+ if (!extension.isInTheModel()) {
plugin.add(extension);
+ }
}
private void createProductExtension() throws CoreException {
- IPluginBase plugin = model.getPluginBase();
- IPluginExtension extension = createExtension("org.eclipse.core.runtime.products", true); //$NON-NLS-1$
+ final IPluginBase plugin = model.getPluginBase();
+ final IPluginExtension extension = createExtension("org.eclipse.core.runtime.products", true); //$NON-NLS-1$
extension.setId(VALUE_PRODUCT_ID);
- IPluginElement element = model.getFactory().createElement(extension);
+ final IPluginElement element = model.getFactory().createElement(extension);
element.setName("product"); //$NON-NLS-1$
- element.setAttribute("name", getStringOption(KEY_PRODUCT_NAME)); //$NON-NLS-1$
+ element.setAttribute("name", getStringOption(KEY_PRODUCT_NAME)); //$NON-NLS-1$
element.setAttribute("application", plugin.getId() + "." + VALUE_APPLICATION_ID); //$NON-NLS-1$ //$NON-NLS-2$
IPluginElement property = model.getFactory().createElement(element);
@@ -325,12 +336,12 @@ public class MailTemplate extends RienaTemplateSection {
}
private void createImagePathsExtension() throws CoreException {
- IPluginBase plugin = model.getPluginBase();
- IPluginExtension extension = createExtension("org.eclipse.riena.ui.swt.imagePaths", true); //$NON-NLS-1$
+ final IPluginBase plugin = model.getPluginBase();
+ final IPluginExtension extension = createExtension("org.eclipse.riena.ui.swt.imagePaths", true); //$NON-NLS-1$
- IPluginElement element = model.getFactory().createElement(extension);
+ final IPluginElement element = model.getFactory().createElement(extension);
element.setName("path"); //$NON-NLS-1$
- element.setAttribute("path", "icons"); //$NON-NLS-1$
+ element.setAttribute("path", "icons"); //$NON-NLS-1$
extension.add(element);
@@ -355,6 +366,7 @@ public class MailTemplate extends RienaTemplateSection {
* @seeorg.eclipse.pde.ui.templates.BaseOptionTemplateSection#
* isDependentOnParentWizard()
*/
+ @Override
public boolean isDependentOnParentWizard() {
return true;
}
@@ -366,6 +378,7 @@ public class MailTemplate extends RienaTemplateSection {
* org.eclipse.pde.ui.templates.AbstractTemplateSection#getNumberOfWorkUnits
* ()
*/
+ @Override
public int getNumberOfWorkUnits() {
return super.getNumberOfWorkUnits() + 1;
}
@@ -377,7 +390,8 @@ public class MailTemplate extends RienaTemplateSection {
* org.eclipse.pde.ui.templates.AbstractTemplateSection#getDependencies(
* java.lang.String)
*/
- public IPluginReference[] getDependencies(String schemaVersion) {
+ @Override
+ public IPluginReference[] getDependencies(final String schemaVersion) {
return getUIDependencies(schemaVersion);
}
@@ -389,8 +403,9 @@ public class MailTemplate extends RienaTemplateSection {
* org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#getNewFiles
* ()
*/
+ @Override
public String[] getNewFiles() {
- return new String[] { "icons/", "product_lg.gif" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ return new String[] { "icons/", "product_lg.gif" }; //$NON-NLS-1$ //$NON-NLS-2$
}
/*
@@ -399,6 +414,7 @@ public class MailTemplate extends RienaTemplateSection {
* @seeorg.eclipse.pde.internal.ui.templates.PDETemplateSection#
* copyBrandingDirectory()
*/
+ @Override
protected boolean copyBrandingDirectory() {
return true;
}
diff --git a/org.eclipse.riena.ui.wizard.cs/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.riena.ui.wizard.cs/.settings/org.eclipse.jdt.core.prefs
index 074fe04..f7d37e0 100644
--- a/org.eclipse.riena.ui.wizard.cs/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.riena.ui.wizard.cs/.settings/org.eclipse.jdt.core.prefs
@@ -1,277 +1,296 @@
-#Mon Feb 04 14:53:13 CET 2008
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+#Thu Apr 14 08:27:38 CEST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
+org.eclipse.jdt.core.classpathVariable.ECLIPSE_HOME=C\:/Develop/RCPLabs-SDK/eclipse-3.3
+org.eclipse.jdt.core.classpathVariable.JRE_LIB=C\:/Develop/j2sdk5/jre/lib/rt.jar
+org.eclipse.jdt.core.classpathVariable.JRE_SRC=C\:/Develop/j2sdk5/src.zip
+org.eclipse.jdt.core.classpathVariable.JRE_SRCROOT=
org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.visibilityCheck=enabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.classpathVariable.JRE_SRCROOT=
org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=false
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.lineSplit=120
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.classpathVariable.JRE_SRC=C\:/Develop/j2sdk5/src.zip
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.classpathVariable.ECLIPSE_HOME=C\:/Develop/RCPLabs-SDK/eclipse-3.3
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.codeComplete.visibilityCheck=enabled
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.comment.format_line_comments=false
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.classpathVariable.JRE_LIB=C\:/Develop/j2sdk5/jre/lib/rt.jar
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/org.eclipse.riena.ui.wizard.cs/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.riena.ui.wizard.cs/.settings/org.eclipse.jdt.ui.prefs
index 77e49a1..a5b2e4c 100644
--- a/org.eclipse.riena.ui.wizard.cs/.settings/org.eclipse.jdt.ui.prefs
+++ b/org.eclipse.riena.ui.wizard.cs/.settings/org.eclipse.jdt.ui.prefs
@@ -1,11 +1,11 @@
-#Tue Dec 08 08:35:33 CET 2009
+#Thu Apr 14 08:27:38 CEST 2011
content_assist_disabled_computers=org.eclipse.jdt.ui.javaNoTypeProposalCategory\u0000org.eclipse.jdt.ui.spellingProposalCategory\u0000org.eclipse.jdt.ui.textProposalCategory\u0000org.eclipse.jdt.ui.templateProposalCategory\u0000org.eclipse.jdt.ui.javaTypeProposalCategory\u0000
content_assist_lru_history=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><history maxLHS\="100" maxRHS\="10"/>
eclipse.preferences.version=1
editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
fontPropagated=true
formatter_profile=_Eclipse Riena [built-in]
-formatter_settings_version=11
+formatter_settings_version=12
org.eclipse.jdt.ui.editor.tab.width=
org.eclipse.jdt.ui.exception.name=e
org.eclipse.jdt.ui.formatterprofiles=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?>\r\n<profiles version\="11">\r\n<profile kind\="CodeFormatterProfile" name\="Eclipse Riena [built-in]" version\="11">\r\n<setting id\="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value\="end_of_line"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.blank_lines_before_field" value\="0"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value\="false"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value\="true"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value\="16"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value\="16"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value\="80"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value\="end_of_line"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.blank_lines_after_package" value\="1"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.continuation_indentation" value\="2"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value\="16"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value\="1"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.blank_lines_before_package" value\="0"/>\r\n<setting id\="org.eclipse.jdt.core.compiler.source" value\="1.5"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.comment.format_line_comments" value\="true"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value\="16"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value\="1"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value\="false"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value\="16"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value\="true"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value\="false"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.lineSplit" value\="120"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value\="0"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.indentation.size" value\="4"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value\="16"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_assignment" value\="0"/>\r\n<setting id\="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value\="error"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.tabulation.char" value\="tab"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value\="true"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.blank_lines_before_method" value\="1"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value\="false"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value\="16"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value\="end_of_line"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.brace_position_for_switch" value\="end_of_line"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value\="error"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value\="false"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.brace_position_for_block" value\="end_of_line"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value\="end_of_line"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.compact_else_if" value\="true"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value\="end_of_line"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value\="true"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.tabulation.size" value\="4"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value\="false"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value\="16"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.indent_empty_lines" value\="false"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value\="end_of_line"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value\="1"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value\="16"/>\r\n<setting id\="org.eclipse.jdt.core.compiler.compliance" value\="1.5"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value\="2"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value\="16"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value\="false"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value\="false"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value\="16"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value\="16"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value\="end_of_line"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value\="enabled"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value\="true"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value\="16"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value\="true"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.comment.line_length" value\="80"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value\="1"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value\="end_of_line"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value\="0"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value\="true"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value\="true"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value\="true"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value\="1"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value\="true"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value\="16"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value\="16"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value\="true"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value\="1"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.comment.format_html" value\="true"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value\="16"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.comment.format_source_code" value\="true"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value\="16"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value\="1.5"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value\="false"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.comment.format_header" value\="false"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.comment.format_block_comments" value\="true"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value\="0"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value\="true"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value\="end_of_line"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value\="1"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value\="true"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value\="false"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value\="do not insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value\="false"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value\="false"/>\r\n</profile>\r\n</profiles>\r\n
diff --git a/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/RienaApplicationPart.java b/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/RienaApplicationPart.java
index 334c308..3188645 100644
--- a/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/RienaApplicationPart.java
+++ b/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/RienaApplicationPart.java
@@ -11,13 +11,13 @@
package org.eclipse.riena.ui.wizard.cs.internal;
public enum RienaApplicationPart {
- COMMON(RienaWizardMessages.ProjectSuffixCommon, "common"), //$NON-NLS-1$
- SERVICE(RienaWizardMessages.ProjectSuffixService, "service"), //$NON-NLS-1$
+ COMMON(RienaWizardMessages.ProjectSuffixCommon, "common"), //$NON-NLS-1$
+ SERVICE(RienaWizardMessages.ProjectSuffixService, "service"), //$NON-NLS-1$
CLIENT(RienaWizardMessages.ProjectSuffixClient, "client"); //$NON-NLS-1$
private final String suffix, packageSuffix;
- RienaApplicationPart(String suffix, String packageSuffix) {
+ RienaApplicationPart(final String suffix, final String packageSuffix) {
this.suffix = suffix;
this.packageSuffix = packageSuffix;
}
@@ -26,7 +26,7 @@ public enum RienaApplicationPart {
return packageSuffix;
}
- public String makeProjectFullName(String projectBaseName) {
+ public String makeProjectFullName(final String projectBaseName) {
return String.format("%s_%s", projectBaseName, suffix); //$NON-NLS-1$
}
}
diff --git a/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/RienaApplicationWizard.java b/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/RienaApplicationWizard.java
index 5c01d53..0a11750 100644
--- a/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/RienaApplicationWizard.java
+++ b/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/RienaApplicationWizard.java
@@ -14,12 +14,13 @@ import java.lang.reflect.InvocationTargetException;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+
import org.eclipse.riena.ui.wizard.cs.internal.generate.GenerateProjectOperation;
import org.eclipse.riena.ui.wizard.cs.internal.pages.ClientPage;
import org.eclipse.riena.ui.wizard.cs.internal.pages.ClientType;
import org.eclipse.riena.ui.wizard.cs.internal.pages.GeneralPage;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
public class RienaApplicationWizard extends Wizard implements INewWizard {
private GeneralPage generalPage;
@@ -36,7 +37,7 @@ public class RienaApplicationWizard extends Wizard implements INewWizard {
public void addPages() {
addPage(generalPage = new GeneralPage());
addPage(clientPage = new ClientPage());
-
+
clientPage.setClientType(ClientType.GUI);
}
@@ -44,14 +45,14 @@ public class RienaApplicationWizard extends Wizard implements INewWizard {
public boolean performFinish() {
try {
getContainer().run(false, true, new GenerateProjectOperation(generalPage, clientPage));
- } catch (InvocationTargetException e) {
+ } catch (final InvocationTargetException e) {
RienaWizardPlugin.error(e);
- } catch (InterruptedException e) {
+ } catch (final InterruptedException e) {
}
return true;
}
- public void init(IWorkbench workbench, IStructuredSelection selection) {
+ public void init(final IWorkbench workbench, final IStructuredSelection selection) {
}
}
diff --git a/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/RienaWizardImages.java b/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/RienaWizardImages.java
index 3dde400..4196ae5 100644
--- a/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/RienaWizardImages.java
+++ b/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/RienaWizardImages.java
@@ -23,13 +23,13 @@ public class RienaWizardImages {
public static final ImageDescriptor DESC_NEW_APPLICATION_WIZARD = descriptor(WIZBAN, "newapp_wizard.png"); //$NON-NLS-1$
- private static ImageDescriptor descriptor(String prefix, String name) {
+ private static ImageDescriptor descriptor(final String prefix, final String name) {
return ImageDescriptor.createFromURL(url(prefix, name));
}
- private static URL url(String prefix, String name) {
-
- Path path = new Path(String.format("/%s/%s/%s", ICONS, prefix, name)); //$NON-NLS-1$
+ private static URL url(final String prefix, final String name) {
+
+ final Path path = new Path(String.format("/%s/%s/%s", ICONS, prefix, name)); //$NON-NLS-1$
return FileLocator.find(RienaWizardPlugin.getDefault().getBundle(), path, null);
}
}
diff --git a/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/RienaWizardMessages.java b/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/RienaWizardMessages.java
index 3a73f54..418d55a 100644
--- a/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/RienaWizardMessages.java
+++ b/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/RienaWizardMessages.java
@@ -17,8 +17,7 @@ public class RienaWizardMessages extends NLS {
static {
NLS.initializeMessages(BUNDLE_NAME, RienaWizardMessages.class);
}
-
-
+
public static String ClientPage_Title;
public static String ClientPageLayout_ClientType;
public static String ClientPageLayout_ConsoleClient;
@@ -26,21 +25,18 @@ public class RienaWizardMessages extends NLS {
public static String ClientPageLayout_NoClient;
public static String NewApplicationWizard_title;
public static String GeneralPage_title;
-
-
+
public static String ProjectSuffixCommon;
public static String ProjectSuffixClient;
public static String ProjectSuffixService;
-
+
public static String GeneralPage_ProjectName;
public static String GeneralPage_PackageName;
-
+
public static String GeneralPage_Validation_GeneralPage_ProjectsToBeCreated;
public static String GeneralPage_Validation_NoBasePluginId;
public static String GeneralPage_Validation_NoProjectName;
public static String GeneralPage_Validation_ProjectAlreadyExists;
public static String GenerateProjectOperation_Name;
-
-
-
+
}
diff --git a/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/RienaWizardPlugin.java b/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/RienaWizardPlugin.java
index 0835499..047d4f1 100644
--- a/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/RienaWizardPlugin.java
+++ b/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/RienaWizardPlugin.java
@@ -27,21 +27,25 @@ public class RienaWizardPlugin extends AbstractUIPlugin {
}
public static RienaWizardPlugin getDefault() {
- if (instance == null)
+ if (instance == null) {
throw new NullPointerException("Plugin instance is not available"); //$NON-NLS-1$
+ }
return instance;
}
public static void error(Throwable e) {
- if (e instanceof InvocationTargetException)
+ if (e instanceof InvocationTargetException) {
e = ((InvocationTargetException) e).getTargetException();
+ }
IStatus status = null;
- if (e instanceof CoreException)
+ if (e instanceof CoreException) {
status = ((CoreException) e).getStatus();
- else
- status = new Status(IStatus.ERROR, getDefault().getBundle().getSymbolicName(), IStatus.OK, e.getMessage(), e);
+ } else {
+ status = new Status(IStatus.ERROR, getDefault().getBundle().getSymbolicName(), IStatus.OK, e.getMessage(),
+ e);
+ }
StatusManager.getManager().handle(status, StatusManager.SHOW | StatusManager.BLOCK | StatusManager.LOG);
}
diff --git a/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/generate/GenerateProjectOperation.java b/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/generate/GenerateProjectOperation.java
index 7b5dafa..9753984 100644
--- a/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/generate/GenerateProjectOperation.java
+++ b/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/generate/GenerateProjectOperation.java
@@ -23,6 +23,10 @@ import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.ui.IWorkingSet;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+
import org.eclipse.riena.ui.wizard.cs.internal.RienaApplicationPart;
import org.eclipse.riena.ui.wizard.cs.internal.RienaWizardMessages;
import org.eclipse.riena.ui.wizard.cs.internal.RienaWizardPlugin;
@@ -30,29 +34,27 @@ import org.eclipse.riena.ui.wizard.cs.internal.generate.preprocessor.PackageBean
import org.eclipse.riena.ui.wizard.cs.internal.generate.preprocessor.VelocityPreprocessor;
import org.eclipse.riena.ui.wizard.cs.internal.pages.ClientPage;
import org.eclipse.riena.ui.wizard.cs.internal.pages.GeneralPage;
-import org.eclipse.ui.IWorkingSet;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
public class GenerateProjectOperation extends WorkspaceModifyOperation {
private static final String PDE_NATURE = "org.eclipse.pde.PluginNature"; //$NON-NLS-1$
- private GeneralPage generalPage;
- private ClientPage clientPage;
+ private final GeneralPage generalPage;
+ private final ClientPage clientPage;
- public GenerateProjectOperation(GeneralPage generalPage, ClientPage clientPage) {
+ public GenerateProjectOperation(final GeneralPage generalPage, final ClientPage clientPage) {
this.generalPage = generalPage;
this.clientPage = clientPage;
}
@Override
- protected void execute(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- String baseName = generalPage.getProjectBaseName();
+ protected void execute(final IProgressMonitor monitor) throws CoreException, InvocationTargetException,
+ InterruptedException {
+ final IWorkspace workspace = ResourcesPlugin.getWorkspace();
+ final String baseName = generalPage.getProjectBaseName();
monitor.beginTask(RienaWizardMessages.GenerateProjectOperation_Name, 3);
-
- for (RienaApplicationPart part : RienaApplicationPart.values()) {
+
+ for (final RienaApplicationPart part : RienaApplicationPart.values()) {
String template = null;
switch (part) {
case COMMON:
@@ -77,7 +79,7 @@ public class GenerateProjectOperation extends WorkspaceModifyOperation {
}
if (template != null) {
- IProject project = workspace.getRoot().getProject(part.makeProjectFullName(baseName));
+ final IProject project = workspace.getRoot().getProject(part.makeProjectFullName(baseName));
if (!project.exists()) {
project.create(monitor);
@@ -86,14 +88,16 @@ public class GenerateProjectOperation extends WorkspaceModifyOperation {
addNatures(project, new String[] { PDE_NATURE, JavaCore.NATURE_ID }, monitor);
- Properties generatorProperties = new Properties();
+ final Properties generatorProperties = new Properties();
generatorProperties.put(GeneratorProperties.SOURCE_FOLDER, "src"); //$NON-NLS-1$
- generatorProperties.put(GeneratorProperties.PACKAGE, String.format("%s.%s", generalPage.getBasePackage(), part.getPackageSuffix())); //$NON-NLS-1$
+ generatorProperties.put(GeneratorProperties.PACKAGE,
+ String.format("%s.%s", generalPage.getBasePackage(), part.getPackageSuffix())); //$NON-NLS-1$
generatorProperties.put(GeneratorProperties.EXECUTION_ENVIRONMENT, "J2SE-1.5"); //$NON-NLS-1$
- Properties preprocessorProperties = new Properties();
+ final Properties preprocessorProperties = new Properties();
- preprocessorProperties.put("executionEnvironment", generatorProperties.get(GeneratorProperties.EXECUTION_ENVIRONMENT)); //$NON-NLS-1$
+ preprocessorProperties.put(
+ "executionEnvironment", generatorProperties.get(GeneratorProperties.EXECUTION_ENVIRONMENT)); //$NON-NLS-1$
preprocessorProperties.put("package", new PackageBean(generalPage.getBasePackage(), part)); //$NON-NLS-1$
preprocessorProperties.put("plugin", new PackageBean(generalPage.getBasePackage(), part)); //$NON-NLS-1$
@@ -101,25 +105,31 @@ public class GenerateProjectOperation extends WorkspaceModifyOperation {
preprocessorProperties.put("project", part.makeProjectFullName(baseName)); //$NON-NLS-1$
preprocessorProperties.put("project.base", baseName); //$NON-NLS-1$
- new Generator(String.format("templates/%s", template), RienaWizardPlugin.getDefault().getBundle(), new VelocityPreprocessor(preprocessorProperties), generatorProperties).generate(project, monitor); //$NON-NLS-1$
-
- IWorkingSet[] workingSets = generalPage.getWorkingSetGroup().getSelectedWorkingSets();
- if (workingSets.length > 0)
- PlatformUI.getWorkbench().getWorkingSetManager().addToWorkingSets(project.getProject(), workingSets);
+ new Generator(
+ String.format("templates/%s", template), RienaWizardPlugin.getDefault().getBundle(), new VelocityPreprocessor(preprocessorProperties), generatorProperties).generate(project, monitor); //$NON-NLS-1$
+
+ final IWorkingSet[] workingSets = generalPage.getWorkingSetGroup().getSelectedWorkingSets();
+ if (workingSets.length > 0) {
+ PlatformUI.getWorkbench().getWorkingSetManager()
+ .addToWorkingSets(project.getProject(), workingSets);
+ }
}
-
+
monitor.worked(1);
}
}
- private void addNatures(IProject project, String[] natures, IProgressMonitor monitor) throws CoreException {
- IProjectDescription description = project.getDescription();
+ private void addNatures(final IProject project, final String[] natures, final IProgressMonitor monitor)
+ throws CoreException {
+ final IProjectDescription description = project.getDescription();
- List<String> existing = new ArrayList<String>(Arrays.asList(description.getNatureIds()));
+ final List<String> existing = new ArrayList<String>(Arrays.asList(description.getNatureIds()));
- for (String nature : natures)
- if (!project.hasNature(nature))
+ for (final String nature : natures) {
+ if (!project.hasNature(nature)) {
existing.add(nature);
+ }
+ }
description.setNatureIds(existing.toArray(new String[] {}));
project.setDescription(description, monitor);
diff --git a/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/generate/Generator.java b/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/generate/Generator.java
index ed9ae79..52c177e 100644
--- a/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/generate/Generator.java
+++ b/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/generate/Generator.java
@@ -39,34 +39,37 @@ import org.eclipse.jdt.launching.environments.IExecutionEnvironmentsManager;
import org.eclipse.riena.ui.wizard.cs.internal.generate.preprocessor.Preprocessor;
public class Generator {
- private String path;
- private Bundle bundle;
- private Properties properties;
- private Preprocessor macro;
+ private final String path;
+ private final Bundle bundle;
+ private final Properties properties;
+ private final Preprocessor macro;
- public Generator(String path, Bundle bundle, Preprocessor macro, Properties properties) {
+ public Generator(final String path, final Bundle bundle, final Preprocessor macro, final Properties properties) {
this.path = path;
this.bundle = bundle;
this.macro = macro;
this.properties = properties;
}
- public void generate(IProject project, IProgressMonitor monitor) throws CoreException {
- IJavaProject javaProject = JavaCore.create(project);
+ public void generate(final IProject project, final IProgressMonitor monitor) throws CoreException {
+ final IJavaProject javaProject = JavaCore.create(project);
String src = properties.getProperty(GeneratorProperties.SOURCE_FOLDER);
- if (src == null)
+ if (src == null) {
src = "src"; //$NON-NLS-1$
+ }
- IFolder sourceFolder = project.getFolder(src); // source folder in the target project
- if (!sourceFolder.exists())
+ final IFolder sourceFolder = project.getFolder(src); // source folder in the target project
+ if (!sourceFolder.exists()) {
sourceFolder.create(true, true, monitor);
+ }
String _package = properties.getProperty(GeneratorProperties.PACKAGE);
- if (_package == null)
+ if (_package == null) {
_package = ""; //$NON-NLS-1$
+ }
- String sourcePrefix = String.format("/%s/%s", path, src); // source folder in the template project //$NON-NLS-1$
+ final String sourcePrefix = String.format("/%s/%s", path, src); // source folder in the template project //$NON-NLS-1$
copy(String.format("/%s", path), project, sourcePrefix, monitor); // copy everything except for sources from the root to the root //$NON-NLS-1$
copy(sourcePrefix, createSourceFolder(sourceFolder, monitor, _package), null, monitor); // copy sources from src to src
@@ -74,13 +77,12 @@ public class Generator {
javaProject.setRawClasspath(classpath(sourceFolder), monitor); // include source folder to classpath
}
- @SuppressWarnings("unchecked")
- private void copy(String source, IContainer destination, String skip, IProgressMonitor monitor)
- throws CoreException {
- Enumeration<URL> entries = bundle.findEntries(source, "*", true); //$NON-NLS-1$
+ private void copy(final String source, final IContainer destination, final String skip,
+ final IProgressMonitor monitor) throws CoreException {
+ final Enumeration<URL> entries = bundle.findEntries(source, "*", true); //$NON-NLS-1$
while (entries.hasMoreElements()) {
- URL element = entries.nextElement();
+ final URL element = entries.nextElement();
String entry = element.getPath();
if (entry.startsWith(source) && !entry.contains("/CVS/") && !(skip != null && entry.startsWith(skip))) { //$NON-NLS-1$
@@ -91,62 +93,68 @@ public class Generator {
String fileFolder = ""; //$NON-NLS-1$
String fileName = null;
- int ix = entry.lastIndexOf('/');
+ final int ix = entry.lastIndexOf('/');
if (ix > 0) { // see if it has a folder prefix (a/b/c in /a/b/c/MyFile.java)
fileFolder = entry.substring(0, ix);
fileName = entry.substring(ix + 1);
createSourceFolder(destination, monitor, fileFolder); // create folder for prefix
- } else
+ } else {
fileName = entry;
+ }
InputStream is = null;
try {
is = macro.process(element.openStream(), entry);
- if (macro.getChangedFileName() != null)
+ if (macro.getChangedFileName() != null) {
fileName = macro.getChangedFileName();
+ }
- IFile file = destination.getFile(new Path(fileFolder).append(fileName)); // get entry for file, relative to destination folder
+ final IFile file = destination.getFile(new Path(fileFolder).append(fileName)); // get entry for file, relative to destination folder
file.create(is, true, monitor); // copy it
- } catch (Throwable t) {
+ } catch (final Throwable t) {
t.printStackTrace();
throw new RuntimeException(t);
} finally {
- if (is != null)
+ if (is != null) {
is.close();
+ }
}
- } else
+ } else {
createSourceFolder(destination, monitor, entry); // only create folder
- } catch (IOException ex) {
+ }
+ } catch (final IOException ex) {
ex.printStackTrace();
}
}
}
}
- private IFolder createSourceFolder(IContainer source, IProgressMonitor monitor, String _package)
+ private IFolder createSourceFolder(final IContainer source, final IProgressMonitor monitor, final String _package)
throws CoreException {
IFolder current = null;
- StringTokenizer segments = new StringTokenizer(_package, "./"); //$NON-NLS-1$
+ final StringTokenizer segments = new StringTokenizer(_package, "./"); //$NON-NLS-1$
while (segments.hasMoreTokens()) {
current = current != null ? current.getFolder(segments.nextToken()) : source.getFolder(new Path(segments
.nextToken()));
- if (!current.exists())
+ if (!current.exists()) {
current.create(true, true, monitor);
+ }
}
return current;
}
- private static IPath getEEPath(String ee) {
+ private static IPath getEEPath(final String ee) {
IPath path = null;
if (ee != null) {
- IExecutionEnvironmentsManager manager = JavaRuntime.getExecutionEnvironmentsManager();
- IExecutionEnvironment env = manager.getEnvironment(ee);
- if (env != null)
+ final IExecutionEnvironmentsManager manager = JavaRuntime.getExecutionEnvironmentsManager();
+ final IExecutionEnvironment env = manager.getEnvironment(ee);
+ if (env != null) {
path = JavaRuntime.newJREContainerPath(env);
+ }
}
if (path == null) {
path = JavaRuntime.newDefaultJREContainerPath();
@@ -154,16 +162,17 @@ public class Generator {
return path;
}
- private IClasspathEntry[] classpath(IFolder source) throws JavaModelException {
- ArrayList<IClasspathEntry> entries = new ArrayList<IClasspathEntry>();
+ private IClasspathEntry[] classpath(final IFolder source) throws JavaModelException {
+ final ArrayList<IClasspathEntry> entries = new ArrayList<IClasspathEntry>();
entries.add(JavaCore.newSourceEntry(source.getFullPath()));
- String ee = properties.getProperty(GeneratorProperties.EXECUTION_ENVIRONMENT);
- if (ee != null)
+ final String ee = properties.getProperty(GeneratorProperties.EXECUTION_ENVIRONMENT);
+ if (ee != null) {
entries.add(JavaCore.newContainerEntry(getEEPath(ee)));
- else
+ } else {
entries.add(JavaCore.newContainerEntry(JavaRuntime.newDefaultJREContainerPath()));
+ }
entries.add(JavaCore.newContainerEntry(new Path("org.eclipse.pde.core.requiredPlugins"))); //$NON-NLS-1$
diff --git a/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/generate/GeneratorUtil.java b/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/generate/GeneratorUtil.java
index 1dcdbf7..417c92a 100644
--- a/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/generate/GeneratorUtil.java
+++ b/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/generate/GeneratorUtil.java
@@ -16,19 +16,20 @@ import java.net.URL;
public class GeneratorUtil {
// true if URL points to real file
- public static boolean isFile(URL url) throws IOException {
+ public static boolean isFile(final URL url) throws IOException {
InputStream is = null;
-
+
try {
- // check if we can read from the url, to
+ // check if we can read from the url, to
//determine between a file and a directory
is = url.openStream();
return is.read() > -1;
- } catch (IOException aEx) {
+ } catch (final IOException aEx) {
return false;
} finally {
- if (is != null)
+ if (is != null) {
is.close();
+ }
}
}
}
diff --git a/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/generate/preprocessor/NopPreprocessor.java b/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/generate/preprocessor/NopPreprocessor.java
index 05c3c84..a60a316 100644
--- a/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/generate/preprocessor/NopPreprocessor.java
+++ b/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/generate/preprocessor/NopPreprocessor.java
@@ -13,7 +13,7 @@ package org.eclipse.riena.ui.wizard.cs.internal.generate.preprocessor;
import java.io.InputStream;
public class NopPreprocessor implements Preprocessor {
- public InputStream process(InputStream input, String tag) {
+ public InputStream process(final InputStream input, final String tag) {
return input;
}
diff --git a/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/generate/preprocessor/PackageBean.java b/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/generate/preprocessor/PackageBean.java
index 3eabfcb..7ee96bd 100644
--- a/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/generate/preprocessor/PackageBean.java
+++ b/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/generate/preprocessor/PackageBean.java
@@ -16,11 +16,12 @@ public class PackageBean {
private final String base;
private final RienaApplicationPart part;
- public PackageBean(String base, RienaApplicationPart part) {
+ public PackageBean(final String base, final RienaApplicationPart part) {
this.base = base;
this.part = part;
}
+ @Override
public String toString() {
return String.format("%s.%s", base, part.getPackageSuffix()); //$NON-NLS-1$
}
diff --git a/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/generate/preprocessor/Preprocessor.java b/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/generate/preprocessor/Preprocessor.java
index 697d1bb..b977692 100644
--- a/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/generate/preprocessor/Preprocessor.java
+++ b/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/generate/preprocessor/Preprocessor.java
@@ -16,5 +16,6 @@ import org.eclipse.core.runtime.CoreException;
public interface Preprocessor {
InputStream process(InputStream input, String tag) throws CoreException;
+
String getChangedFileName();
}
diff --git a/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/generate/preprocessor/VelocityPreprocessor.java b/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/generate/preprocessor/VelocityPreprocessor.java
index d85c946..7879a4a 100644
--- a/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/generate/preprocessor/VelocityPreprocessor.java
+++ b/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/generate/preprocessor/VelocityPreprocessor.java
@@ -21,14 +21,16 @@ import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.runtime.RuntimeServices;
import org.apache.velocity.runtime.log.LogChute;
+
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.riena.ui.wizard.cs.internal.RienaWizardPlugin;
import org.eclipse.ui.statushandlers.StatusManager;
+import org.eclipse.riena.ui.wizard.cs.internal.RienaWizardPlugin;
+
public class VelocityPreprocessor implements Preprocessor {
- private Properties properties;
+ private final Properties properties;
private String changedName;
@@ -38,62 +40,67 @@ public class VelocityPreprocessor implements Preprocessor {
ve.setProperty(VelocityEngine.RUNTIME_LOG_LOGSYSTEM, new EclipseLogChute());
try {
ve.init();
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new RuntimeException(e);
}
}
- public VelocityPreprocessor(Properties properties) {
+ public VelocityPreprocessor(final Properties properties) {
this.properties = properties;
-
+
properties.put("d", "$"); //$NON-NLS-1$ //$NON-NLS-2$
}
- public InputStream process(InputStream input, String tag) throws CoreException {
+ public InputStream process(final InputStream input, final String tag) throws CoreException {
try {
try {
changedName = null;
-
- VelocityContext context = new VelocityContext(properties);
- ByteArrayOutputStream output = new ByteArrayOutputStream(1024);
- OutputStreamWriter osw = new OutputStreamWriter(output);
+ final VelocityContext context = new VelocityContext(properties);
+
+ final ByteArrayOutputStream output = new ByteArrayOutputStream(1024);
+ final OutputStreamWriter osw = new OutputStreamWriter(output);
ve.evaluate(context, osw, tag, new InputStreamReader(input));
osw.flush();
-
+
changedName = (String) context.get("filename"); //$NON-NLS-1$
- if(changedName != null)
+ if (changedName != null) {
context.remove("filename"); //$NON-NLS-1$
-
+ }
+
return new ByteArrayInputStream(output.toByteArray());
} finally {
input.close();
}
- } catch (Exception ex) {
- throw new CoreException(new Status(IStatus.ERROR, RienaWizardPlugin.getDefault().getBundle().getSymbolicName(), ex.getMessage(), ex));
+ } catch (final Exception ex) {
+ throw new CoreException(new Status(IStatus.ERROR, RienaWizardPlugin.getDefault().getBundle()
+ .getSymbolicName(), ex.getMessage(), ex));
}
}
static private class EclipseLogChute implements LogChute {
- public void init(RuntimeServices runtime) throws Exception {
+ public void init(final RuntimeServices runtime) throws Exception {
}
- public boolean isLevelEnabled(int level) {
+ public boolean isLevelEnabled(final int level) {
return convertLevel(level) != null;
}
- public void log(int level, String message) {
+ public void log(final int level, final String message) {
log(level, message, null);
}
- public void log(int level, String message, Throwable throwable) {
- Integer converted = convertLevel(level);
- if (converted != null)
- StatusManager.getManager().handle(new Status(converted, RienaWizardPlugin.getDefault().getBundle().getSymbolicName(), message, throwable), StatusManager.LOG);
+ public void log(final int level, final String message, final Throwable throwable) {
+ final Integer converted = convertLevel(level);
+ if (converted != null) {
+ StatusManager.getManager().handle(
+ new Status(converted, RienaWizardPlugin.getDefault().getBundle().getSymbolicName(), message,
+ throwable), StatusManager.LOG);
+ }
}
- private Integer convertLevel(int level) {
+ private Integer convertLevel(final int level) {
switch (level) {
case LogChute.ERROR_ID:
return IStatus.ERROR;
diff --git a/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/pages/AbstractPage.java b/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/pages/AbstractPage.java
index 21c34d2..2b3b3a9 100644
--- a/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/pages/AbstractPage.java
+++ b/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/pages/AbstractPage.java
@@ -20,23 +20,22 @@ import org.eclipse.swt.widgets.Composite;
public class AbstractPage extends WizardPage {
protected FormData fd;
-
protected Composite composite;
- protected AbstractPage(String pageName) {
+ protected AbstractPage(final String pageName) {
super(pageName);
}
- public void createControl(Composite parent) {
+ public void createControl(final Composite parent) {
composite = new Composite(parent, SWT.NULL);
initializeDialogUnits(composite);
- FormLayout layout = new FormLayout();
+ final FormLayout layout = new FormLayout();
layout.marginHeight = layout.marginWidth = 5;
composite.setLayout(layout);
-
+
setControl(composite);
Dialog.applyDialogFont(composite);
diff --git a/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/pages/ClientPage.java b/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/pages/ClientPage.java
index b9604a0..8381191 100644
--- a/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/pages/ClientPage.java
+++ b/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/pages/ClientPage.java
@@ -10,9 +10,10 @@
*******************************************************************************/
package org.eclipse.riena.ui.wizard.cs.internal.pages;
+import org.eclipse.swt.widgets.Composite;
+
import org.eclipse.riena.ui.wizard.cs.internal.RienaWizardImages;
import org.eclipse.riena.ui.wizard.cs.internal.RienaWizardMessages;
-import org.eclipse.swt.widgets.Composite;
public class ClientPage extends ClientPageLayout {
private ClientType type;
@@ -23,34 +24,31 @@ public class ClientPage extends ClientPageLayout {
setImageDescriptor(RienaWizardImages.DESC_NEW_APPLICATION_WIZARD);
}
- public void createControl(Composite parent) {
+ @Override
+ public void createControl(final Composite parent) {
super.createControl(parent);
-
+
internalSetClientType(type);
}
-
- public ClientType getClientType()
- {
- if(guiButton.getSelection())
+
+ public ClientType getClientType() {
+ if (guiButton.getSelection()) {
return ClientType.GUI;
- else
- if(consoleButton.getSelection())
+ } else if (consoleButton.getSelection()) {
return ClientType.CONSOLE;
- else
+ } else {
return ClientType.NONE;
+ }
}
-
- public void setClientType(ClientType type)
- {
+ public void setClientType(final ClientType type) {
this.type = type;
- if(guiButton != null)
+ if (guiButton != null) {
internalSetClientType(type);
+ }
}
-
- public void internalSetClientType(ClientType type)
- {
+ public void internalSetClientType(final ClientType type) {
switch (type) {
case GUI:
guiButton.setSelection(true);
@@ -59,7 +57,7 @@ public class ClientPage extends ClientPageLayout {
case CONSOLE:
consoleButton.setSelection(true);
break;
-
+
default:
noClientButton.setSelection(true);
}
diff --git a/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/pages/ClientPageLayout.java b/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/pages/ClientPageLayout.java
index 05136b4..01c4c00 100644
--- a/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/pages/ClientPageLayout.java
+++ b/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/pages/ClientPageLayout.java
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.riena.ui.wizard.cs.internal.pages;
-import org.eclipse.riena.ui.wizard.cs.internal.RienaWizardMessages;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
@@ -19,24 +18,26 @@ import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Group;
+import org.eclipse.riena.ui.wizard.cs.internal.RienaWizardMessages;
+
public class ClientPageLayout extends AbstractPage {
protected Button guiButton, consoleButton, noClientButton;
- protected ClientPageLayout(String pageName) {
+ protected ClientPageLayout(final String pageName) {
super(pageName);
}
- public void createControl(Composite parent) {
+ public void createControl(final Composite parent) {
super.createControl(parent);
- Group grpClientType = new Group(composite, SWT.NONE);
+ final Group grpClientType = new Group(composite, SWT.NONE);
grpClientType.setText(RienaWizardMessages.ClientPageLayout_ClientType);
grpClientType.setLayoutData(fd = new FormData());
fd.left = fd.top = new FormAttachment(0, 0);
fd.right = new FormAttachment(100, 0);
- RowLayout layout = new RowLayout(SWT.HORIZONTAL);
+ final RowLayout layout = new RowLayout(SWT.HORIZONTAL);
layout.spacing = 5;
layout.marginWidth = layout.marginHeight = 5;
layout.justify = true;
diff --git a/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/pages/GeneralPage.java b/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/pages/GeneralPage.java
index 3f8a276..aeab850 100644
--- a/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/pages/GeneralPage.java
+++ b/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/pages/GeneralPage.java
@@ -21,8 +21,6 @@ import org.eclipse.jdt.core.JavaConventions;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jface.dialogs.IMessageProvider;
import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.riena.ui.wizard.cs.internal.RienaApplicationPart;
-import org.eclipse.riena.ui.wizard.cs.internal.RienaWizardMessages;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.KeyAdapter;
import org.eclipse.swt.events.KeyEvent;
@@ -35,6 +33,9 @@ import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.ui.dialogs.WorkingSetGroup;
+import org.eclipse.riena.ui.wizard.cs.internal.RienaApplicationPart;
+import org.eclipse.riena.ui.wizard.cs.internal.RienaWizardMessages;
+
public class GeneralPage extends GeneralPageLayout {
private WorkingSetGroup workingSetGroup;
@@ -48,10 +49,12 @@ public class GeneralPage extends GeneralPageLayout {
setTitle(RienaWizardMessages.GeneralPage_title);
}
- public void createControl(Composite parent) {
+ @Override
+ public void createControl(final Composite parent) {
super.createControl(parent);
- workingSetGroup = new WorkingSetGroup(workingSetComposite, new StructuredSelection(), new String[] { "org.eclipse.jdt.ui.JavaWorkingSetPage", //$NON-NLS-1$
+ workingSetGroup = new WorkingSetGroup(workingSetComposite, new StructuredSelection(), new String[] {
+ "org.eclipse.jdt.ui.JavaWorkingSetPage", //$NON-NLS-1$
"org.eclipse.pde.ui.pluginWorkingSet", "org.eclipse.ui.resourceWorkingSetPage" }); //$NON-NLS-1$ //$NON-NLS-2$
packageTouched = false;
@@ -77,26 +80,27 @@ public class GeneralPage extends GeneralPageLayout {
protected boolean validatePage() {
- String baseName = projectBaseText.getText().trim();
+ final String baseName = projectBaseText.getText().trim();
if (baseName.length() == 0) {
setErrorMessage(null);
setMessage(RienaWizardMessages.GeneralPage_Validation_NoProjectName);
return false;
}
- for (RienaApplicationPart suffix : RienaApplicationPart.values()) {
- if (!validateProjectName(suffix.makeProjectFullName(baseName)))
+ for (final RienaApplicationPart suffix : RienaApplicationPart.values()) {
+ if (!validateProjectName(suffix.makeProjectFullName(baseName))) {
return false;
+ }
}
- String baseId = packageBaseText.getText().trim();
+ final String baseId = packageBaseText.getText().trim();
if (baseId.length() == 0) {
setErrorMessage(null);
setMessage(RienaWizardMessages.GeneralPage_Validation_NoBasePluginId);
return false;
}
- IStatus status = JavaConventions.validatePackageName(baseId, JavaCore.VERSION_1_5, JavaCore.VERSION_1_5);
+ final IStatus status = JavaConventions.validatePackageName(baseId, JavaCore.VERSION_1_5, JavaCore.VERSION_1_5);
switch (status.getSeverity()) {
case IStatus.ERROR:
@@ -114,16 +118,16 @@ public class GeneralPage extends GeneralPageLayout {
return true;
}
- private boolean validateProjectName(String fullName) {
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
+ private boolean validateProjectName(final String fullName) {
+ final IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IStatus nameStatus = workspace.validateName(fullName, IResource.PROJECT);
+ final IStatus nameStatus = workspace.validateName(fullName, IResource.PROJECT);
if (!nameStatus.isOK()) {
setErrorMessage(nameStatus.getMessage());
return false;
}
- IProject handle = workspace.getRoot().getProject(fullName);
+ final IProject handle = workspace.getRoot().getProject(fullName);
if (handle.exists()) {
setErrorMessage(String.format(RienaWizardMessages.GeneralPage_Validation_ProjectAlreadyExists, fullName));
return false;
@@ -133,22 +137,23 @@ public class GeneralPage extends GeneralPageLayout {
}
protected void fillProjectList() {
- String wsLocation = ResourcesPlugin.getWorkspace().getRoot().getLocation().toOSString();
- StringBuffer sb = new StringBuffer();
+ final String wsLocation = ResourcesPlugin.getWorkspace().getRoot().getLocation().toOSString();
+ final StringBuffer sb = new StringBuffer();
- String baseName = projectBaseText.getText().trim();
+ final String baseName = projectBaseText.getText().trim();
if (baseName.length() != 0) {
sb.append(RienaWizardMessages.GeneralPage_Validation_GeneralPage_ProjectsToBeCreated);
- for (RienaApplicationPart ps : RienaApplicationPart.values())
+ for (final RienaApplicationPart ps : RienaApplicationPart.values()) {
sb.append(String.format("\n\t%s%c%s", wsLocation, File.separatorChar, ps.makeProjectFullName(baseName))); //$NON-NLS-1$
+ }
}
projectsText.setText(sb.toString());
}
- private Listener validateListener = new Listener() {
- public void handleEvent(Event e) {
+ private final Listener validateListener = new Listener() {
+ public void handleEvent(final Event e) {
Display.getDefault().asyncExec(new Runnable() {
public void run() {
fillProjectList();
@@ -159,22 +164,24 @@ public class GeneralPage extends GeneralPageLayout {
}
};
- private ModifyListener projectModifyListener = new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- if (!packageTouched)
+ private final ModifyListener projectModifyListener = new ModifyListener() {
+ public void modifyText(final ModifyEvent e) {
+ if (!packageTouched) {
packageBaseText.setText(makePackageName(projectBaseText.getText()));
+ }
}
- private String makePackageName(String projectBase) {
+ private String makePackageName(final String projectBase) {
return projectBase.replaceAll("[^a-zA-Z0-9\\._]", "_"); //$NON-NLS-1$ //$NON-NLS-2$
}
};
- private KeyListener packageKeyListener = new KeyAdapter() {
+ private final KeyListener packageKeyListener = new KeyAdapter() {
@Override
- public void keyPressed(KeyEvent e) {
- if (Character.isJavaIdentifierPart(e.character))
+ public void keyPressed(final KeyEvent e) {
+ if (Character.isJavaIdentifierPart(e.character)) {
packageTouched = true;
+ }
}
};
diff --git a/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/pages/GeneralPageLayout.java b/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/pages/GeneralPageLayout.java
index 3ce36b3..d55e1fb 100644
--- a/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/pages/GeneralPageLayout.java
+++ b/org.eclipse.riena.ui.wizard.cs/src/org/eclipse/riena/ui/wizard/cs/internal/pages/GeneralPageLayout.java
@@ -10,8 +10,6 @@
*******************************************************************************/
package org.eclipse.riena.ui.wizard.cs.internal.pages;
-import org.eclipse.riena.ui.wizard.cs.internal.RienaApplicationPart;
-import org.eclipse.riena.ui.wizard.cs.internal.RienaWizardMessages;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
@@ -21,22 +19,26 @@ import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
+import org.eclipse.riena.ui.wizard.cs.internal.RienaApplicationPart;
+import org.eclipse.riena.ui.wizard.cs.internal.RienaWizardMessages;
+
public abstract class GeneralPageLayout extends AbstractPage {
protected Text projectBaseText, packageBaseText, projectsText;
protected Composite workingSetComposite;
- protected GeneralPageLayout(String pageName) {
+ protected GeneralPageLayout(final String pageName) {
super(pageName);
}
- public void createControl(Composite parent) {
+ public void createControl(final Composite parent) {
super.createControl(parent);
- Label lblProjectName = new Label(composite, SWT.NONE);
+ final Label lblProjectName = new Label(composite, SWT.NONE);
lblProjectName.setText(RienaWizardMessages.GeneralPage_ProjectName);
lblProjectName.setLayoutData(fd = new FormData());
fd.left = fd.top = new FormAttachment(0, 0);
- fd.width = convertWidthInCharsToPixels(Math.max(RienaWizardMessages.GeneralPage_ProjectName.length(), RienaWizardMessages.GeneralPage_PackageName.length())) + 5;
+ fd.width = convertWidthInCharsToPixels(Math.max(RienaWizardMessages.GeneralPage_ProjectName.length(),
+ RienaWizardMessages.GeneralPage_PackageName.length())) + 5;
projectBaseText = new Text(composite, SWT.BORDER);
projectBaseText.setLayoutData(fd = new FormData());
@@ -53,7 +55,7 @@ public abstract class GeneralPageLayout extends AbstractPage {
fd.right = new FormAttachment(projectBaseText, 0, SWT.RIGHT);
fd.height = convertHeightInCharsToPixels(RienaApplicationPart.values().length + 1);
- Label lblPackage = new Label(composite, SWT.NONE);
+ final Label lblPackage = new Label(composite, SWT.NONE);
lblPackage.setLayoutData(fd = new FormData());
lblPackage.setText(RienaWizardMessages.GeneralPage_PackageName);
fd.left = new FormAttachment(lblProjectName, 0, SWT.LEFT);
@@ -69,7 +71,7 @@ public abstract class GeneralPageLayout extends AbstractPage {
workingSetComposite = new Composite(composite, SWT.NONE);
workingSetComposite.setLayoutData(fd = new FormData());
- GridLayout gl = new GridLayout();
+ final GridLayout gl = new GridLayout();
gl.marginWidth = gl.marginHeight = 0;
workingSetComposite.setLayout(gl);