Fix problem with incidence showing up in the new disease initializer wizard git-svn-id: http://dev.eclipse.org/svnroot/technology/org.eclipse.stem/branches/STEM_1_4_1@3636 92a21009-5b66-0410-b83a-dc787c41c6e9
diff --git a/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/impl/DiseaseModelImpl.java b/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/impl/DiseaseModelImpl.java index 9b94d35..d296bf3 100644 --- a/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/impl/DiseaseModelImpl.java +++ b/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/impl/DiseaseModelImpl.java
@@ -600,7 +600,7 @@ * @param attr The attribute to check * @return Whether the attribute is a disease deaths compartment */ - protected boolean isDiseaseDeaths(EAttribute attr) { + public boolean isDiseaseDeaths(EAttribute attr) { return attr.getName().startsWith("diseaseDeaths") || Constants.COMPARTMENT_TYPE_DEATHS.equalsIgnoreCase(getAttributeType(attr)); } @@ -609,7 +609,7 @@ * @param attr The attribute to check * @return Whether the attribute is an incidence compartment */ - protected boolean isIncidence(EAttribute attr) { + public boolean isIncidence(EAttribute attr) { return attr.getName().startsWith("incidence") || Constants.COMPARTMENT_TYPE_INCIDENCE.equalsIgnoreCase(getAttributeType(attr)); }
diff --git a/models/epidemiology/org.eclipse.stem.ui.diseasemodels/src/org/eclipse/stem/ui/wizards/NewStandardDiseaseInitializerPage.java b/models/epidemiology/org.eclipse.stem.ui.diseasemodels/src/org/eclipse/stem/ui/wizards/NewStandardDiseaseInitializerPage.java index 7c53554..e15c4ac 100644 --- a/models/epidemiology/org.eclipse.stem.ui.diseasemodels/src/org/eclipse/stem/ui/wizards/NewStandardDiseaseInitializerPage.java +++ b/models/epidemiology/org.eclipse.stem.ui.diseasemodels/src/org/eclipse/stem/ui/wizards/NewStandardDiseaseInitializerPage.java
@@ -19,6 +19,7 @@ import org.eclipse.stem.diseasemodels.standard.DiseaseModel; import org.eclipse.stem.diseasemodels.standard.StandardDiseaseInitializer; import org.eclipse.stem.diseasemodels.standard.StandardFactory; +import org.eclipse.stem.diseasemodels.standard.impl.DiseaseModelImpl; import org.eclipse.stem.ui.widgets.LocationPickerDialog; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; @@ -177,9 +178,11 @@ .createDiseaseModelLabelValue(population).eClass() .getEAllAttributes(); + DiseaseModelImpl diseaseImpl = (DiseaseModelImpl)target; + for (EAttribute a : attributes) { - if (a.isChangeable() && !a.getName().startsWith("diseaseDeaths") - && !a.getName().startsWith("incidence")) { + if (a.isChangeable() && !diseaseImpl.isDiseaseDeaths(a) + && !diseaseImpl.isIncidence(a)) { Label label = new Label(valuesComposite, SWT.NONE); label.setLayoutData(new GridData(SWT.BEGINNING, SWT.FILL, true, false));