Fixed deprecated constructors for Float, Character, Boolean, etc.
diff --git a/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/common/PrimitiveTypeOperations.java b/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/common/PrimitiveTypeOperations.java
index 9fc5b75..158b401 100644
--- a/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/common/PrimitiveTypeOperations.java
+++ b/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/common/PrimitiveTypeOperations.java
@@ -146,7 +146,7 @@
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @model valueRequired="true"
- * annotation="http://www.eclipse.org/emf/2002/GenModel body='eSet(featureId, new Float(value));'"
+ * annotation="http://www.eclipse.org/emf/2002/GenModel body='eSet(featureId, Float.valueOf(value));'"
* @generated
*/
void eSetFloat(int featureId, float value);
@@ -164,7 +164,7 @@
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @model valueRequired="true"
- * annotation="http://www.eclipse.org/emf/2002/GenModel body='eSet(featureId, new Boolean(value));'"
+ * annotation="http://www.eclipse.org/emf/2002/GenModel body='eSet(featureId, Boolean.valueOf(value));'"
* @generated
*/
void eSetBoolean(int featureId, boolean value);
diff --git a/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/graph/impl/IntegrationLabelValueImpl.java b/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/graph/impl/IntegrationLabelValueImpl.java
index 98706ed..a6c7550 100644
--- a/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/graph/impl/IntegrationLabelValueImpl.java
+++ b/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/graph/impl/IntegrationLabelValueImpl.java
@@ -270,7 +270,7 @@
* @generated
*/
public void eSetByte(int featureId, byte value) {
- eSet(featureId, new Byte(value));
+ eSet(featureId, Byte.valueOf(value));
}
/**
@@ -292,7 +292,7 @@
* @generated
*/
public void eSetChar(int featureId, char value) {
- eSet(featureId, new Character(value));
+ eSet(featureId, Character.valueOf(value));
}
/**
@@ -314,7 +314,7 @@
* @generated
*/
public void eSetShort(int featureId, short value) {
- eSet(featureId, new Short(value));
+ eSet(featureId, Short.valueOf(value));
}
/**
@@ -358,7 +358,7 @@
* @generated
*/
public void eSetLong(int featureId, long value) {
- eSet(featureId, new Long(value));
+ eSet(featureId, Long.valueOf(value));
}
/**
@@ -380,7 +380,7 @@
* @generated
*/
public void eSetFloat(int featureId, float value) {
- eSet(featureId, new Float(value));
+ eSet(featureId, Float.valueOf(value));
}
/**
@@ -402,7 +402,7 @@
* @generated
*/
public void eSetBoolean(int featureId, boolean value) {
- eSet(featureId, new Boolean(value));
+ eSet(featureId, Boolean.valueOf(value));
}
/**
diff --git a/org.eclipse.stem/core/org.eclipse.stem.ui.headless/src/org/eclipse/stem/ui/headless/HeadlessLauncher.java b/org.eclipse.stem/core/org.eclipse.stem.ui.headless/src/org/eclipse/stem/ui/headless/HeadlessLauncher.java
index 57694f2..2dedaa5 100644
--- a/org.eclipse.stem/core/org.eclipse.stem.ui.headless/src/org/eclipse/stem/ui/headless/HeadlessLauncher.java
+++ b/org.eclipse.stem/core/org.eclipse.stem.ui.headless/src/org/eclipse/stem/ui/headless/HeadlessLauncher.java
@@ -34,7 +34,7 @@
{
private static final String DISTRIBUTED_CONTROLLER_PLUGIN_NAME = "org.eclipse.stem.graphsynchronizer";
- private Boolean workspacePluginsLoadSuccess = new Boolean(false);
+ private Boolean workspacePluginsLoadSuccess = Boolean.valueOf(false);
BundleListener workspaceLoadBundleListener = new BundleListener() {
public void bundleChanged(BundleEvent event) {
diff --git a/org.eclipse.stem/core/org.eclipse.stem.ui.reports/src/org/eclipse/stem/ui/reports/views/TimeSeriesCanvas.java b/org.eclipse.stem/core/org.eclipse.stem.ui.reports/src/org/eclipse/stem/ui/reports/views/TimeSeriesCanvas.java
index a642d78..c00afa1 100644
--- a/org.eclipse.stem/core/org.eclipse.stem.ui.reports/src/org/eclipse/stem/ui/reports/views/TimeSeriesCanvas.java
+++ b/org.eclipse.stem/core/org.eclipse.stem.ui.reports/src/org/eclipse/stem/ui/reports/views/TimeSeriesCanvas.java
@@ -1175,7 +1175,7 @@
if(propertiesToPlot.containsKey(property)) {
setChecked(propertiesToPlot.get(property).booleanValue());
} else {
- propertiesToPlot.put(property,new Boolean(true));
+ propertiesToPlot.put(property,Boolean.valueOf(true));
setChecked(propertiesToPlot.get(property).booleanValue());
}
diff --git a/org.eclipse.stem/core/org.eclipse.stem.ui.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/presentation/StochasticSolverPropertyEditor.java b/org.eclipse.stem/core/org.eclipse.stem.ui.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/presentation/StochasticSolverPropertyEditor.java
index 6627f57..7c0edc0 100755
--- a/org.eclipse.stem/core/org.eclipse.stem.ui.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/presentation/StochasticSolverPropertyEditor.java
+++ b/org.eclipse.stem/core/org.eclipse.stem.ui.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/presentation/StochasticSolverPropertyEditor.java
@@ -140,7 +140,7 @@
if(solver instanceof StandardStochastic) {
switch(entry.getKey().getFeatureID()) {
case StochasticPackage.STANDARD_STOCHASTIC__SEED:
- long lVal = (new Long(entry.getValue().getText())).longValue();
+ long lVal = (Long.valueOf(entry.getValue().getText())).longValue();
((StandardStochastic)solver).setSeed(lVal);
break;
default:
diff --git a/org.eclipse.stem/core/org.eclipse.stem.utility/src/org/eclipse/stem/utility/generators/AreaGenerator.java b/org.eclipse.stem/core/org.eclipse.stem.utility/src/org/eclipse/stem/utility/generators/AreaGenerator.java
index 9be410a..7a7b0e5 100644
--- a/org.eclipse.stem/core/org.eclipse.stem.utility/src/org/eclipse/stem/utility/generators/AreaGenerator.java
+++ b/org.eclipse.stem/core/org.eclipse.stem.utility/src/org/eclipse/stem/utility/generators/AreaGenerator.java
@@ -238,14 +238,14 @@
protected void setURLStatus() {
urlStatus = new HashMap<String, Boolean>();
// This will be the active URL.
- urlStatus.put("CIA", new Boolean(true)); //$NON-NLS-1$
+ urlStatus.put("CIA", Boolean.valueOf(true)); //$NON-NLS-1$
// All other URLs appear as commented out, secondary.
- urlStatus.put("USCENSUSAREA", new Boolean(false)); //$NON-NLS-1$
- urlStatus.put("USCENSUSBOUNDS", new Boolean(false)); //$NON-NLS-1$
- urlStatus.put("USCENSUSPUERTORICO", new Boolean(false)); //$NON-NLS-1$
- urlStatus.put("CIA", new Boolean(false)); //$NON-NLS-1$
- urlStatus.put("CITYPOPULATION", new Boolean(false)); //$NON-NLS-1$
- urlStatus.put("UNITEDNATIONS", new Boolean(true)); //$NON-NLS-1$
+ urlStatus.put("USCENSUSAREA", Boolean.valueOf(false)); //$NON-NLS-1$
+ urlStatus.put("USCENSUSBOUNDS", Boolean.valueOf(false)); //$NON-NLS-1$
+ urlStatus.put("USCENSUSPUERTORICO", Boolean.valueOf(false)); //$NON-NLS-1$
+ urlStatus.put("CIA", Boolean.valueOf(false)); //$NON-NLS-1$
+ urlStatus.put("CITYPOPULATION", Boolean.valueOf(false)); //$NON-NLS-1$
+ urlStatus.put("UNITEDNATIONS", Boolean.valueOf(true)); //$NON-NLS-1$
}
/**
diff --git a/org.eclipse.stem/core/org.eclipse.stem.utility/src/org/eclipse/stem/utility/generators/NameGenerator.java b/org.eclipse.stem/core/org.eclipse.stem.utility/src/org/eclipse/stem/utility/generators/NameGenerator.java
index 48de6df..5c11393 100644
--- a/org.eclipse.stem/core/org.eclipse.stem.utility/src/org/eclipse/stem/utility/generators/NameGenerator.java
+++ b/org.eclipse.stem/core/org.eclipse.stem.utility/src/org/eclipse/stem/utility/generators/NameGenerator.java
@@ -214,10 +214,10 @@
// protected void setURLStatus() {
// urlStatus = new HashMap<String, Boolean>();
// // This will be the active URL.
- // urlStatus.put("ISO3166_1", new Boolean(true));
+ // urlStatus.put("ISO3166_1", Boolean.valueOf(true));
// // All other URLs appear as commented out, secondary.
- // urlStatus.put("CIA", new Boolean(false));
- // urlStatus.put("USCENSUSPOP", new Boolean(false));
+ // urlStatus.put("CIA", Boolean.valueOf(false));
+ // urlStatus.put("USCENSUSPOP", Boolean.valueOf(false));
//
// }
/**
diff --git a/org.eclipse.stem/core/org.eclipse.stem.utility/src/org/eclipse/stem/utility/generators/NodeDataGenerator.java b/org.eclipse.stem/core/org.eclipse.stem.utility/src/org/eclipse/stem/utility/generators/NodeDataGenerator.java
index dc1d4bc..115a973 100644
--- a/org.eclipse.stem/core/org.eclipse.stem.utility/src/org/eclipse/stem/utility/generators/NodeDataGenerator.java
+++ b/org.eclipse.stem/core/org.eclipse.stem.utility/src/org/eclipse/stem/utility/generators/NodeDataGenerator.java
@@ -196,11 +196,11 @@
protected void setURLStatus() {
urlStatus = new HashMap<String, Boolean>();
// This will be the active URL.
- urlStatus.put("CIA", new Boolean(true)); //$NON-NLS-1$
+ urlStatus.put("CIA", Boolean.valueOf(true)); //$NON-NLS-1$
// All other URLs appear as commented out, secondary.
- urlStatus.put("CIA", new Boolean(false)); //$NON-NLS-1$
- urlStatus.put("ISO3166_1", new Boolean(false)); //$NON-NLS-1$
- urlStatus.put("UNITEDNATIONS", new Boolean(true)); //$NON-NLS-1$
+ urlStatus.put("CIA", Boolean.valueOf(false)); //$NON-NLS-1$
+ urlStatus.put("ISO3166_1", Boolean.valueOf(false)); //$NON-NLS-1$
+ urlStatus.put("UNITEDNATIONS", Boolean.valueOf(true)); //$NON-NLS-1$
}
/**
diff --git a/org.eclipse.stem/core/org.eclipse.stem.utility/src/org/eclipse/stem/utility/generators/PopulationGenerator.java b/org.eclipse.stem/core/org.eclipse.stem.utility/src/org/eclipse/stem/utility/generators/PopulationGenerator.java
index 188b8cd..5b022cc 100644
--- a/org.eclipse.stem/core/org.eclipse.stem.utility/src/org/eclipse/stem/utility/generators/PopulationGenerator.java
+++ b/org.eclipse.stem/core/org.eclipse.stem.utility/src/org/eclipse/stem/utility/generators/PopulationGenerator.java
@@ -235,17 +235,17 @@
protected void setURLStatus() {
urlStatus = new HashMap<String, Boolean>();
// This will be the active URL.
- urlStatus.put("CIA", new Boolean(true)); //$NON-NLS-1$
+ urlStatus.put("CIA", Boolean.valueOf(true)); //$NON-NLS-1$
// All other URLs appear as commented out, secondary.
- urlStatus.put("USCENSUSPOP", new Boolean(false)); //$NON-NLS-1$
- urlStatus.put("USCENSUSPUERTORICO", new Boolean(false)); //$NON-NLS-1$
- urlStatus.put("CITYPOP", new Boolean(false)); //$NON-NLS-1$
- urlStatus.put("CIA", new Boolean(false)); //$NON-NLS-1$
- urlStatus.put("POP2", new Boolean(false)); //$NON-NLS-1$
- urlStatus.put("POP", new Boolean(false)); //$NON-NLS-1$
- urlStatus.put("DEMOGRAFIA", new Boolean(false)); //$NON-NLS-1$
- urlStatus.put("STATOIDS", new Boolean(false)); //$NON-NLS-1$
- urlStatus.put("UNITEDNATIONS", new Boolean(true)); //$NON-NLS-1$
+ urlStatus.put("USCENSUSPOP", Boolean.valueOf(false)); //$NON-NLS-1$
+ urlStatus.put("USCENSUSPUERTORICO", Boolean.valueOf(false)); //$NON-NLS-1$
+ urlStatus.put("CITYPOP", Boolean.valueOf(false)); //$NON-NLS-1$
+ urlStatus.put("CIA", Boolean.valueOf(false)); //$NON-NLS-1$
+ urlStatus.put("POP2", Boolean.valueOf(false)); //$NON-NLS-1$
+ urlStatus.put("POP", Boolean.valueOf(false)); //$NON-NLS-1$
+ urlStatus.put("DEMOGRAFIA", Boolean.valueOf(false)); //$NON-NLS-1$
+ urlStatus.put("STATOIDS", Boolean.valueOf(false)); //$NON-NLS-1$
+ urlStatus.put("UNITEDNATIONS", Boolean.valueOf(true)); //$NON-NLS-1$
}
/**
diff --git a/org.eclipse.stem/tests/org.eclipse.stem.tests.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/tests/SEIRLabelValueTestUtil.java b/org.eclipse.stem/tests/org.eclipse.stem.tests.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/tests/SEIRLabelValueTestUtil.java
index 391459d..02765bf 100644
--- a/org.eclipse.stem/tests/org.eclipse.stem.tests.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/tests/SEIRLabelValueTestUtil.java
+++ b/org.eclipse.stem/tests/org.eclipse.stem.tests.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/tests/SEIRLabelValueTestUtil.java
@@ -124,11 +124,11 @@
if(null != comperhensiveProperty){
comperhensiveProperty = comperhensiveProperty.trim();
if(comperhensiveProperty.equalsIgnoreCase("yes") || comperhensiveProperty.equalsIgnoreCase("true")){
- comperhensive = new Boolean(true);
+ comperhensive = Boolean.valueOf(true);
}
}
if(null == comperhensive ){
- comperhensive = new Boolean(false);
+ comperhensive = Boolean.valueOf(false);
}
return comperhensive.booleanValue();
}
diff --git a/org.eclipse.stem/tests/org.eclipse.stem.tests.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/tests/SILabelValueTestUtil.java b/org.eclipse.stem/tests/org.eclipse.stem.tests.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/tests/SILabelValueTestUtil.java
index 474af23..4b2da62 100644
--- a/org.eclipse.stem/tests/org.eclipse.stem.tests.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/tests/SILabelValueTestUtil.java
+++ b/org.eclipse.stem/tests/org.eclipse.stem.tests.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/tests/SILabelValueTestUtil.java
@@ -123,11 +123,11 @@
if(null != comperhensiveProperty){
comperhensiveProperty = comperhensiveProperty.trim();
if(comperhensiveProperty.equalsIgnoreCase("yes") || comperhensiveProperty.equalsIgnoreCase("true")){
- comperhensive = new Boolean(true);
+ comperhensive = Boolean.valueOf(true);
}
}
if(null == comperhensive ){
- comperhensive = new Boolean(false);
+ comperhensive = Boolean.valueOf(false);
}
return comperhensive.booleanValue();
}
diff --git a/org.eclipse.stem/tests/org.eclipse.stem.tests.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/tests/SIRLabelValueTestUtil.java b/org.eclipse.stem/tests/org.eclipse.stem.tests.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/tests/SIRLabelValueTestUtil.java
index 9d44c12..3f8f5b6 100644
--- a/org.eclipse.stem/tests/org.eclipse.stem.tests.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/tests/SIRLabelValueTestUtil.java
+++ b/org.eclipse.stem/tests/org.eclipse.stem.tests.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/tests/SIRLabelValueTestUtil.java
@@ -123,11 +123,11 @@
if(null != comperhensiveProperty){
comperhensiveProperty = comperhensiveProperty.trim();
if(comperhensiveProperty.equalsIgnoreCase("yes") || comperhensiveProperty.equalsIgnoreCase("true")){
- comperhensive = new Boolean(true);
+ comperhensive = Boolean.valueOf(true);
}
}
if(null == comperhensive ){
- comperhensive = new Boolean(false);
+ comperhensive = Boolean.valueOf(false);
}
return comperhensive.booleanValue();
}
