From bc7ed160d6408c4c1d4959b05e1796142f7d6f82 Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Fri, 21 Oct 2016 12:08:59 +0200 Subject: [PATCH] avoid magic numbers Change-Id: I6c60a17faad4d30ee64032568dca155d8677cb7d --- .../dsl/ui/wizard/EmfParsleyDslProjectCreatorCustom.java | 4 +++- .../eclipse/emf/parsley/composite/AbstractControlFactory.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dsl/org.eclipse.emf.parsley.dsl.ui/src/org/eclipse/emf/parsley/dsl/ui/wizard/EmfParsleyDslProjectCreatorCustom.java b/dsl/org.eclipse.emf.parsley.dsl.ui/src/org/eclipse/emf/parsley/dsl/ui/wizard/EmfParsleyDslProjectCreatorCustom.java index 253fe5556..fadd7965a 100644 --- a/dsl/org.eclipse.emf.parsley.dsl.ui/src/org/eclipse/emf/parsley/dsl/ui/wizard/EmfParsleyDslProjectCreatorCustom.java +++ b/dsl/org.eclipse.emf.parsley.dsl.ui/src/org/eclipse/emf/parsley/dsl/ui/wizard/EmfParsleyDslProjectCreatorCustom.java @@ -32,6 +32,8 @@ * */ public class EmfParsleyDslProjectCreatorCustom extends EmfParsleyDslProjectCreator { + private static final int CREATING_PROJECT_WORK_STEPS = 5; + static EmfParsleyDslNewProjectFiles filesGenerator = new EmfParsleyDslNewProjectFiles(); static EmfParsleyProjectFilesGenerator projectFilesGenerator = new EmfParsleyProjectFilesGenerator(); @@ -107,7 +109,7 @@ protected void enhanceProject(final IProject project, SubMonitor subMonitor = SubMonitor.convert(monitor, "Creating project " + projectName, - 5); + CREATING_PROJECT_WORK_STEPS); String[] paths = { projectPackagePath }; NewEmfParsleyProjectSupport.addToProjectStructure(project, paths, diff --git a/plugins/org.eclipse.emf.parsley.common/src/org/eclipse/emf/parsley/composite/AbstractControlFactory.java b/plugins/org.eclipse.emf.parsley.common/src/org/eclipse/emf/parsley/composite/AbstractControlFactory.java index 2314aa920..41f48e6ab 100644 --- a/plugins/org.eclipse.emf.parsley.common/src/org/eclipse/emf/parsley/composite/AbstractControlFactory.java +++ b/plugins/org.eclipse.emf.parsley.common/src/org/eclipse/emf/parsley/composite/AbstractControlFactory.java @@ -77,6 +77,8 @@ */ public abstract class AbstractControlFactory implements IWidgetFactory { + private static final int GRID_DATA_HORIZONTAL_INDENT = 10; + private static final String OBSERVE_PREFIX = "observe_"; private static final String CONTROL_PREFIX = "control_"; @@ -486,7 +488,7 @@ private void setupControl(EStructuralFeature f, Control c) { // polymorphic implementation or from the DSL if (c.getLayoutData()==null) { GridData deafultLayout = new GridData(GridData.FILL_HORIZONTAL); - deafultLayout.horizontalIndent=10; + deafultLayout.horizontalIndent=GRID_DATA_HORIZONTAL_INDENT; c.setLayoutData(deafultLayout); } }